From e1bf3c35f2c085d6831d8f3859a123da80745741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20Per=C5=82owski?= Date: Mon, 15 Jan 2024 12:45:02 +0100 Subject: [PATCH 001/366] Add CrossRef provider logic --- .../source/installation/config.rst | 9 + pom.xml | 5 + .../iq/dataverse/CrossRefRESTfullClient.java | 118 +++++++ .../dataverse/DOICrossRefRegisterService.java | 313 ++++++++++++++++++ .../iq/dataverse/DOICrossRefServiceBean.java | 117 +++++++ .../iq/dataverse/EjbDataverseEngine.java | 8 + .../iq/dataverse/GlobalIdServiceBean.java | 3 +- .../engine/command/CommandContext.java | 24 +- .../iq/dataverse/settings/JvmSettings.java | 11 +- .../dataverse/crossref_metadata_template.xml | 29 ++ .../dataverse/engine/TestCommandContext.java | 5 + 11 files changed, 619 insertions(+), 23 deletions(-) create mode 100644 src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java create mode 100644 src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java create mode 100644 src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java create mode 100644 src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index a7d7905ca4a..e7ba624222e 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -245,6 +245,15 @@ this provider. - :ref:`dataverse.pid.ezid.username` - :ref:`dataverse.pid.ezid.password` +**JVM Options for CrossRef:** + +- :ref:`dataverse.pid.crossref.url` +- :ref:`dataverse.pid.crossref.rest-api-url` +- :ref:`dataverse.pid.crossref.username` +- :ref:`dataverse.pid.crossref.password` +- :ref:`dataverse.pid.crossref.depositor` +- :ref:`dataverse.pid.crossref.depositor-email` + **Database Settings:** - :ref:`:DoiProvider <:DoiProvider>` diff --git a/pom.xml b/pom.xml index 7c12a45135c..72ef3391524 100644 --- a/pom.xml +++ b/pom.xml @@ -653,6 +653,11 @@ 3.2.0 test + + org.apache.httpcomponents + fluent-hc + 4.5.14 + diff --git a/src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java new file mode 100644 index 00000000000..4b6728eca57 --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java @@ -0,0 +1,118 @@ +package edu.harvard.iq.dataverse; + +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.client.fluent.Request; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.mime.HttpMultipartMode; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; + +import java.io.Closeable; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class CrossRefRESTfullClient implements Closeable { + + private static final Logger logger = Logger.getLogger(CrossRefRESTfullClient.class.getCanonicalName()); + + private final String url; + private final String apiUrl; + private final String username; + private final String password; + private final CloseableHttpClient httpClient; + private final HttpClientContext context; + private final String encoding = "utf-8"; + + public CrossRefRESTfullClient(String url, String apiUrl, String username, String password) { + this.url = url; + this.apiUrl = apiUrl; + this.username = username; + this.password = password; + try { + context = HttpClientContext.create(); + CredentialsProvider credsProvider = new BasicCredentialsProvider(); + credsProvider.setCredentials(new AuthScope(null, -1), + new UsernamePasswordCredentials(username, password)); + context.setCredentialsProvider(credsProvider); + + httpClient = HttpClients.createDefault(); + } catch (Exception ioe) { + close(); + logger.log(Level.SEVERE,"Fail to init Client",ioe); + throw new RuntimeException("Fail to init Client", ioe); + } + } + + public void close() { + if (this.httpClient != null) { + try { + httpClient.close(); + } catch (IOException io) { + logger.warning("IOException closing hhtpClient: " + io.getMessage()); + } + } + } + + public String getMetadata(String doi) { + HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi); + httpGet.setHeader("Accept", "application/json"); + try { + HttpResponse response = httpClient.execute(httpGet); + String data = EntityUtils.toString(response.getEntity(), encoding); + if (response.getStatusLine().getStatusCode() != 200) { + String errMsg = "Response from getMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; + logger.info(errMsg); + throw new RuntimeException(errMsg); + } + return data; + } catch (IOException ioe) { + logger.info("IOException when get metadata"); + throw new RuntimeException("IOException when get metadata", ioe); + } + } + + public String postMetadata(String xml) throws IOException { + HttpEntity entity = MultipartEntityBuilder.create() + .addTextBody("operation", "doMDUpload") + .addTextBody("login_id", username) + .addTextBody("login_passwd", password) + .addBinaryBody("fname", xml.getBytes(StandardCharsets.UTF_8), ContentType.APPLICATION_XML, "metadata.xml") + .setMode(HttpMultipartMode.BROWSER_COMPATIBLE) + .build(); + HttpResponse response = Request.Post(url + "/servlet/deposit") + .body(entity) + .setHeader("Accept", "*/*") + .execute().returnResponse(); + + String data = EntityUtils.toString(response.getEntity(), encoding); + if (response.getStatusLine().getStatusCode() != 200) { + String errMsg = "Response from postMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; + logger.info(errMsg); + throw new IOException(errMsg); + } + return data; + } + + public boolean testDOIExists(String doi) throws IOException { + HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi); + httpGet.setHeader("Accept", "application/json"); + HttpResponse response = httpClient.execute(httpGet); + if (response.getStatusLine().getStatusCode() != 200) { + EntityUtils.consumeQuietly(response.getEntity()); + return false; + } + EntityUtils.consumeQuietly(response.getEntity()); + return true; + } +} diff --git a/src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java new file mode 100644 index 00000000000..6e8ed20d570 --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java @@ -0,0 +1,313 @@ +package edu.harvard.iq.dataverse; + +import com.fasterxml.jackson.databind.ObjectMapper; +import edu.harvard.iq.dataverse.settings.JvmSettings; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import org.apache.commons.text.StringEscapeUtils; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static edu.harvard.iq.dataverse.util.SystemConfig.getDataverseSiteUrlStatic; + +@Stateless +public class DOICrossRefRegisterService { + private static final Logger logger = Logger.getLogger(DOICrossRefRegisterService.class.getCanonicalName()); + + @EJB + DataverseServiceBean dataverseService; + + private CrossRefRESTfullClient client = null; + + private CrossRefRESTfullClient getClient() { + if (client == null) { + client = new CrossRefRESTfullClient( + JvmSettings.CROSSREF_URL.lookup(), + JvmSettings.CROSSREF_REST_API_URL.lookup(), + JvmSettings.CROSSREF_USERNAME.lookup(), + JvmSettings.CROSSREF_PASSWORD.lookup() + ); + } + return client; + } + + public boolean testDOIExists(String identifier) { + boolean doiExists; + try { + CrossRefRESTfullClient client = getClient(); + doiExists = client.testDOIExists(identifier.substring(identifier.indexOf(":") + 1)); + } catch (Exception e) { + logger.log(Level.INFO, identifier, e); + return false; + } + return doiExists; + } + + public HashMap getMetadata(String identifier) throws IOException { + HashMap metadata = new HashMap<>(); + try { + CrossRefRESTfullClient client = getClient(); + String jsonMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1)); + Map mappedJson = new ObjectMapper().readValue(jsonMetadata, HashMap.class); + logger.log(Level.FINE, jsonMetadata); + metadata.put("_status", mappedJson.get("status").toString()); + } catch (RuntimeException e) { + logger.log(Level.INFO, identifier, e); + } + return metadata; + } + + public String reserveIdentifier(String identifier, DvObject dvObject) throws IOException { + logger.info("Crossref reserveIdentifier"); + String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); + + CrossRefRESTfullClient client = getClient(); + return client.postMetadata(xmlMetadata); + } + + public void modifyIdentifier(String identifier, DvObject dvObject) throws IOException { + logger.info("Crossref modifyIdentifier"); + String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); + + CrossRefRESTfullClient client = getClient(); + client.postMetadata(xmlMetadata); + } + + public String getMetadataFromDvObject(String identifier, DvObject dvObject) { + Dataset dataset; + + if (dvObject instanceof Dataset) { + dataset = (Dataset) dvObject; + } else { + dataset = (Dataset) dvObject.getOwner(); + } + + CrossRefMetadataTemplate metadataTemplate = new CrossRefMetadataTemplate(); + metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1)); + metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors()); + metadataTemplate.setDepositor(JvmSettings.CROSSREF_DEPOSITOR.lookup()); + metadataTemplate.setDepositorEmail(JvmSettings.CROSSREF_DEPOSITOR_EMAIL.lookup()); + metadataTemplate.setInstitution(dataverseService.getRootDataverseName()); + + String title = dvObject.getCurrentName(); + if (dvObject.isInstanceofDataFile()) { + //Note file title is not currently escaped the way the dataset title is, so adding it here. + title = StringEscapeUtils.escapeXml10(title); + } + + if (title.isEmpty() || title.equals(DatasetField.NA_VALUE)) { + title = AbstractGlobalIdServiceBean.UNAVAILABLE; + } + + metadataTemplate.setTitle(title); + + return metadataTemplate.generateXML(); + } +} + +class CrossRefMetadataTemplate { + + private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.edu.harvard.iq.dataverse.CrossRefMetadataTemplate"); + private static String template; + + static { + try (InputStream in = CrossRefMetadataTemplate.class.getResourceAsStream("crossref_metadata_template.xml")) { + template = CrossRefFileUtil.readAndClose(in, "utf-8"); + } catch (Exception e) { + logger.log(Level.SEVERE, "crossref metadata template load error"); + logger.log(Level.SEVERE, "String " + e); + logger.log(Level.SEVERE, "localized message " + e.getLocalizedMessage()); + logger.log(Level.SEVERE, "cause " + e.getCause()); + logger.log(Level.SEVERE, "message " + e.getMessage()); + } + } + + private final String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + private String institution; + private String depositor; + private String depositorEmail; + private String databaseTitle; + private String identifier; + private String title; + private final String baseUrl = getDataverseSiteUrlStatic(); + private List authors; + + public List getAuthors() { + return authors; + } + + public void setAuthors(List authors) { + this.authors = authors; + } + + public CrossRefMetadataTemplate() { + } + + public String generateXML() { + String xmlMetadata = template.replace("${depositor}", depositor) + .replace("${depositorEmail}", depositorEmail) + .replace("${title}", title) + .replace("${institution}", institution) + .replace("${batchId}", identifier + " " + timestamp) + .replace("${timestamp}", timestamp); + + StringBuilder datasetElement = new StringBuilder(); + datasetElement.append(""); + + StringBuilder contributorsElement = new StringBuilder(); + if (authors != null && !authors.isEmpty()) { + contributorsElement.append(""); + for (DatasetAuthor author : authors) { + contributorsElement.append(""); + contributorsElement.append(author.getName().getDisplayValue()); + contributorsElement.append(""); + contributorsElement.append(author.getName().getDisplayValue()); + contributorsElement.append(""); + + if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) { + contributorsElement.append("") + .append(author.getAffiliation().getDisplayValue()) + .append(""); + } + + if (author.getIdType() != null && + author.getIdValue() != null && + !author.getIdType().isEmpty() && + !author.getIdValue().isEmpty() && + author.getAffiliation() != null && + !author.getAffiliation().getDisplayValue().isEmpty()) { + if (author.getIdType().equals("ORCID")) { + contributorsElement.append("").append("https://orcid.org/").append(author.getIdValue()).append(""); + } + if (author.getIdType().equals("ISNI")) { + contributorsElement.append("").append(author.getIdValue()).append(""); + } + if (author.getIdType().equals("LCNA")) { + contributorsElement.append("").append(author.getIdValue()).append(""); + } + } + + contributorsElement.append(""); + } + contributorsElement.append(""); + + } else { + contributorsElement.append("") + .append(AbstractGlobalIdServiceBean.UNAVAILABLE) + .append(""); + } + + datasetElement.append(contributorsElement); + + datasetElement.append("") + .append(this.title) + .append(""); + + datasetElement.append("") + .append(this.identifier) + .append("") + .append(this.baseUrl).append("/dataset.xhtml?persistentId=doi:").append(this.identifier) + .append(""); + + datasetElement.append(""); + xmlMetadata = xmlMetadata.replace("${datasets}", datasetElement.toString()); + return xmlMetadata; + } + + public static String getTemplate() { + return template; + } + + public static void setTemplate(String template) { + CrossRefMetadataTemplate.template = template; + } + + public String getIdentifier() { + return identifier; + } + + public String getDepositor() { + return depositor; + } + + public void setDepositor(String depositor) { + this.depositor = depositor; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getInstitution() { + return institution; + } + + public void setInstitution(String institution) { + this.institution = institution; + } + + public String getDepositorEmail() { + return depositorEmail; + } + + public void setDepositorEmail(String depositorEmail) { + this.depositorEmail = depositorEmail; + } + + public String getDatabaseTitle() { + return databaseTitle; + } + + public void setDatabaseTitle(String databaseTitle) { + this.databaseTitle = databaseTitle; + } +} + +class CrossRefFileUtil { + + public static void close(InputStream in) { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + throw new RuntimeException("Fail to close InputStream"); + } + } + } + + public static String readAndClose(InputStream inStream, String encoding) { + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + byte[] buf = new byte[128]; + String data; + try { + int cnt; + while ((cnt = inStream.read(buf)) >= 0) { + outStream.write(buf, 0, cnt); + } + data = outStream.toString(encoding); + } catch (IOException ioe) { + throw new RuntimeException("IOException"); + } finally { + close(inStream); + } + return data; + } +} + diff --git a/src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java new file mode 100644 index 00000000000..50fafc5f036 --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java @@ -0,0 +1,117 @@ +package edu.harvard.iq.dataverse; + +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +@Stateless +public class DOICrossRefServiceBean extends DOIServiceBean { + private static final Logger logger = Logger.getLogger(DOICrossRefServiceBean.class.getCanonicalName()); + + @EJB + DOICrossRefRegisterService doiCrossRefRegisterService; + + + @Override + public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) throws Exception { + logger.info("CrossRef alreadyRegistered"); + if (pid == null || pid.asString().isEmpty()) { + logger.fine("No identifier sent."); + return false; + } + boolean alreadyExists; + String identifier = pid.asString(); + try { + alreadyExists = doiCrossRefRegisterService.testDOIExists(identifier); + } catch (Exception e) { + logger.log(Level.WARNING, "alreadyExists failed"); + return false; + } + return alreadyExists; + } + + @Override + public boolean registerWhenPublished() { + return true; + } + + @Override + public List getProviderInformation() { + return List.of("CrossRef", "https://status.crossref.org/"); + } + + @Override + protected String getProviderKeyName() { + return "CrossRef"; + } + + @Override + public String createIdentifier(DvObject dvObject) throws Throwable { + logger.info("CrossRef createIdentifier"); + if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) { + dvObject = generateIdentifier(dvObject); + } + String identifier = getIdentifier(dvObject); + try { + String retString = doiCrossRefRegisterService.reserveIdentifier(identifier, dvObject); + logger.log(Level.FINE, "CrossRef create DOI identifier retString : " + retString); + return retString; + } catch (Exception e) { + logger.log(Level.WARNING, "CrossRef Identifier not created: create failed", e); + throw e; + } + } + + @Override + public Map getIdentifierMetadata(DvObject dvObject) { + logger.info("CrossRef getIdentifierMetadata"); + String identifier = getIdentifier(dvObject); + Map metadata = new HashMap<>(); + try { + metadata = doiCrossRefRegisterService.getMetadata(identifier); + } catch (Exception e) { + logger.log(Level.WARNING, "getIdentifierMetadata failed", e); + } + return metadata; + } + + @Override + public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception { + logger.info("CrossRef modifyIdentifier"); + String identifier = getIdentifier(dvObject); + try { + doiCrossRefRegisterService.modifyIdentifier(identifier, dvObject); + } catch (Exception e) { + logger.log(Level.WARNING, "modifyMetadata failed", e); + throw e; + } + return identifier; + } + + @Override + public void deleteIdentifier(DvObject dvo) throws Exception { + logger.info("CrossRef deleteIdentifier"); + } + + @Override + public boolean publicizeIdentifier(DvObject dvObject) { + logger.info("CrossRef updateIdentifierStatus"); + if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) { + dvObject = generateIdentifier(dvObject); + } + String identifier = getIdentifier(dvObject); + + try { + doiCrossRefRegisterService.reserveIdentifier(identifier, dvObject); + return true; + } catch (Exception e) { + logger.log(Level.WARNING, "modifyMetadata failed: " + e.getMessage(), e); + return false; + } + } +} diff --git a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java index 5a689c06019..cfb17caf5a0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java +++ b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java @@ -119,6 +119,9 @@ public class EjbDataverseEngine { @EJB DOIDataCiteServiceBean doiDataCite; + @EJB + DOICrossRefServiceBean doiCrossRef; + @EJB FakePidProviderServiceBean fakePidProvider; @@ -493,6 +496,11 @@ public DOIDataCiteServiceBean doiDataCite() { return doiDataCite; } + @Override + public DOICrossRefServiceBean doiCrossRef() { + return doiCrossRef; + } + @Override public FakePidProviderServiceBean fakePidProvider() { return fakePidProvider; diff --git a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java index aebf13778c3..ec96bcf603f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java @@ -204,8 +204,9 @@ class BeanDispatcher { switch ( doiProvider ) { case "EZID": return ctxt.doiEZId(); case "DataCite": return ctxt.doiDataCite(); + case "CrossRef": return ctxt.doiCrossRef(); case "FAKE": return ctxt.fakePidProvider(); - default: + default: logger.log(Level.SEVERE, "Unknown doiProvider: {0}", doiProvider); return null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java index f74c1222bb0..596a76be172 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java @@ -1,29 +1,9 @@ package edu.harvard.iq.dataverse.engine.command; -import edu.harvard.iq.dataverse.DOIDataCiteServiceBean; -import edu.harvard.iq.dataverse.DOIEZIdServiceBean; -import edu.harvard.iq.dataverse.HandlenetServiceBean; -import edu.harvard.iq.dataverse.DataFileServiceBean; -import edu.harvard.iq.dataverse.DatasetLinkingServiceBean; -import edu.harvard.iq.dataverse.DatasetServiceBean; -import edu.harvard.iq.dataverse.DatasetVersionServiceBean; -import edu.harvard.iq.dataverse.DataverseFacetServiceBean; -import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevelServiceBean; -import edu.harvard.iq.dataverse.DataverseLinkingServiceBean; -import edu.harvard.iq.dataverse.DataverseRoleServiceBean; -import edu.harvard.iq.dataverse.DataverseServiceBean; +import edu.harvard.iq.dataverse.*; import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean; -import edu.harvard.iq.dataverse.DvObjectServiceBean; -import edu.harvard.iq.dataverse.FeaturedDataverseServiceBean; -import edu.harvard.iq.dataverse.FileDownloadServiceBean; -import edu.harvard.iq.dataverse.GuestbookResponseServiceBean; -import edu.harvard.iq.dataverse.GuestbookServiceBean; import edu.harvard.iq.dataverse.search.IndexServiceBean; -import edu.harvard.iq.dataverse.PermissionServiceBean; -import edu.harvard.iq.dataverse.RoleAssigneeServiceBean; import edu.harvard.iq.dataverse.search.SearchServiceBean; -import edu.harvard.iq.dataverse.TemplateServiceBean; -import edu.harvard.iq.dataverse.UserNotificationServiceBean; import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean; import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean; import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean; @@ -104,6 +84,8 @@ public interface CommandContext { public DOIDataCiteServiceBean doiDataCite(); + public DOICrossRefServiceBean doiCrossRef(); + public FakePidProviderServiceBean fakePidProvider(); public HandlenetServiceBean handleNet(); diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java index 3bc06738a7e..0600175deb5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java @@ -104,7 +104,16 @@ public enum JvmSettings { DATACITE_REST_API_URL(SCOPE_PID_DATACITE, "rest-api-url", "doi.dataciterestapiurlstring", "doi.mdcbaseurlstring"), DATACITE_USERNAME(SCOPE_PID_DATACITE, "username", "doi.username"), DATACITE_PASSWORD(SCOPE_PID_DATACITE, "password", "doi.password"), - + + // PROVIDER CROSSREF + SCOPE_PID_CROSSREF(SCOPE_PID, "crossref"), + CROSSREF_URL(SCOPE_PID_CROSSREF, "url"), + CROSSREF_REST_API_URL(SCOPE_PID_CROSSREF, "rest-api-url"), + CROSSREF_USERNAME(SCOPE_PID_CROSSREF, "username", "doi.username"), + CROSSREF_PASSWORD(SCOPE_PID_CROSSREF, "password", "doi.password"), + CROSSREF_DEPOSITOR(SCOPE_PID_CROSSREF, "depositor"), + CROSSREF_DEPOSITOR_EMAIL(SCOPE_PID_CROSSREF, "depositor-email"), + // PROVIDER PERMALINK SCOPE_PID_PERMALINK(SCOPE_PID, "permalink"), PERMALINK_BASEURL(SCOPE_PID_PERMALINK, "base-url", "perma.baseurlstring"), diff --git a/src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml new file mode 100644 index 00000000000..f37ed63cfff --- /dev/null +++ b/src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml @@ -0,0 +1,29 @@ + + + + ${batchId} + ${timestamp} + + ${depositor} + ${depositorEmail} + + Crossref + + + + + + ${title} + + + ${institution} + + + ${datasets} + + + diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java index a80adb33b8d..15810f85d39 100644 --- a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java +++ b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java @@ -131,6 +131,11 @@ public DOIDataCiteServiceBean doiDataCite() { return null; } + @Override + public DOICrossRefServiceBean doiCrossRef() { + return null; + } + @Override public FakePidProviderServiceBean fakePidProvider() { return null; From a08fbe2b345dd9f10998b758eb962f899bd6653e Mon Sep 17 00:00:00 2001 From: Martin Amouzou <85512093+martinAmouzou@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:13:02 +0100 Subject: [PATCH 002/366] Update version-control.rst --- doc/sphinx-guides/source/developers/version-control.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index c36c7d1e963..a97adf4149b 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -286,5 +286,8 @@ GitHub documents how to make changes to a fork at https://help.github.com/articl git push OdumInstitute 4709-postgresql_96 ---- +Develop branch and pull request +-------------------------------------------- +Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `. Previous: :doc:`troubleshooting` | Next: :doc:`sql-upgrade-scripts` From 8277ac5adac8511efa9bb92d3f51dcf99973e67b Mon Sep 17 00:00:00 2001 From: Martin Amouzou <85512093+martinAmouzou@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:15:10 +0100 Subject: [PATCH 003/366] Update version-control.rst --- doc/sphinx-guides/source/developers/version-control.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index a97adf4149b..11ce0c0d144 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -286,8 +286,9 @@ GitHub documents how to make changes to a fork at https://help.github.com/articl git push OdumInstitute 4709-postgresql_96 ---- + Develop branch and pull request -------------------------------------------- -Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `. +Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `_. Previous: :doc:`troubleshooting` | Next: :doc:`sql-upgrade-scripts` From be8c167a6454bc86535ce77e66dedb1d76ca0b08 Mon Sep 17 00:00:00 2001 From: Martin Amouzou <85512093+martinAmouzou@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:53:13 +0100 Subject: [PATCH 004/366] Update version-control.rst --- doc/sphinx-guides/source/developers/version-control.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index 11ce0c0d144..5b809782f76 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -289,6 +289,6 @@ GitHub documents how to make changes to a fork at https://help.github.com/articl Develop branch and pull request -------------------------------------------- -Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `_. +Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `_. Previous: :doc:`troubleshooting` | Next: :doc:`sql-upgrade-scripts` From 8c5113b9c3f4e8380df45d91c84fdc3acdaf7f1a Mon Sep 17 00:00:00 2001 From: Martin Amouzou <85512093+martinAmouzou@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:04:48 +0100 Subject: [PATCH 005/366] Update version-control.rst --- doc/sphinx-guides/source/developers/version-control.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index 5b809782f76..35e37ac0471 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -289,6 +289,6 @@ GitHub documents how to make changes to a fork at https://help.github.com/articl Develop branch and pull request -------------------------------------------- -Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `_. +Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `_. Previous: :doc:`troubleshooting` | Next: :doc:`sql-upgrade-scripts` From 1edb8bac22046dffd5c7c21197e013bb3be80a60 Mon Sep 17 00:00:00 2001 From: Martin Amouzou <85512093+martinAmouzou@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:07:58 +0100 Subject: [PATCH 006/366] Update version-control.rst --- doc/sphinx-guides/source/developers/version-control.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index 35e37ac0471..99e33164417 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -289,6 +289,6 @@ GitHub documents how to make changes to a fork at https://help.github.com/articl Develop branch and pull request -------------------------------------------- -Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide `_. +Please do not use your forked develop branch to push a PR and follow the `1st scenario: preparing the first pull request of Version Control Guide <#summary-of-git-commands>`_. Previous: :doc:`troubleshooting` | Next: :doc:`sql-upgrade-scripts` From 6df751346325948935582836a69b6e5378fb1b06 Mon Sep 17 00:00:00 2001 From: konradperlowski Date: Wed, 31 Jan 2024 10:31:03 +0100 Subject: [PATCH 007/366] Add CrossRef config properties description --- .../source/installation/config.rst | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index e7ba624222e..24f1d0cce12 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -2370,6 +2370,50 @@ should delete the old JVM option and the wrapped password alias, then recreate as shown for :ref:`dataverse.pid.datacite.password` but with the EZID alias name. +.. _dataverse.pid.crossref.url: + +dataverse.pid.crossref.url +++++++++++++++++++++++++++ + +CrossRef url used to post metadata. + +.. _dataverse.pid.crossref.rest-api-url: + +dataverse.pid.crossref.rest-api-url ++++++++++++++++++++++++++++++++++++ + +CrossRef API url to retrieve metadata information + +.. _dataverse.pid.crossref.username: + +dataverse.pid.crossref.username ++++++++++++++++++++++++++++++++ + +CrossRef uses `HTTP Basic authentication `_ +for their APIs. +- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.password`. + +.. _dataverse.pid.crossref.password: + +dataverse.pid.crossref.password ++++++++++++++++++++++++++++++++ + +- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.username`. + +.. _dataverse.pid.crossref.depositor: + +dataverse.pid.crossref.depositor +++++++++++++++++++++++++++++++++ + +The entity, such as a person or organization, that deposited the Dataset in the repository + +.. _dataverse.pid.crossref.depositor-email: + +dataverse.pid.crossref.depositor-email +++++++++++++++++++++++++++++++++++++++ + +Contact email to the indicated Depositor + .. _dataverse.timerServer: dataverse.timerServer From 376f31de215a677ad874adebe4c179be675c6ec3 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 10 Apr 2024 23:57:38 +0200 Subject: [PATCH 008/366] ci(ct): do no longer run base push workflow in PRs --- .github/workflows/container_base_push.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index b938851f816..20083c90f33 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -3,17 +3,11 @@ name: Base Container Image on: push: + tags: + - 'v[6-9].*' branches: - 'develop' - - 'master' - paths: - - 'modules/container-base/**' - - 'modules/dataverse-parent/pom.xml' - - '.github/workflows/container_base_push.yml' - pull_request: - branches: - - 'develop' - - 'master' + - '10478-version-base-img' paths: - 'modules/container-base/**' - 'modules/dataverse-parent/pom.xml' From b8b95a995b3cebab201577429622ba086a81634e Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:05:25 +0200 Subject: [PATCH 009/366] ci(ct): add a job for base images to discover branches to work on For scheduled maintenance, we will provide updates to the last three base images as well as the develop branch. --- .github/workflows/container_base_push.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 20083c90f33..41935a025a8 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -20,6 +20,25 @@ env: PLATFORMS: linux/amd64,linux/arm64 jobs: + discover: + name: Discover Release Matrix + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + # Only run in upstream repo - avoid unnecessary runs in forks and only for scheduled + if: ${{ github.repository_owner == 'IQSS' }} + steps: + - name: Build branch matrix options + id: matrix + run: | + # Get last three releases and include develop branch as matrix elements + if [[ "${{ github.event_name }}" == "schedule" ]]; then + echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq '[ .[0:3] | .[].tag_name, "develop" ]')" | tee -a "$GITHUB_OUTPUT" + else + echo "branches=['develop']" | tee -a "$GITHUB_OUTPUT" + fi + build: name: Build image runs-on: ubuntu-latest From 6f046208086bc7f3bb4078c92b6ae8723f78b030 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:06:24 +0200 Subject: [PATCH 010/366] ci(ct): setup base image build job as matrix of discovered branches Checkout the branch/tag we receive from the discovery job --- .github/workflows/container_base_push.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 41935a025a8..b424936383c 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -45,15 +45,18 @@ jobs: permissions: contents: read packages: read + needs: discover strategy: matrix: - jdk: [ '17' ] + branch: ${{ fromJson(needs.discover.outputs.branches) }} # Only run in upstream repo - avoid unnecessary runs in forks if: ${{ github.repository_owner == 'IQSS' }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + ref: ${{ matrix.branch }} - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v3 From 4fc0267296944a7dec92e1a70a651649cf9941db Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:07:40 +0200 Subject: [PATCH 011/366] ci(ct): upgrade java action in base image and determine java version from Maven Using Maven properties, we find out which is the projects preferred Java version. We don't need a build matrix here. --- .github/workflows/container_base_push.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index b424936383c..970e67794c2 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -57,14 +57,19 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} + - name: Determine Java version from package + run: | + echo "JAVA_VERSION=$(mvn -f modules/container-base -Pct help:evaluate -Dexpression=target.java.version -q -DforceStdout)" >> ${GITHUB_ENV} - - name: Set up JDK ${{ matrix.jdk }} - uses: actions/setup-java@v3 + - name: Set up JDK ${{ env.JAVA_VERSION }} + uses: actions/setup-java@v4 with: - java-version: ${{ matrix.jdk }} - distribution: 'adopt' - - name: Cache Maven packages - uses: actions/cache@v3 + java-version: ${{ env.JAVA_VERSION }} + distribution: 'temurin' + cache: 'maven' + cache-dependency-path: | + modules/container-base/pom.xml + with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From 8d3097181296f70e1948adf43c2823862e8cb1fd Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:08:57 +0200 Subject: [PATCH 012/366] ci(ct): remove pull request safeguards from base image workflow We no longer work on PRs in this workflow, so we don't need to safeguard against not running steps in this case. --- .github/workflows/container_base_push.yml | 33 +++++++++-------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 970e67794c2..31a044ef02a 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -78,8 +78,18 @@ jobs: - name: Build base container image with local architecture run: mvn -f modules/container-base -Pct package - # Run anything below only if this is not a pull request. - # Accessing, pushing tags etc. to DockerHub will only succeed in upstream because secrets. + # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and + # on events in context of upstream because secrets. PRs run in context of forks by default! + + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Set up QEMU for multi-arch builds + uses: docker/setup-qemu-action@v2 + - name: Deploy multi-arch base container image to Docker Hub + run: mvn -f modules/container-base -Pct deploy -Ddocker.platforms=${{ env.PLATFORMS }} - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} name: Push description to DockerHub @@ -90,23 +100,6 @@ jobs: repository: gdcc/base short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" readme-filepath: ./modules/container-base/README.md - - - if: ${{ github.event_name != 'pull_request' }} - name: Log in to the Container registry - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - if: ${{ github.event_name != 'pull_request' }} - name: Set up QEMU for multi-arch builds - uses: docker/setup-qemu-action@v2 - - name: Re-set image tag based on branch - if: ${{ github.ref_name == 'master' }} - run: echo "IMAGE_TAG=alpha" >> $GITHUB_ENV - - if: ${{ github.event_name != 'pull_request' }} - name: Deploy multi-arch base container image to Docker Hub - run: mvn -f modules/container-base -Pct deploy -Dbase.image.tag=${{ env.IMAGE_TAG }} -Ddocker.platforms=${{ env.PLATFORMS }} push-app-img: name: "Rebase & Publish App Image" permissions: @@ -115,6 +108,6 @@ jobs: pull-requests: write needs: build # We do not release a new base image for pull requests, so do not trigger. - if: ${{ github.event_name != 'pull_request' }} + # if: ${{ github.event_name != 'pull_request' }} uses: ./.github/workflows/container_app_push.yml secrets: inherit From bb06a94e27e6edf6f9ccd11dbf6209d90b7d4dc2 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:09:43 +0200 Subject: [PATCH 013/366] ci(ct): remove pull request safeguards from base image workflow We no longer work on PRs in this workflow, so we don't need to safeguard against not running steps in this case. Also we no longer use the static image names, but rely on the truth Maven has in the container-base module about the version of the image. --- .github/workflows/container_base_push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 31a044ef02a..4295280b639 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -16,7 +16,6 @@ on: - cron: '23 3 * * 0' # Run for 'develop' every Sunday at 03:23 UTC env: - IMAGE_TAG: unstable PLATFORMS: linux/amd64,linux/arm64 jobs: From 0ba86b2e4f68709d49c72a99580ec5c5b1ac4d5a Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:10:23 +0200 Subject: [PATCH 014/366] ci(ct): stop on purpose to test the feature branch before we actually push to Docker Hub --- .github/workflows/container_base_push.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 4295280b639..bfccefaf9eb 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -69,13 +69,11 @@ jobs: cache-dependency-path: | modules/container-base/pom.xml + - name: Stop on purpose for testing + uses: actions/github-script@v3 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Build base container image with local architecture - run: mvn -f modules/container-base -Pct package + script: | + core.setFailed('Stopped on purpose.') # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and # on events in context of upstream because secrets. PRs run in context of forks by default! From 37f4a51b2ff0341f7bb6d930614f04c2238c213b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:11:00 +0200 Subject: [PATCH 015/366] feat(ct): make the container base image follow sequential, incrementing versions --- modules/container-base/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index fc672696df4..2754b081986 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -12,6 +12,8 @@ io.gdcc container-base + + 1 ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. @@ -40,7 +42,7 @@ docker-build gdcc/base:${base.image.tag} - unstable + R${project.version} eclipse-temurin:${target.java.version}-jre 1000 1000 From 20c6a58915711efd9e18d8454813623ead9dbb9b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:17:47 +0200 Subject: [PATCH 016/366] ci(ct): add missing output definitions to base image workflow matrix discovery --- .github/workflows/container_base_push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index bfccefaf9eb..29abab230e3 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -27,6 +27,8 @@ jobs: packages: read # Only run in upstream repo - avoid unnecessary runs in forks and only for scheduled if: ${{ github.repository_owner == 'IQSS' }} + outputs: + branches: ${{ steps.matrix.outputs.branches }} steps: - name: Build branch matrix options id: matrix From e9236638eb2921b46318c3a4fb51e663ec021a56 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:20:41 +0200 Subject: [PATCH 017/366] test(ct): for testing, determine if matrix discovery works for schedule event --- .github/workflows/container_base_push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 29abab230e3..ab91252efc6 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -34,11 +34,11 @@ jobs: id: matrix run: | # Get last three releases and include develop branch as matrix elements - if [[ "${{ github.event_name }}" == "schedule" ]]; then + #if [[ "${{ github.event_name }}" == "schedule" ]]; then echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq '[ .[0:3] | .[].tag_name, "develop" ]')" | tee -a "$GITHUB_OUTPUT" - else - echo "branches=['develop']" | tee -a "$GITHUB_OUTPUT" - fi + #else + # echo "branches=['develop']" | tee -a "$GITHUB_OUTPUT" + #fi build: name: Build image From def5d9e2842c09c3d647619f0cea266528c71a82 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:23:56 +0200 Subject: [PATCH 018/366] fix(ct): base image build matrix output must be on a single line Fix jq output by removing newlines and superfluous whitespace. --- .github/workflows/container_base_push.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index ab91252efc6..705b152d1bc 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -35,7 +35,9 @@ jobs: run: | # Get last three releases and include develop branch as matrix elements #if [[ "${{ github.event_name }}" == "schedule" ]]; then - echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq '[ .[0:3] | .[].tag_name, "develop" ]')" | tee -a "$GITHUB_OUTPUT" + echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | \ + jq '[ .[0:3] | .[].tag_name, "develop" ]')" | tr -d "\n" | tr -s " " | \ + tee -a "$GITHUB_OUTPUT" #else # echo "branches=['develop']" | tee -a "$GITHUB_OUTPUT" #fi From b028c2610db5688bf443f436e1bbdb1c7c8fcb6c Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:27:06 +0200 Subject: [PATCH 019/366] fix(ct): do not stop building other base images if one build fails --- .github/workflows/container_base_push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 705b152d1bc..f36c5a8de2d 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -50,6 +50,7 @@ jobs: packages: read needs: discover strategy: + fail-fast: false matrix: branch: ${{ fromJson(needs.discover.outputs.branches) }} # Only run in upstream repo - avoid unnecessary runs in forks From b453a12b780c4149a3ca2ffb5469d6cfb85c5290 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:45:07 +0200 Subject: [PATCH 020/366] fix(ct): avoid costly lookup of Java version to be used via Maven, grep from XML instead --- .github/workflows/container_base_push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index f36c5a8de2d..d6af36702f6 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -61,9 +61,9 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} - - name: Determine Java version from package + - name: Determine Java version from Parent POM run: | - echo "JAVA_VERSION=$(mvn -f modules/container-base -Pct help:evaluate -Dexpression=target.java.version -q -DforceStdout)" >> ${GITHUB_ENV} + echo "JAVA_VERSION=$(grep '' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV} - name: Set up JDK ${{ env.JAVA_VERSION }} uses: actions/setup-java@v4 From cb2fac02fb9370f565ef613c0f2e57f5ce7957a0 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 00:48:19 +0200 Subject: [PATCH 021/366] test(ct): no longer stop before Docker, but tell DMP to skip pushing --- .github/workflows/container_base_push.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index d6af36702f6..24b2640f3e3 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -74,12 +74,6 @@ jobs: cache-dependency-path: | modules/container-base/pom.xml - - name: Stop on purpose for testing - uses: actions/github-script@v3 - with: - script: | - core.setFailed('Stopped on purpose.') - # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and # on events in context of upstream because secrets. PRs run in context of forks by default! @@ -91,7 +85,7 @@ jobs: - name: Set up QEMU for multi-arch builds uses: docker/setup-qemu-action@v2 - name: Deploy multi-arch base container image to Docker Hub - run: mvn -f modules/container-base -Pct deploy -Ddocker.platforms=${{ env.PLATFORMS }} + run: mvn -f modules/container-base -Pct deploy -Ddocker.skip.push -Ddocker.platforms=${{ env.PLATFORMS }} - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} name: Push description to DockerHub From afa51c78327748d14a1e9bb6f1d6eac78e357f48 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 01:12:13 +0200 Subject: [PATCH 022/366] fix(ct): skip building and pushing the base image for v6.0 and v6.1, which is compatible with the v6.2 image --- .github/workflows/container_base_push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 24b2640f3e3..cb83a2799bb 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -85,6 +85,8 @@ jobs: - name: Set up QEMU for multi-arch builds uses: docker/setup-qemu-action@v2 - name: Deploy multi-arch base container image to Docker Hub + # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. + if: ${{ matrix.branch != 'v6.0' && matrix.branch != 'v6.1' }} run: mvn -f modules/container-base -Pct deploy -Ddocker.skip.push -Ddocker.platforms=${{ env.PLATFORMS }} - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} From 8afac921361fcb76752c9425f0ce2e2a5708244e Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 01:12:47 +0200 Subject: [PATCH 023/366] test(ct): try to limit QEMU architectures, maybe shaving off a few seconds of setup --- .github/workflows/container_base_push.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index cb83a2799bb..ed9e2a1cc1e 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -83,7 +83,10 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up QEMU for multi-arch builds - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 + with: + platforms: ${{ env.PLATFORMS }} + - name: Deploy multi-arch base container image to Docker Hub # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. if: ${{ matrix.branch != 'v6.0' && matrix.branch != 'v6.1' }} From 7c4242ea384e06b70664bffde4c5d1828ac70b1a Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 01:18:27 +0200 Subject: [PATCH 024/366] feat(ct): add additional tags for base images --- .github/workflows/container_base_push.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index ed9e2a1cc1e..21a15e02c1d 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -86,11 +86,20 @@ jobs: uses: docker/setup-qemu-action@v3 with: platforms: ${{ env.PLATFORMS }} + - name: Add additional tags as options + run: | + # For the development branch, update the latest tag in addition + if [[ "${{ matrix.branch }}" == "develop" ]]; then + echo "DOCKER_TAGS=-Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" + # In case of releases <=6.2, we still need to provide backward compatible names "alpha" and "unstable" + elif [[ "${{ matrix.branch }}" == "v6.2" ]]; then + echo "DOCKER_TAGS=-Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" + fi - name: Deploy multi-arch base container image to Docker Hub # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. if: ${{ matrix.branch != 'v6.0' && matrix.branch != 'v6.1' }} - run: mvn -f modules/container-base -Pct deploy -Ddocker.skip.push -Ddocker.platforms=${{ env.PLATFORMS }} + run: mvn -f modules/container-base -Pct deploy -Ddocker.skip.push ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} name: Push description to DockerHub From c08220dd4e40895973206d178f9cdeb7c7b5bf1c Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 01:35:45 +0200 Subject: [PATCH 025/366] test(ct): add feature branch to matrix and build for everything but it. --- .github/workflows/container_base_push.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 21a15e02c1d..af22b6b1a55 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -32,11 +32,12 @@ jobs: steps: - name: Build branch matrix options id: matrix + # TODO: remove the feature branch and re-enable the if/else! run: | # Get last three releases and include develop branch as matrix elements #if [[ "${{ github.event_name }}" == "schedule" ]]; then echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | \ - jq '[ .[0:3] | .[].tag_name, "develop" ]')" | tr -d "\n" | tr -s " " | \ + jq '[ .[0:3] | .[].tag_name, "develop", "10478-version-base-img" ]')" | tr -d "\n" | tr -s " " | \ tee -a "$GITHUB_OUTPUT" #else # echo "branches=['develop']" | tee -a "$GITHUB_OUTPUT" @@ -87,19 +88,28 @@ jobs: with: platforms: ${{ env.PLATFORMS }} - name: Add additional tags as options + # TODO: remove the feature branch and re-enable the if/else! run: | # For the development branch, update the latest tag in addition - if [[ "${{ matrix.branch }}" == "develop" ]]; then + if [[ "${{ matrix.branch }}" == "develop" || "${{ matrix.branch }}" == "10478-version-base-img" ]]; then echo "DOCKER_TAGS=-Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" # In case of releases <=6.2, we still need to provide backward compatible names "alpha" and "unstable" elif [[ "${{ matrix.branch }}" == "v6.2" ]]; then echo "DOCKER_TAGS=-Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" fi + # TODO: remove when feature branch is done + - name: Skip all but feature-branch + if: ${{ matrix.branch != '10478-version-base-img' }} + uses: actions/github-script@v3 + with: + script: | + core.setFailed('Stopping on purpose to avoid mayhem') + - name: Deploy multi-arch base container image to Docker Hub # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. if: ${{ matrix.branch != 'v6.0' && matrix.branch != 'v6.1' }} - run: mvn -f modules/container-base -Pct deploy -Ddocker.skip.push ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + run: mvn -f modules/container-base -Pct deploy ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} name: Push description to DockerHub From c4cbc576ef3dba974e8bffa338ad7a74d3962960 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 01:56:10 +0200 Subject: [PATCH 026/366] chore,test(ct): update script action to v7 --- .github/workflows/container_base_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index af22b6b1a55..f7f8e889d56 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -100,7 +100,7 @@ jobs: # TODO: remove when feature branch is done - name: Skip all but feature-branch if: ${{ matrix.branch != '10478-version-base-img' }} - uses: actions/github-script@v3 + uses: actions/github-script@v7 with: script: | core.setFailed('Stopping on purpose to avoid mayhem') From 05e48875387f769fb9cc966868699cbd4edce8c1 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 01:56:44 +0200 Subject: [PATCH 027/366] fix(ct): add missing option for DMP to add additional tags to base image --- .github/workflows/container_base_push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index f7f8e889d56..cefa63786c9 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -92,10 +92,10 @@ jobs: run: | # For the development branch, update the latest tag in addition if [[ "${{ matrix.branch }}" == "develop" || "${{ matrix.branch }}" == "10478-version-base-img" ]]; then - echo "DOCKER_TAGS=-Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" + echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" # In case of releases <=6.2, we still need to provide backward compatible names "alpha" and "unstable" elif [[ "${{ matrix.branch }}" == "v6.2" ]]; then - echo "DOCKER_TAGS=-Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" + echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" fi # TODO: remove when feature branch is done - name: Skip all but feature-branch From be5b9c98cbcab64085ec8a5ffc5b8275a4fec335 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 14:09:53 +0200 Subject: [PATCH 028/366] feat(ct): trigger build of app image when all builds of base image succeed We use the branch name from the matrix as input argument. It's not being used yet. --- .github/workflows/container_app_push.yml | 5 +++++ .github/workflows/container_base_push.yml | 22 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index b3e247e376c..fba693eee05 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -5,6 +5,11 @@ on: # We are deliberately *not* running on push events here to avoid double runs. # Instead, push events will trigger from the base image and maven unit tests via workflow_call. workflow_call: + inputs: + branch: + type: string + description: "A tag or branch to checkout for building the image" + required: true pull_request: branches: - develop diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index cefa63786c9..4e80caa8586 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -107,6 +107,7 @@ jobs: - name: Deploy multi-arch base container image to Docker Hub + id: build # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. if: ${{ matrix.branch != 'v6.0' && matrix.branch != 'v6.1' }} run: mvn -f modules/container-base -Pct deploy ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} @@ -120,14 +121,27 @@ jobs: repository: gdcc/base short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" readme-filepath: ./modules/container-base/README.md + + # - if: always() + # name: Save status (workaround for matrix outputs) + # run: | + # # steps.build.outcome is the status BEFORE continue-on-error + # echo "STATUS_$( echo "${{ matrix.branch }}" | tr ".:;,-/ " "_" )=${{ steps.build.outcome }}" | tee -a "${GITHUB_ENV}" + push-app-img: name: "Rebase & Publish App Image" permissions: contents: read packages: write pull-requests: write - needs: build - # We do not release a new base image for pull requests, so do not trigger. - # if: ${{ github.event_name != 'pull_request' }} + needs: + - discover + - build + strategy: + fail-fast: false + matrix: + branch: ${{ fromJson(needs.discover.outputs.branches) }} uses: ./.github/workflows/container_app_push.yml - secrets: inherit + with: + branch: ${{ matrix.branch }} + From d4a196b8a6247542051bf3d0daf24789121d6b94 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 14:12:00 +0200 Subject: [PATCH 029/366] test(ct): let's skip the build for anything but our feature branch --- .github/workflows/container_app_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index fba693eee05..a92ca4aecbd 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -35,7 +35,7 @@ jobs: packages: write pull-requests: write # Only run in upstream repo - avoid unnecessary runs in forks - if: ${{ github.repository_owner == 'IQSS' }} + if: ${{ github.repository_owner == 'IQSS' && inputs.branch == '10478-version-base-img' }} steps: - name: Checkout repository From 77aec0d62dcb0aad1e3e1bf7abdf740fc7bed540 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 14:19:35 +0200 Subject: [PATCH 030/366] style(ct): fix wording to test CI pipeline --- modules/container-base/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index f093ced37c1..0905ebb62a1 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -221,7 +221,7 @@ RUN < Date: Thu, 11 Apr 2024 14:22:08 +0200 Subject: [PATCH 031/366] test(ct): try what happens when removing the on purpose failure of base image workflow --- .github/workflows/container_base_push.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 4e80caa8586..8c15c0a7ff7 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -97,13 +97,14 @@ jobs: elif [[ "${{ matrix.branch }}" == "v6.2" ]]; then echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" fi + # TODO: remove when feature branch is done - - name: Skip all but feature-branch - if: ${{ matrix.branch != '10478-version-base-img' }} - uses: actions/github-script@v7 - with: - script: | - core.setFailed('Stopping on purpose to avoid mayhem') + #- name: Skip all but feature-branch + # if: ${{ matrix.branch != '10478-version-base-img' }} + # uses: actions/github-script@v7 + # with: + # script: | + # core.setFailed('Stopping on purpose to avoid mayhem') - name: Deploy multi-arch base container image to Docker Hub From 2887d13ca93103420ad78973e4e975dd0da90b41 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 11 Apr 2024 14:42:40 +0200 Subject: [PATCH 032/366] fix(ct): make secrets available to app workflow again Deleted by accident when working on alternativ matrix way to build app image after base. --- .github/workflows/container_base_push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 8c15c0a7ff7..1631c08f10e 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -135,6 +135,7 @@ jobs: contents: read packages: write pull-requests: write + secrets: inherit needs: - discover - build From bbe527d4646b09fd41fa4e57c52e2759183d2042 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 08:44:06 +0200 Subject: [PATCH 033/366] chore(ct,build): upgrade to DMP plugin v0.44.0 - Enable -Ddocker.noCache for BuildX - Hopefully straightens out some bugs on Darwin with M1/M2 --- modules/dataverse-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index 612902b47a4..d03d3e242fc 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -199,7 +199,7 @@ 1.7.0 - 0.43.4 + 0.44.0 From c496ef31304f8ced339aace0b903a52d69991b71 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 08:45:35 +0200 Subject: [PATCH 034/366] feat(ct): pin down name of the builder for base image This way we have a distinct path and name to inject a BuildX builder instance configuration --- modules/container-base/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index 2754b081986..72811e34e84 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -100,6 +100,7 @@ ${docker.platforms} + dataverse ${project.build.directory}/buildx-state Dockerfile From 82c8e725365c72bbc4a2a906779bc1c61a71ff89 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 08:46:05 +0200 Subject: [PATCH 035/366] ci(ct): make number of past release configurable via env var --- .github/workflows/container_base_push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 1631c08f10e..fe3b38d0284 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -17,6 +17,7 @@ on: env: PLATFORMS: linux/amd64,linux/arm64 + NUM_PAST_RELEASES: 3 jobs: discover: @@ -37,7 +38,7 @@ jobs: # Get last three releases and include develop branch as matrix elements #if [[ "${{ github.event_name }}" == "schedule" ]]; then echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | \ - jq '[ .[0:3] | .[].tag_name, "develop", "10478-version-base-img" ]')" | tr -d "\n" | tr -s " " | \ + jq '[ .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, "develop", "10478-version-base-img" ]')" | tr -d "\n" | tr -s " " | \ tee -a "$GITHUB_OUTPUT" #else # echo "branches=['develop']" | tee -a "$GITHUB_OUTPUT" From 0c91541f5c11c3daead61f657dbdee6af4addc43 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 08:54:49 +0200 Subject: [PATCH 036/366] fix(ct): correction of tags specification for base image workflow Per example at https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-workflow-only-when-a-push-of-specific-tags-occurs it should be two asterisks. --- .github/workflows/container_base_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index fe3b38d0284..838321b10f6 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -4,7 +4,7 @@ name: Base Container Image on: push: tags: - - 'v[6-9].*' + - 'v[6-9].**' branches: - 'develop' - '10478-version-base-img' From eef60f295ced438a7c3e91fbef61edc273ec51d9 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 08:56:21 +0200 Subject: [PATCH 037/366] refactor(ct): when pushes for a tag or branch occur, build for it Before, we would have run the workflow for develop only. In case develop has merges before the run starts because of a tag being created, this may result in undesired side effects. Keep in mind that pushes of tags here will also trigger releasing a new application image! --- .github/workflows/container_base_push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 838321b10f6..ec8881b3ef5 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -41,7 +41,8 @@ jobs: jq '[ .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, "develop", "10478-version-base-img" ]')" | tr -d "\n" | tr -s " " | \ tee -a "$GITHUB_OUTPUT" #else - # echo "branches=['develop']" | tee -a "$GITHUB_OUTPUT" + # # Note: github.ref_name will be the name of the branch or the tag pushed + # echo "branches=['${{ github.ref_name }}']" | tee -a "$GITHUB_OUTPUT" #fi build: From 90cb9ce129ff1b3b9de9e0585232418b820d7dbb Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 09:59:01 +0200 Subject: [PATCH 038/366] feat(ct): replace QEMU with remote builder for ARM64 in base image --- .github/workflows/container_base_push.yml | 35 +++++++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index ec8881b3ef5..324f8134a64 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -85,10 +85,39 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Set up QEMU for multi-arch builds - uses: docker/setup-qemu-action@v3 + + # This is replaced by adding a remote ARM64 build host in addition to the local AMD64 + # - name: Set up QEMU for multi-arch builds + # uses: docker/setup-qemu-action@v3 + # with: + # platforms: ${{ env.PLATFORMS }} + # Setup SSH access to ARM64 builder node + - name: Setup SSH agent + uses: webfactory/ssh-agent@v0.9.0 with: - platforms: ${{ env.PLATFORMS }} + ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }} + - name: Provide the known hosts key and the builder config + run: | + echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts + mkdir -p modules/container-base/target/buildx-state/buildx/instances + cat modules/container-base/target/buildx-state/buildx/instances/dataverse << EOF + { "Name": "dataverse", + "Driver": "docker-container", + "Dynamic": false, + "Nodes": [{"Name": "dataverse0", + "Endpoint": "unix:///var/run/docker.sock", + "Platforms": [{"os": "linux", "architecture": "amd64"}], + "DriverOpts": null, + "Flags": ["--allow-insecure-entitlement=network.host"], + "Files": null}, + {"Name": "dataverse1", + "Endpoint": "ssh://${{ secret.BUILDER_ARM64_SSH_CONNECTION }}", + "Platforms": [{"os": "linux", "architecture": "arm64"}], + "DriverOpts": null, + "Flags": ["--allow-insecure-entitlement=network.host"], + "Files": null}]} + EOF + - name: Add additional tags as options # TODO: remove the feature branch and re-enable the if/else! run: | From d7fbf871cffe8685e75533280e4ee2fa1f1add60 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 10:00:17 +0200 Subject: [PATCH 039/366] feat(ct): disable caching during base image build The ARM64 remote build host will otherwise reuse the cache with potentially stale content --- .github/workflows/container_base_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 324f8134a64..aaf20397f9d 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -142,7 +142,7 @@ jobs: id: build # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. if: ${{ matrix.branch != 'v6.0' && matrix.branch != 'v6.1' }} - run: mvn -f modules/container-base -Pct deploy ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} name: Push description to DockerHub From b6fb1224b9ca6fd0f345efc6ad73ebddea962450 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 10:02:31 +0200 Subject: [PATCH 040/366] style(ct): fix typo in secrets reference --- .github/workflows/container_base_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index aaf20397f9d..9243c2725e1 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -111,7 +111,7 @@ jobs: "Flags": ["--allow-insecure-entitlement=network.host"], "Files": null}, {"Name": "dataverse1", - "Endpoint": "ssh://${{ secret.BUILDER_ARM64_SSH_CONNECTION }}", + "Endpoint": "ssh://${{ secrets.BUILDER_ARM64_SSH_CONNECTION }}", "Platforms": [{"os": "linux", "architecture": "arm64"}], "DriverOpts": null, "Flags": ["--allow-insecure-entitlement=network.host"], From b3ac714f98971ef21cd47650e04a370226334fc8 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 10:04:08 +0200 Subject: [PATCH 041/366] fix(ct): add missing pipe redirection for builder config --- .github/workflows/container_base_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 9243c2725e1..69cd31afcf4 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -100,7 +100,7 @@ jobs: run: | echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts mkdir -p modules/container-base/target/buildx-state/buildx/instances - cat modules/container-base/target/buildx-state/buildx/instances/dataverse << EOF + cat > modules/container-base/target/buildx-state/buildx/instances/dataverse << EOF { "Name": "dataverse", "Driver": "docker-container", "Dynamic": false, From 898d9053becaa64151c06ec645080f6544292776 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 11:06:32 +0200 Subject: [PATCH 042/366] refactor(ct): switch back to "maven" as builder name Using "maven" (the default name) again allows us to use the ARM64 builder for previously released images as well as develop before we merge the feature branch --- .github/workflows/container_base_push.yml | 8 ++++---- modules/container-base/pom.xml | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 69cd31afcf4..e4733cca027 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -100,17 +100,17 @@ jobs: run: | echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts mkdir -p modules/container-base/target/buildx-state/buildx/instances - cat > modules/container-base/target/buildx-state/buildx/instances/dataverse << EOF - { "Name": "dataverse", + cat > modules/container-base/target/buildx-state/buildx/instances/maven << EOF + { "Name": "maven", "Driver": "docker-container", "Dynamic": false, - "Nodes": [{"Name": "dataverse0", + "Nodes": [{"Name": "maven0", "Endpoint": "unix:///var/run/docker.sock", "Platforms": [{"os": "linux", "architecture": "amd64"}], "DriverOpts": null, "Flags": ["--allow-insecure-entitlement=network.host"], "Files": null}, - {"Name": "dataverse1", + {"Name": "maven1", "Endpoint": "ssh://${{ secrets.BUILDER_ARM64_SSH_CONNECTION }}", "Platforms": [{"os": "linux", "architecture": "arm64"}], "DriverOpts": null, diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index 72811e34e84..2754b081986 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -100,7 +100,6 @@ ${docker.platforms} - dataverse ${project.build.directory}/buildx-state Dockerfile From 577804b3776847131b6e5f05727c9f0f69232d63 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 13:02:15 +0200 Subject: [PATCH 043/366] refactor(ct): use remote ARM64 builder only for pushes, but not scheduled maintenance --- .github/workflows/container_base_push.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index e4733cca027..36741ccd211 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -86,17 +86,21 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - # This is replaced by adding a remote ARM64 build host in addition to the local AMD64 - # - name: Set up QEMU for multi-arch builds - # uses: docker/setup-qemu-action@v3 - # with: - # platforms: ${{ env.PLATFORMS }} - # Setup SSH access to ARM64 builder node + # In case of scheduled maintenance, we don't care about buildtime: use QEMU for AMD64 + ARM64 + - name: Set up QEMU for multi-arch builds + if: ${{ github.event_name == 'schedule' }} + uses: docker/setup-qemu-action@v3 + with: + platforms: ${{ env.PLATFORMS }} + # In case this is a push to develop, we care about buildtime. + # Configure a remote ARM64 build host in addition to the local AMD64 in two steps. - name: Setup SSH agent + if: ${{ github.event_name != 'schedule' }} uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }} - name: Provide the known hosts key and the builder config + if: ${{ github.event_name != 'schedule' }} run: | echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts mkdir -p modules/container-base/target/buildx-state/buildx/instances From 25cbdd7b19478f9110ceb55436f9f84bcbb3aff5 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 14:19:35 +0200 Subject: [PATCH 044/366] test(ct): use DMP v0.45-SNAPSHOT to see if pushing images that have a ARG in their ref works with it --- modules/dataverse-parent/pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index d03d3e242fc..473c143296a 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -199,7 +199,7 @@ 1.7.0 - 0.44.0 + 0.45-SNAPSHOT @@ -215,6 +215,14 @@ never + + oss.sonatype.org + https://oss.sonatype.org/content/repositories/snapshots + + true + always + + From 2de674f6d80249ea2e446275533f4e3b6daa630f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 15:23:21 +0200 Subject: [PATCH 045/366] feat(build,ci): workflow pre-seeding Maven cache from develop #10428 Contains the feature branch for now, too. Will be deleted later before merging it to develop. --- .github/workflows/maven_cache_seed.yaml | 37 +++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/maven_cache_seed.yaml diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml new file mode 100644 index 00000000000..e82ce36f829 --- /dev/null +++ b/.github/workflows/maven_cache_seed.yaml @@ -0,0 +1,37 @@ +name: Maven Cache Seeding + +on: + push: + branches: + - develop + - 10478-version-base-img + +env: + COMMON_CACHE_NAME: dataverse-maven-cache + +jobs: + preseed: + name: Drop and Re-Seed Local Repository + runs-on: ubuntu-latest + if: ${{ github.event_name == 'push' }} + steps: + - name: Drop common cache + uses: prantlf/delete-cache-action@v2 + with: + key: ${{ env.COMMON_CACHE_NAME }} + - name: Checkout repository + uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: "17" + distribution: temurin + - name: Re-Seed common cache + run: | + mvn -B -f modules/dataverse-parent dependency:go-offline dependency:resolve-plugins + - name: Save the cache + uses: actions/cache/save@v4 + with: + path: ~/.m2/repository + key: ${{ env.COMMON_CACHE_NAME }} + From b1943c114110405a613c4093fb2d7eee5fa904d7 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 15:35:38 +0200 Subject: [PATCH 046/366] fix(build,ci): ignore not found when deleting common cache --- .github/workflows/maven_cache_seed.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index e82ce36f829..4650cfcf930 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -16,6 +16,7 @@ jobs: if: ${{ github.event_name == 'push' }} steps: - name: Drop common cache + continue-on-error: true # we don't care if the cache is not around uses: prantlf/delete-cache-action@v2 with: key: ${{ env.COMMON_CACHE_NAME }} From 941fbc904d5700cebcff9d64b0a8a1f1c2268d36 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 15:51:33 +0200 Subject: [PATCH 047/366] style(ct): remove some stale comments --- .github/workflows/container_base_push.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 36741ccd211..7f2f194cbcd 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -123,7 +123,7 @@ jobs: EOF - name: Add additional tags as options - # TODO: remove the feature branch and re-enable the if/else! + # TODO: remove the feature branch run: | # For the development branch, update the latest tag in addition if [[ "${{ matrix.branch }}" == "develop" || "${{ matrix.branch }}" == "10478-version-base-img" ]]; then @@ -133,15 +133,6 @@ jobs: echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" fi - # TODO: remove when feature branch is done - #- name: Skip all but feature-branch - # if: ${{ matrix.branch != '10478-version-base-img' }} - # uses: actions/github-script@v7 - # with: - # script: | - # core.setFailed('Stopping on purpose to avoid mayhem') - - - name: Deploy multi-arch base container image to Docker Hub id: build # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. From b64b6aff9ce38009fdf90c451493b257690472f7 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 15:52:28 +0200 Subject: [PATCH 048/366] feat(ct): make use of common cache in app container builds #10428 --- .github/workflows/container_app_push.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index a92ca4aecbd..347fcf06b86 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -42,11 +42,18 @@ jobs: uses: actions/checkout@v3 - name: Set up JDK + id: setup-java uses: actions/setup-java@v3 with: java-version: "17" distribution: temurin cache: maven + - name: Download common cache on branch cache miss + if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} + uses: actions/cache/restore@v4 + with: + key: dataverse-maven-cache + - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests) run: > @@ -111,11 +118,19 @@ jobs: if: needs.check-secrets.outputs.available == 'true' && ( github.event_name != 'push' || ( github.event_name == 'push' && contains(fromJSON('["develop", "master"]'), github.ref_name))) steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - name: Set up JDK + id: setup-java + uses: actions/setup-java@v3 with: java-version: "17" distribution: temurin + cache: maven + - name: Download common cache on branch cache miss + if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} + uses: actions/cache/restore@v4 + with: + key: dataverse-maven-cache # Depending on context, we push to different targets. Login accordingly. - if: github.event_name != 'pull_request' From 4f48123f73674eb56f3f687cc2e7df55908e13db Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 15:52:49 +0200 Subject: [PATCH 049/366] feat(ci): remove feature branch from maven seed workflow --- .github/workflows/maven_cache_seed.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index 4650cfcf930..d002a446b99 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -4,7 +4,6 @@ on: push: branches: - develop - - 10478-version-base-img env: COMMON_CACHE_NAME: dataverse-maven-cache From 721814a62672a8483d1fd0708071444bc239e806 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 16:01:47 +0200 Subject: [PATCH 050/366] style(ct): rename base image revision from RX to revX It's just much more readable --- modules/container-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index 2754b081986..e5de8841530 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -42,7 +42,7 @@ docker-build gdcc/base:${base.image.tag} - R${project.version} + rev${project.version} eclipse-temurin:${target.java.version}-jre 1000 1000 From 3c0650f6710bcda94c0e83278654a454466b5a41 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 16:02:12 +0200 Subject: [PATCH 051/366] feat(ct): make dataverse app image use base rev1 image --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f9d06b8744..fa267b6fbee 100644 --- a/pom.xml +++ b/pom.xml @@ -956,7 +956,8 @@ unstable false gdcc/base:${base.image.tag} - unstable + + rev1 gdcc/configbaker:${conf.image.tag} ${app.image.tag} From 06a21612347e0a64cfe0adfa05d1823c4927f5b2 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 16:15:00 +0200 Subject: [PATCH 052/366] refactor(ci): delete common cache after we downloaded the old one #10428 --- .github/workflows/maven_cache_seed.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index d002a446b99..5a38abed767 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -14,11 +14,6 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'push' }} steps: - - name: Drop common cache - continue-on-error: true # we don't care if the cache is not around - uses: prantlf/delete-cache-action@v2 - with: - key: ${{ env.COMMON_CACHE_NAME }} - name: Checkout repository uses: actions/checkout@v4 - name: Set up JDK @@ -26,9 +21,16 @@ jobs: with: java-version: "17" distribution: temurin - - name: Re-Seed common cache + - name: Seed common cache run: | mvn -B -f modules/dataverse-parent dependency:go-offline dependency:resolve-plugins + # This non-obvious order is due to the fact that the download via Maven will take a very long time. + # Jobs should not be left without a cache. Deleting and saving in one go leaves only a small chance for a cache miss. + - name: Drop common cache + continue-on-error: true # we don't care if the cache is not around + uses: prantlf/delete-cache-action@v2 + with: + key: ${{ env.COMMON_CACHE_NAME }} - name: Save the cache uses: actions/cache/save@v4 with: From 818bfd4ec32fa0d67f39611f6f3235af730fbfb9 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 16:15:20 +0200 Subject: [PATCH 053/366] test(ci): readd feature branch to test cache handling logic --- .github/workflows/maven_cache_seed.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index 5a38abed767..f4b13725e70 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -4,6 +4,7 @@ on: push: branches: - develop + - 10478-version-base-img env: COMMON_CACHE_NAME: dataverse-maven-cache From a28997c815685b0527e3250c7526d9a03521ddae Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 16:16:33 +0200 Subject: [PATCH 054/366] style(ct): add common cache download to base image Without accurate measuring it seems like we use ~1 minute to download Maven artifacts for this workflow. Lets try to cut that down some by reusing the common cache. --- .github/workflows/container_base_push.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 7f2f194cbcd..667808d4d08 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -69,6 +69,7 @@ jobs: echo "JAVA_VERSION=$(grep '' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV} - name: Set up JDK ${{ env.JAVA_VERSION }} + id: setup-java uses: actions/setup-java@v4 with: java-version: ${{ env.JAVA_VERSION }} @@ -76,6 +77,12 @@ jobs: cache: 'maven' cache-dependency-path: | modules/container-base/pom.xml + - name: Download common cache on branch cache miss + if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} + uses: actions/cache/restore@v4 + with: + key: dataverse-maven-cache + path: ~/.m2/repository # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and # on events in context of upstream because secrets. PRs run in context of forks by default! From 085e41e9c1bd7c550e76ad47b5450ac5fe197450 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 16:19:59 +0200 Subject: [PATCH 055/366] style(ct): remove stale comment about platforms empty in base image --- modules/container-base/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index e5de8841530..60be420bd9a 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -97,7 +97,6 @@ - ${docker.platforms} ${project.build.directory}/buildx-state From 2fe0ca39ac5c9cf044ad833b7e66de449d61efa3 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 16:52:12 +0200 Subject: [PATCH 056/366] fix(build,ci): downgrade to cache action v2 Per https://github.com/actions/cache/issues/1361 restores in v3 and v4 were not working, maybe saving is botched, too? --- .github/workflows/maven_cache_seed.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index f4b13725e70..148808a4b04 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -33,7 +33,7 @@ jobs: with: key: ${{ env.COMMON_CACHE_NAME }} - name: Save the cache - uses: actions/cache/save@v4 + uses: actions/cache@v2 with: path: ~/.m2/repository key: ${{ env.COMMON_CACHE_NAME }} From afad97e4160d60e31b01611e8a1e28ad0192631f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 17:09:50 +0200 Subject: [PATCH 057/366] fix(build,ci,ct): fix missing path for cache restore --- .github/workflows/container_app_push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index 347fcf06b86..3344a8e2d0d 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -52,6 +52,7 @@ jobs: if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} uses: actions/cache/restore@v4 with: + path: ~/.m2/repository key: dataverse-maven-cache @@ -130,6 +131,7 @@ jobs: if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} uses: actions/cache/restore@v4 with: + path: ~/.m2/repository key: dataverse-maven-cache # Depending on context, we push to different targets. Login accordingly. From 1c1c30e8b1d11f830354535f5164a92112eb3ca3 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 17:11:51 +0200 Subject: [PATCH 058/366] test(ci): fix a comment to trigger base image workflow --- modules/container-base/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index 0905ebb62a1..a8bd3a32ca3 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -203,7 +203,7 @@ RUN < Date: Fri, 12 Apr 2024 17:17:49 +0200 Subject: [PATCH 059/366] style(ci): remove feature branch from maven cache seeding again --- .github/workflows/maven_cache_seed.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index 148808a4b04..85f1381c789 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -4,7 +4,6 @@ on: push: branches: - develop - - 10478-version-base-img env: COMMON_CACHE_NAME: dataverse-maven-cache From 43402435ae4d619b872ac9bd14704f54306fc49e Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 17:20:08 +0200 Subject: [PATCH 060/366] doc(ci): add note about cache availability to seeding workflow --- .github/workflows/maven_cache_seed.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index 85f1381c789..e11d8c91c0e 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -31,6 +31,8 @@ jobs: uses: prantlf/delete-cache-action@v2 with: key: ${{ env.COMMON_CACHE_NAME }} + # NOTE: It is vital here to remember that only caches with the scope of the default branch are + # available to other branches. We use the v2 action here to save it anyway. - name: Save the cache uses: actions/cache@v2 with: From 899e8aa6548d8b6076c266807cc265d4c0bb049b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 12 Apr 2024 17:31:16 +0200 Subject: [PATCH 061/366] feat(ci): make sure to rejuvenate the common cache every 7 days --- .github/workflows/maven_cache_seed.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml index e11d8c91c0e..d31559138b8 100644 --- a/.github/workflows/maven_cache_seed.yaml +++ b/.github/workflows/maven_cache_seed.yaml @@ -4,6 +4,10 @@ on: push: branches: - develop + # According to https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy + # all caches are depleted after 7 days of no access. Make sure we rejuvenate every 7 days to keep it available. + schedule: + - cron: '23 2 * * 0' # Run for 'develop' every Sunday at 02:23 UTC env: COMMON_CACHE_NAME: dataverse-maven-cache @@ -12,7 +16,6 @@ jobs: preseed: name: Drop and Re-Seed Local Repository runs-on: ubuntu-latest - if: ${{ github.event_name == 'push' }} steps: - name: Checkout repository uses: actions/checkout@v4 From f538896971022cc4fa011a38aca41936125a30dc Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 15 Apr 2024 14:14:56 +0200 Subject: [PATCH 062/366] chore(ct): replace wait-for with wait4x Aligning configbaker and base image with same tool. wait4x has much more features to wait for different services. --- doc/sphinx-guides/source/container/base-image.rst | 2 +- modules/container-base/src/main/docker/Dockerfile | 12 ++++++------ .../docker/scripts/init_3_wait_dataverse_db_host.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index c41250d48c5..29c357b91f6 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -46,7 +46,7 @@ The base image provides: - CLI tools necessary to run Dataverse (i. e. ``curl`` or ``jq`` - see also :doc:`../installation/prerequisites` in Installation Guide) - Linux tools for analysis, monitoring and so on - `Jattach `__ (attach to running JVM) -- `wait-for `__ (tool to "wait for" a service to be available) +- `wait4x `__ (tool to "wait for" a service to be available) - `dumb-init `__ (see :ref:`below ` for details) This image is created as a "multi-arch image", see :ref:`below `. diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index a8bd3a32ca3..e3fa6e477a9 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -92,8 +92,7 @@ EOF ARG JATTACH_VERSION="v2.1" ARG JATTACH_CHECKSUM="07885fdc782e02e7302c6d190f54c3930afa10a38140365adf54076ec1086a8e" -ARG WAIT_FOR_VERSION="v2.2.3" -ARG WAIT_FOR_CHECKSUM="70271181be69cd2c7265b2746f97fccfd7e8aa1059894138a775369c23589ff4" +ARG WAIT4X_VERSION="v2.14.0" ARG PKGS="jq imagemagick curl unzip wget acl dirmngr gpg lsof procps netcat dumb-init" # Installing the packages in an extra container layer for better caching @@ -108,10 +107,11 @@ RUN < Date: Mon, 15 Apr 2024 14:17:55 +0200 Subject: [PATCH 063/366] build(ct): make target architecture available in base image build As per https://docs.docker.com/reference/dockerfile/#automatic-platform-args-in-the-global-scope BuildKit / buildx will expose the target architecture. It requires adding an ARG in the Dockerfile to inject the data. --- modules/container-base/src/main/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index e3fa6e477a9..256d9159d2d 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -69,6 +69,9 @@ ENV PATH="${PATH}:${PAYARA_DIR}/bin:${SCRIPT_DIR}" \ ### PART 1: SYSTEM ### ARG UID=1000 ARG GID=1000 +# Auto-populated by BuildKit / buildx +#ARG TARGETARCH="amd64" +ARG TARGETARCH USER root WORKDIR / SHELL ["/bin/bash", "-euo", "pipefail", "-c"] From e86133468a0086f0701efc69ad1549e21102f284 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 15 Apr 2024 14:20:18 +0200 Subject: [PATCH 064/366] chore(ct): upgrade base image with jattach v2.2 jattach binary is now available for ARM64 and AMD64, but requires special handling with download URLs and checksums. --- .../container-base/src/main/docker/Dockerfile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index 256d9159d2d..fbd43604eac 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -93,8 +93,9 @@ RUN < Date: Tue, 16 Apr 2024 17:42:18 +0200 Subject: [PATCH 065/366] chore: remove obsolete Maven Cache seed workflow --- .github/workflows/maven_cache_seed.yaml | 44 ------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .github/workflows/maven_cache_seed.yaml diff --git a/.github/workflows/maven_cache_seed.yaml b/.github/workflows/maven_cache_seed.yaml deleted file mode 100644 index d31559138b8..00000000000 --- a/.github/workflows/maven_cache_seed.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: Maven Cache Seeding - -on: - push: - branches: - - develop - # According to https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy - # all caches are depleted after 7 days of no access. Make sure we rejuvenate every 7 days to keep it available. - schedule: - - cron: '23 2 * * 0' # Run for 'develop' every Sunday at 02:23 UTC - -env: - COMMON_CACHE_NAME: dataverse-maven-cache - -jobs: - preseed: - name: Drop and Re-Seed Local Repository - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: "17" - distribution: temurin - - name: Seed common cache - run: | - mvn -B -f modules/dataverse-parent dependency:go-offline dependency:resolve-plugins - # This non-obvious order is due to the fact that the download via Maven will take a very long time. - # Jobs should not be left without a cache. Deleting and saving in one go leaves only a small chance for a cache miss. - - name: Drop common cache - continue-on-error: true # we don't care if the cache is not around - uses: prantlf/delete-cache-action@v2 - with: - key: ${{ env.COMMON_CACHE_NAME }} - # NOTE: It is vital here to remember that only caches with the scope of the default branch are - # available to other branches. We use the v2 action here to save it anyway. - - name: Save the cache - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ env.COMMON_CACHE_NAME }} - From 54fe365964f8c726ec2a3e42bee5b28b41f952d0 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 16 Apr 2024 17:43:42 +0200 Subject: [PATCH 066/366] style(ci): remove superfluous empty line --- .github/workflows/container_base_push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 667808d4d08..660f9bdd861 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -86,7 +86,6 @@ jobs: # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and # on events in context of upstream because secrets. PRs run in context of forks by default! - - name: Log in to the Container registry uses: docker/login-action@v3 with: From fdb5932a1a72e57b3660a123cdc386f8145e70d4 Mon Sep 17 00:00:00 2001 From: paulboon Date: Thu, 18 Apr 2024 11:55:03 +0200 Subject: [PATCH 067/366] Use support email in the system email message 'closing' text --- src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java index 1eee9c65501..49b09cf98ae 100644 --- a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java @@ -117,10 +117,11 @@ public boolean sendSystemEmail(String to, String subject, String messageText, bo return false; } InternetAddress systemAddress = optionalAddress.get(); + InternetAddress supportAddress = getSupportAddress().orElse(systemAddress); String body = messageText + BundleUtil.getStringFromBundle(isHtmlContent ? "notification.email.closing.html" : "notification.email.closing", - List.of(BrandingUtil.getSupportTeamEmailAddress(systemAddress), BrandingUtil.getSupportTeamName(systemAddress))); + List.of(BrandingUtil.getSupportTeamEmailAddress(supportAddress), BrandingUtil.getSupportTeamName(supportAddress))); logger.fine(() -> "Sending email to %s. Subject: <<<%s>>>. Body: %s".formatted(to, subject, body)); try { From 2f61d699b6dd1f7d3b700d06d3436e44e399d0d5 Mon Sep 17 00:00:00 2001 From: paulboon Date: Tue, 30 Apr 2024 14:02:01 +0200 Subject: [PATCH 068/366] Added to the documentation and released notes for the use of the support email address in the closing text of the system emails --- .../10287-use-support-address-in-system-email-text.md | 4 ++++ doc/sphinx-guides/source/installation/config.rst | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 doc/release-notes/10287-use-support-address-in-system-email-text.md diff --git a/doc/release-notes/10287-use-support-address-in-system-email-text.md b/doc/release-notes/10287-use-support-address-in-system-email-text.md new file mode 100644 index 00000000000..7375fda68e2 --- /dev/null +++ b/doc/release-notes/10287-use-support-address-in-system-email-text.md @@ -0,0 +1,4 @@ +### Notification Email Improvement + +The system email text has been improved to use the support email address (`dataverse.mail.support-email`) in the text where it states; 'contact us for support at', instead of the default system email address. +Using the system email address here was particularly problematic when it was a 'noreply' address. diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 065277c06ee..b6555397f75 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -2947,6 +2947,8 @@ If not set, the :ref:`systemEmail` is used for the feedback API/contact form ema Note that only the email address is required, which you can supply without the ``<`` and ``>`` signs, but if you include the text, it's the way to customize the name of your support team, which appears in the "from" address in emails as well as in help text in the UI. If you don't include the text, the installation name (see :ref:`Branding Your Installation`) will appear in the "from" address. +Also note that the support email address is used at the end of notification mails where it states; 'contact us for support at', followed by the support mail address if configured and the system email otherwise. + Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_MAIL_SUPPORT_EMAIL``. See also :ref:`smtp-config`. From 1d394ea901df7cadb7277e47e51eb25716461a2f Mon Sep 17 00:00:00 2001 From: Paul Boon Date: Wed, 8 May 2024 15:29:32 +0200 Subject: [PATCH 069/366] Update doc/sphinx-guides/source/installation/config.rst Co-authored-by: Philip Durbin --- doc/sphinx-guides/source/installation/config.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index b6555397f75..034e91187cc 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -2947,7 +2947,7 @@ If not set, the :ref:`systemEmail` is used for the feedback API/contact form ema Note that only the email address is required, which you can supply without the ``<`` and ``>`` signs, but if you include the text, it's the way to customize the name of your support team, which appears in the "from" address in emails as well as in help text in the UI. If you don't include the text, the installation name (see :ref:`Branding Your Installation`) will appear in the "from" address. -Also note that the support email address is used at the end of notification mails where it states; 'contact us for support at', followed by the support mail address if configured and the system email otherwise. +Also note that the support email address is used at the end of notification mails where it states; "contact us for support at", followed by the support mail address if configured and the system email otherwise. Can also be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_MAIL_SUPPORT_EMAIL``. From ca4202f4d85857368d29cf16a2e2ca4d4f7d6933 Mon Sep 17 00:00:00 2001 From: Paul Boon Date: Wed, 8 May 2024 15:29:52 +0200 Subject: [PATCH 070/366] Update doc/release-notes/10287-use-support-address-in-system-email-text.md Co-authored-by: Philip Durbin --- .../10287-use-support-address-in-system-email-text.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/10287-use-support-address-in-system-email-text.md b/doc/release-notes/10287-use-support-address-in-system-email-text.md index 7375fda68e2..4c294404298 100644 --- a/doc/release-notes/10287-use-support-address-in-system-email-text.md +++ b/doc/release-notes/10287-use-support-address-in-system-email-text.md @@ -1,4 +1,4 @@ ### Notification Email Improvement -The system email text has been improved to use the support email address (`dataverse.mail.support-email`) in the text where it states; 'contact us for support at', instead of the default system email address. +The system email text has been improved to use the support email address (`dataverse.mail.support-email`) in the text where it states; "contact us for support at", instead of the default system email address. Using the system email address here was particularly problematic when it was a 'noreply' address. From 4878cfe47a284f029b2d98adb64d02dafdb540b6 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 10:31:06 -0400 Subject: [PATCH 071/366] separate metadata parsing/params from XML generation code --- .../pidproviders/doi/AbstractDOIProvider.java | 25 ++-- .../pidproviders/doi/DoiMetadata.java | 138 ++++++++++++++++++ .../datacite/DOIDataCiteRegisterService.java | 57 ++++---- 3 files changed, 180 insertions(+), 40 deletions(-) create mode 100644 src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/DoiMetadata.java diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/AbstractDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/AbstractDOIProvider.java index 43e34e74c59..02a7dedce47 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/AbstractDOIProvider.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/AbstractDOIProvider.java @@ -91,31 +91,30 @@ public String getMetadataFromDvObject(String identifier, Map met } else { dataset = (Dataset) dvObject.getOwner(); } - - XmlMetadataTemplate metadataTemplate = new XmlMetadataTemplate(); - metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1)); - metadataTemplate.setCreators(Arrays.asList(metadata.get("datacite.creator").split("; "))); - metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors()); + DoiMetadata doiMetadata = new DoiMetadata(); + doiMetadata.setIdentifier(identifier.substring(identifier.indexOf(':') + 1)); + doiMetadata.setCreators(Arrays.asList(metadata.get("datacite.creator").split("; "))); + doiMetadata.setAuthors(dataset.getLatestVersion().getDatasetAuthors()); if (dvObject.isInstanceofDataset()) { - metadataTemplate.setDescription(dataset.getLatestVersion().getDescriptionPlainText()); + doiMetadata.setDescription(dataset.getLatestVersion().getDescriptionPlainText()); } if (dvObject.isInstanceofDataFile()) { DataFile df = (DataFile) dvObject; String fileDescription = df.getDescription(); - metadataTemplate.setDescription(fileDescription == null ? "" : fileDescription); + doiMetadata.setDescription(fileDescription == null ? "" : fileDescription); } - metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts()); - metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers()); - metadataTemplate.setTitle(dvObject.getCurrentName()); + doiMetadata.setContacts(dataset.getLatestVersion().getDatasetContacts()); + doiMetadata.setProducers(dataset.getLatestVersion().getDatasetProducers()); + doiMetadata.setTitle(dvObject.getCurrentName()); String producerString = pidProviderService.getProducer(); if (producerString.isEmpty() || producerString.equals(DatasetField.NA_VALUE)) { producerString = UNAVAILABLE; } - metadataTemplate.setPublisher(producerString); - metadataTemplate.setPublisherYear(metadata.get("datacite.publicationyear")); + doiMetadata.setPublisher(producerString); + doiMetadata.setPublisherYear(metadata.get("datacite.publicationyear")); - String xmlMetadata = metadataTemplate.generateXML(dvObject); + String xmlMetadata = new XmlMetadataTemplate(doiMetadata).generateXML(dvObject); logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata); return xmlMetadata; } diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/DoiMetadata.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/DoiMetadata.java new file mode 100644 index 00000000000..ffd24747bc2 --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/DoiMetadata.java @@ -0,0 +1,138 @@ +package edu.harvard.iq.dataverse.pidproviders.doi; + +import java.util.ArrayList; +import java.util.List; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; + +import edu.harvard.iq.dataverse.DatasetAuthor; + + +//Parses some specific parts of a DataCite XML metadata file +public class DoiMetadata { + + private String identifier; + private List creators; + private String title; + private String publisher; + private String publisherYear; + private List datafileIdentifiers; + private List authors; + private String description; + private List contacts; + private List producers; + + + public DoiMetadata() { + } + + public void parseDataCiteXML(String xmlMetaData) { + Document doc = Jsoup.parseBodyFragment(xmlMetaData); + Elements identifierElements = doc.select("identifier"); + if (identifierElements.size() > 0) { + identifier = identifierElements.get(0).html(); + } + Elements creatorElements = doc.select("creatorName"); + creators = new ArrayList<>(); + for (Element creatorElement : creatorElements) { + creators.add(creatorElement.html()); + } + Elements titleElements = doc.select("title"); + if (titleElements.size() > 0) { + title = titleElements.get(0).html(); + } + Elements publisherElements = doc.select("publisher"); + if (publisherElements.size() > 0) { + publisher = publisherElements.get(0).html(); + } + Elements publisherYearElements = doc.select("publicationYear"); + if (publisherYearElements.size() > 0) { + publisherYear = publisherYearElements.get(0).html(); + } + } + + public String getIdentifier() { + return identifier; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } + + public List getCreators() { + return creators; + } + + public void setCreators(List creators) { + this.creators = creators; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getPublisher() { + return publisher; + } + + public void setPublisher(String publisher) { + this.publisher = publisher; + } + + public String getPublisherYear() { + return publisherYear; + } + + public void setPublisherYear(String publisherYear) { + this.publisherYear = publisherYear; + } + + + public List getProducers() { + return producers; + } + + public void setProducers(List producers) { + this.producers = producers; + } + + public List getContacts() { + return contacts; + } + + public void setContacts(List contacts) { + this.contacts = contacts; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public List getAuthors() { + return authors; + } + + public void setAuthors(List authors) { + this.authors = authors; + } + + + public List getDatafileIdentifiers() { + return datafileIdentifiers; + } + + public void setDatafileIdentifiers(List datafileIdentifiers) { + this.datafileIdentifiers = datafileIdentifiers; + } + +} \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DOIDataCiteRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DOIDataCiteRegisterService.java index 0e322eace05..bc69275ac1d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DOIDataCiteRegisterService.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DOIDataCiteRegisterService.java @@ -21,6 +21,7 @@ import edu.harvard.iq.dataverse.DvObject; import edu.harvard.iq.dataverse.branding.BrandingUtil; import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.DoiMetadata; import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate; /** @@ -90,28 +91,28 @@ public static String getMetadataFromDvObject(String identifier, Map from HTML, it leaves '&' (at least so we need to xml escape as well String description = StringEscapeUtils.escapeXml10(dataset.getLatestVersion().getDescriptionPlainText()); if (description.isEmpty() || description.equals(DatasetField.NA_VALUE)) { description = AbstractPidProvider.UNAVAILABLE; } - metadataTemplate.setDescription(description); + doiMetadata.setDescription(description); } if (dvObject.isInstanceofDataFile()) { DataFile df = (DataFile) dvObject; //Note: File metadata is not escaped like dataset metadata is, so adding an xml escape here. //This could/should be removed if the datafile methods add escaping String fileDescription = StringEscapeUtils.escapeXml10(df.getDescription()); - metadataTemplate.setDescription(fileDescription == null ? AbstractPidProvider.UNAVAILABLE : fileDescription); + doiMetadata.setDescription(fileDescription == null ? AbstractPidProvider.UNAVAILABLE : fileDescription); } - metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts()); - metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers()); + doiMetadata.setContacts(dataset.getLatestVersion().getDatasetContacts()); + doiMetadata.setProducers(dataset.getLatestVersion().getDatasetProducers()); String title = dvObject.getCurrentName(); if(dvObject.isInstanceofDataFile()) { //Note file title is not currently escaped the way the dataset title is, so adding it here. @@ -122,40 +123,41 @@ public static String getMetadataFromDvObject(String identifier, Map metadata, DvObject dvObject) { - XmlMetadataTemplate metadataTemplate = new XmlMetadataTemplate(); - metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1)); - metadataTemplate.setCreators(Arrays.asList(metadata.get("datacite.creator").split("; "))); + DoiMetadata doiMetadata = new DoiMetadata(); + + doiMetadata.setIdentifier(identifier.substring(identifier.indexOf(':') + 1)); + doiMetadata.setCreators(Arrays.asList(metadata.get("datacite.creator").split("; "))); - metadataTemplate.setDescription(AbstractPidProvider.UNAVAILABLE); + doiMetadata.setDescription(AbstractPidProvider.UNAVAILABLE); String title =metadata.get("datacite.title"); System.out.print("Map metadata title: "+ metadata.get("datacite.title")); - metadataTemplate.setAuthors(null); + doiMetadata.setAuthors(null); - metadataTemplate.setTitle(title); + doiMetadata.setTitle(title); String producerString = AbstractPidProvider.UNAVAILABLE; - metadataTemplate.setPublisher(producerString); - metadataTemplate.setPublisherYear(metadata.get("datacite.publicationyear")); + doiMetadata.setPublisher(producerString); + doiMetadata.setPublisherYear(metadata.get("datacite.publicationyear")); - String xmlMetadata = metadataTemplate.generateXML(dvObject); + String xmlMetadata = new XmlMetadataTemplate(doiMetadata).generateXML(dvObject); logger.log(Level.FINE, "XML to send to DataCite: {0}", xmlMetadata); return xmlMetadata; } @@ -209,11 +211,12 @@ Map getMetadata(String identifier) throws IOException { Map metadata = new HashMap<>(); try { String xmlMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1)); - XmlMetadataTemplate template = new XmlMetadataTemplate(xmlMetadata); - metadata.put("datacite.creator", String.join("; ", template.getCreators())); - metadata.put("datacite.title", template.getTitle()); - metadata.put("datacite.publisher", template.getPublisher()); - metadata.put("datacite.publicationyear", template.getPublisherYear()); + DoiMetadata doiMetadata = new DoiMetadata(); + doiMetadata.parseDataCiteXML(xmlMetadata); + metadata.put("datacite.creator", String.join("; ", doiMetadata.getCreators())); + metadata.put("datacite.title", doiMetadata.getTitle()); + metadata.put("datacite.publisher", doiMetadata.getPublisher()); + metadata.put("datacite.publicationyear", doiMetadata.getPublisherYear()); } catch (RuntimeException e) { logger.log(Level.INFO, identifier, e); } From 68792c2f92c90f716f39caaa5f76b652592186c0 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 10:31:37 -0400 Subject: [PATCH 072/366] extract some common xml writing util code --- .../dataverse/export/ddi/DdiExportUtil.java | 486 ++++++------------ .../iq/dataverse/util/xml/XmlWriterUtil.java | 174 +++++++ 2 files changed, 340 insertions(+), 320 deletions(-) create mode 100644 src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java index 9a689f7a4ed..0c861cb6c09 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java @@ -24,6 +24,8 @@ import edu.harvard.iq.dataverse.util.SystemConfig; import edu.harvard.iq.dataverse.util.json.JsonUtil; import edu.harvard.iq.dataverse.util.xml.XmlPrinter; +import edu.harvard.iq.dataverse.util.xml.XmlWriterUtil; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -111,9 +113,9 @@ private static void dtoddi(DatasetDTO datasetDto, OutputStream outputStream) thr xmlw.writeDefaultNamespace("ddi:codebook:2_5"); xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); xmlw.writeAttribute("xsi:schemaLocation", DDIExporter.DEFAULT_XML_NAMESPACE + " " + DDIExporter.DEFAULT_XML_SCHEMALOCATION); - writeAttribute(xmlw, "version", DDIExporter.DEFAULT_XML_VERSION); + xmlw.writeAttribute("version", DDIExporter.DEFAULT_XML_VERSION); if(DvObjectContainer.isMetadataLanguageSet(datasetDto.getMetadataLanguage())) { - writeAttribute(xmlw, "xml:lang", datasetDto.getMetadataLanguage()); + xmlw.writeAttribute("xml:lang", datasetDto.getMetadataLanguage()); } createStdyDscr(xmlw, datasetDto); createOtherMats(xmlw, datasetDto.getDatasetVersion().getFiles()); @@ -133,9 +135,9 @@ public static void datasetJson2ddi(JsonObject datasetDtoAsJson, JsonArray fileDe xmlw.writeDefaultNamespace("ddi:codebook:2_5"); xmlw.writeAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); xmlw.writeAttribute("xsi:schemaLocation", DDIExporter.DEFAULT_XML_NAMESPACE + " " + DDIExporter.DEFAULT_XML_SCHEMALOCATION); - writeAttribute(xmlw, "version", DDIExporter.DEFAULT_XML_VERSION); + xmlw.writeAttribute("version", DDIExporter.DEFAULT_XML_VERSION); if(DvObjectContainer.isMetadataLanguageSet(datasetDto.getMetadataLanguage())) { - writeAttribute(xmlw, "xml:lang", datasetDto.getMetadataLanguage()); + xmlw.writeAttribute("xml:lang", datasetDto.getMetadataLanguage()); } createStdyDscr(xmlw, datasetDto); createFileDscr(xmlw, fileDetails); @@ -186,15 +188,15 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto) xmlw.writeStartElement("citation"); xmlw.writeStartElement("titlStmt"); - writeFullElement(xmlw, "titl", dto2Primitive(version, DatasetFieldConstant.title), datasetDto.getMetadataLanguage()); - writeFullElement(xmlw, "subTitl", dto2Primitive(version, DatasetFieldConstant.subTitle)); + XmlWriterUtil.writeFullElement(xmlw, "titl", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.title), datasetDto.getMetadataLanguage()); + XmlWriterUtil.writeFullElement(xmlw, "subTitl", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.subTitle)); FieldDTO altField = dto2FieldDTO( version, DatasetFieldConstant.alternativeTitle, "citation" ); if (altField != null) { writeMultipleElement(xmlw, "altTitl", altField, datasetDto.getMetadataLanguage()); } xmlw.writeStartElement("IDNo"); - writeAttribute(xmlw, "agency", persistentAgency); + XmlWriterUtil.writeAttribute(xmlw, "agency", persistentAgency); xmlw.writeCharacters(pid); @@ -218,23 +220,23 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto) boolean excludeRepository = settingsService.isTrueForKey(SettingsServiceBean.Key.ExportInstallationAsDistributorOnlyWhenNotSet, false); if (!StringUtils.isEmpty(datasetDto.getPublisher()) && !(excludeRepository && distributorSet)) { xmlw.writeStartElement("distrbtr"); - writeAttribute(xmlw, "source", "archive"); + xmlw.writeAttribute("source", "archive"); xmlw.writeCharacters(datasetDto.getPublisher()); xmlw.writeEndElement(); //distrbtr } writeDistributorsElement(xmlw, version, datasetDto.getMetadataLanguage()); writeContactsElement(xmlw, version); /* per SCHEMA, depositr comes before depDate! - L.A. */ - writeFullElement(xmlw, "depositr", dto2Primitive(version, DatasetFieldConstant.depositor)); + XmlWriterUtil.writeFullElement(xmlw, "depositr", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.depositor)); /* ... and depDate comes before distDate - L.A. */ - writeFullElement(xmlw, "depDate", dto2Primitive(version, DatasetFieldConstant.dateOfDeposit)); - writeFullElement(xmlw, "distDate", dto2Primitive(version, DatasetFieldConstant.distributionDate)); + XmlWriterUtil.writeFullElement(xmlw, "depDate", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.dateOfDeposit)); + XmlWriterUtil.writeFullElement(xmlw, "distDate", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.distributionDate)); xmlw.writeEndElement(); // diststmt writeSeriesElement(xmlw, version); xmlw.writeStartElement("holdings"); - writeAttribute(xmlw, "URI", pidUri); + XmlWriterUtil.writeAttribute(xmlw, "URI", pidUri); xmlw.writeEndElement(); //holdings xmlw.writeEndElement(); // citation @@ -247,7 +249,7 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto) writeSubjectElement(xmlw, version, datasetDto.getMetadataLanguage()); //Subject and Keywords writeAbstractElement(xmlw, version, datasetDto.getMetadataLanguage()); // Description writeSummaryDescriptionElement(xmlw, version, datasetDto.getMetadataLanguage()); - writeFullElement(xmlw, "notes", dto2Primitive(version, DatasetFieldConstant.notesText)); + XmlWriterUtil.writeFullElement(xmlw, "notes", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.notesText)); //////// xmlw.writeEndElement(); // stdyInfo @@ -255,7 +257,7 @@ private static void createStdyDscr(XMLStreamWriter xmlw, DatasetDTO datasetDto) writeDataAccess(xmlw , version); writeOtherStudyMaterial(xmlw , version); - writeFullElement(xmlw, "notes", dto2Primitive(version, DatasetFieldConstant.datasetLevelErrorNotes)); + XmlWriterUtil.writeFullElement(xmlw, "notes", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.datasetLevelErrorNotes)); xmlw.writeEndElement(); // stdyDscr @@ -274,10 +276,10 @@ private static void writeOtherStudyMaterial(XMLStreamWriter xmlw , DatasetVersio return; } xmlw.writeStartElement("othrStdyMat"); - writeFullElementList(xmlw, "relMat", relMaterials); - writeFullElementList(xmlw, "relStdy", relDatasets); + XmlWriterUtil.writeFullElementList(xmlw, "relMat", relMaterials); + XmlWriterUtil.writeFullElementList(xmlw, "relStdy", relDatasets); writeRelPublElement(xmlw, version); - writeFullElementList(xmlw, "othRefs", relReferences); + XmlWriterUtil.writeFullElementList(xmlw, "othRefs", relReferences); xmlw.writeEndElement(); //othrStdyMat } @@ -292,29 +294,29 @@ private static void writeDataAccess(XMLStreamWriter xmlw , DatasetVersionDTO ver xmlw.writeStartElement("dataAccs"); xmlw.writeStartElement("setAvail"); - writeFullElement(xmlw, "accsPlac", version.getDataAccessPlace()); - writeFullElement(xmlw, "origArch", version.getOriginalArchive()); - writeFullElement(xmlw, "avlStatus", version.getAvailabilityStatus()); - writeFullElement(xmlw, "collSize", version.getSizeOfCollection()); - writeFullElement(xmlw, "complete", version.getStudyCompletion()); + XmlWriterUtil.writeFullElement(xmlw, "accsPlac", version.getDataAccessPlace()); + XmlWriterUtil.writeFullElement(xmlw, "origArch", version.getOriginalArchive()); + XmlWriterUtil.writeFullElement(xmlw, "avlStatus", version.getAvailabilityStatus()); + XmlWriterUtil.writeFullElement(xmlw, "collSize", version.getSizeOfCollection()); + XmlWriterUtil.writeFullElement(xmlw, "complete", version.getStudyCompletion()); xmlw.writeEndElement(); //setAvail xmlw.writeStartElement("useStmt"); - writeFullElement(xmlw, "confDec", version.getConfidentialityDeclaration()); - writeFullElement(xmlw, "specPerm", version.getSpecialPermissions()); - writeFullElement(xmlw, "restrctn", version.getRestrictions()); - writeFullElement(xmlw, "contact", version.getContactForAccess()); - writeFullElement(xmlw, "citReq", version.getCitationRequirements()); - writeFullElement(xmlw, "deposReq", version.getDepositorRequirements()); - writeFullElement(xmlw, "conditions", version.getConditions()); - writeFullElement(xmlw, "disclaimer", version.getDisclaimer()); + XmlWriterUtil.writeFullElement(xmlw, "confDec", version.getConfidentialityDeclaration()); + XmlWriterUtil.writeFullElement(xmlw, "specPerm", version.getSpecialPermissions()); + XmlWriterUtil.writeFullElement(xmlw, "restrctn", version.getRestrictions()); + XmlWriterUtil.writeFullElement(xmlw, "contact", version.getContactForAccess()); + XmlWriterUtil.writeFullElement(xmlw, "citReq", version.getCitationRequirements()); + XmlWriterUtil.writeFullElement(xmlw, "deposReq", version.getDepositorRequirements()); + XmlWriterUtil.writeFullElement(xmlw, "conditions", version.getConditions()); + XmlWriterUtil.writeFullElement(xmlw, "disclaimer", version.getDisclaimer()); xmlw.writeEndElement(); //useStmt /* any s: */ if (version.getTermsOfAccess() != null && !version.getTermsOfAccess().trim().equals("")) { xmlw.writeStartElement("notes"); - writeAttribute(xmlw, "type", NOTE_TYPE_TERMS_OF_ACCESS); - writeAttribute(xmlw, "level", LEVEL_DV); + xmlw.writeAttribute("type", NOTE_TYPE_TERMS_OF_ACCESS); + xmlw.writeAttribute("level", LEVEL_DV); xmlw.writeCharacters(version.getTermsOfAccess()); xmlw.writeEndElement(); //notes } @@ -341,9 +343,9 @@ private static void writeDocDescElement (XMLStreamWriter xmlw, DatasetDTO datase xmlw.writeStartElement("docDscr"); xmlw.writeStartElement("citation"); xmlw.writeStartElement("titlStmt"); - writeFullElement(xmlw, "titl", dto2Primitive(version, DatasetFieldConstant.title), datasetDto.getMetadataLanguage()); + XmlWriterUtil.writeFullElement(xmlw, "titl", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.title), datasetDto.getMetadataLanguage()); xmlw.writeStartElement("IDNo"); - writeAttribute(xmlw, "agency", persistentAgency); + XmlWriterUtil.writeAttribute(xmlw, "agency", persistentAgency); xmlw.writeCharacters(persistentProtocol + ":" + persistentAuthority + "/" + persistentId); xmlw.writeEndElement(); // IDNo xmlw.writeEndElement(); // titlStmt @@ -351,11 +353,11 @@ private static void writeDocDescElement (XMLStreamWriter xmlw, DatasetDTO datase //The doc is always published by the Dataverse Repository if (!StringUtils.isEmpty(datasetDto.getPublisher())) { xmlw.writeStartElement("distrbtr"); - writeAttribute(xmlw, "source", "archive"); + xmlw.writeAttribute("source", "archive"); xmlw.writeCharacters(datasetDto.getPublisher()); xmlw.writeEndElement(); // distrbtr } - writeFullElement(xmlw, "distDate", datasetDto.getPublicationDate()); + XmlWriterUtil.writeFullElement(xmlw, "distDate", datasetDto.getPublicationDate()); xmlw.writeEndElement(); // diststmt writeVersionStatement(xmlw, version); @@ -369,10 +371,10 @@ private static void writeDocDescElement (XMLStreamWriter xmlw, DatasetDTO datase private static void writeVersionStatement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException{ xmlw.writeStartElement("verStmt"); - writeAttribute(xmlw,"source","archive"); + XmlWriterUtil.writeAttribute(xmlw,"source","archive"); xmlw.writeStartElement("version"); - writeAttribute(xmlw,"date", datasetVersionDTO.getReleaseTime().substring(0, 10)); - writeAttribute(xmlw,"type", datasetVersionDTO.getVersionState().toString()); + XmlWriterUtil.writeAttribute(xmlw,"date", datasetVersionDTO.getReleaseTime().substring(0, 10)); + XmlWriterUtil.writeAttribute(xmlw,"type", datasetVersionDTO.getVersionState().toString()); xmlw.writeCharacters(datasetVersionDTO.getVersionNumber().toString()); xmlw.writeEndElement(); // version xmlw.writeEndElement(); // verStmt @@ -523,14 +525,14 @@ private static void writeSummaryDescriptionElement(XMLStreamWriter xmlw, Dataset * "" entries, then all the "" ones: */ for (String nationEntry : nationList) { - writeFullElement(xmlw, "nation", nationEntry); + XmlWriterUtil.writeFullElement(xmlw, "nation", nationEntry); } for (String geogCoverEntry : geogCoverList) { - writeFullElement(xmlw, "geogCover", geogCoverEntry); + XmlWriterUtil.writeFullElement(xmlw, "geogCover", geogCoverEntry); } } - writeFullElementList(xmlw, "geogUnit", dto2PrimitiveList(datasetVersionDTO, DatasetFieldConstant.geographicUnit)); + XmlWriterUtil.writeFullElementList(xmlw, "geogUnit", dto2PrimitiveList(datasetVersionDTO, DatasetFieldConstant.geographicUnit)); /* Only 1 geoBndBox is allowed in the DDI. So, I'm just going to arbitrarily use the first one, and ignore the rest! -L.A. */ @@ -563,16 +565,16 @@ private static void writeSummaryDescriptionElement(XMLStreamWriter xmlw, Dataset */ if (geoBndBoxMap.get("westBL") != null) { - writeFullElement(xmlw, "westBL", geoBndBoxMap.get("westBL")); + XmlWriterUtil.writeFullElement(xmlw, "westBL", geoBndBoxMap.get("westBL")); } if (geoBndBoxMap.get("eastBL") != null) { - writeFullElement(xmlw, "eastBL", geoBndBoxMap.get("eastBL")); + XmlWriterUtil.writeFullElement(xmlw, "eastBL", geoBndBoxMap.get("eastBL")); } if (geoBndBoxMap.get("southBL") != null) { - writeFullElement(xmlw, "southBL", geoBndBoxMap.get("southBL")); + XmlWriterUtil.writeFullElement(xmlw, "southBL", geoBndBoxMap.get("southBL")); } if (geoBndBoxMap.get("northBL") != null) { - writeFullElement(xmlw, "northBL", geoBndBoxMap.get("northBL")); + XmlWriterUtil.writeFullElement(xmlw, "northBL", geoBndBoxMap.get("northBL")); } xmlw.writeEndElement(); @@ -580,7 +582,7 @@ private static void writeSummaryDescriptionElement(XMLStreamWriter xmlw, Dataset /* analyUnit: */ if (unitOfAnalysisDTO != null) { - writeI18NElementList(xmlw, "anlyUnit", unitOfAnalysisDTO.getMultipleVocab(), "unitOfAnalysis", unitOfAnalysisDTO.getTypeClass(), "socialscience", lang); + XmlWriterUtil.writeI18NElementList(xmlw, "anlyUnit", unitOfAnalysisDTO.getMultipleVocab(), "unitOfAnalysis", unitOfAnalysisDTO.getTypeClass(), "socialscience", lang); } @@ -600,16 +602,16 @@ private static void writeSummaryDescriptionElement(XMLStreamWriter xmlw, Dataset private static void writeMultipleElement(XMLStreamWriter xmlw, String element, FieldDTO fieldDTO, String lang) throws XMLStreamException { for (String value : fieldDTO.getMultiplePrimitive()) { //Write multiple lang vals for controlled vocab, otherwise don't include any lang tag - writeFullElement(xmlw, element, value, fieldDTO.isControlledVocabularyField() ? lang : null); + XmlWriterUtil.writeFullElement(xmlw, element, value, fieldDTO.isControlledVocabularyField() ? lang : null); } } private static void writeDateElement(XMLStreamWriter xmlw, String element, String cycle, String event, String dateIn) throws XMLStreamException { xmlw.writeStartElement(element); - writeAttribute(xmlw, "cycle", cycle); - writeAttribute(xmlw, "event", event); - writeAttribute(xmlw, "date", dateIn); + XmlWriterUtil.writeAttribute(xmlw, "cycle", cycle); + XmlWriterUtil.writeAttribute(xmlw, "event", event); + XmlWriterUtil.writeAttribute(xmlw, "date", dateIn); xmlw.writeCharacters(dateIn); xmlw.writeEndElement(); @@ -641,15 +643,15 @@ private static void writeDateElement(XMLStreamWriter xmlw, String element, Strin private static void writeMethodElement(XMLStreamWriter xmlw , DatasetVersionDTO version, String lang) throws XMLStreamException{ xmlw.writeStartElement("method"); xmlw.writeStartElement("dataColl"); - writeI18NElement(xmlw, "timeMeth", version, DatasetFieldConstant.timeMethod,lang); - writeI18NElement(xmlw, "dataCollector", version, DatasetFieldConstant.dataCollector, lang); - writeI18NElement(xmlw, "collectorTraining", version, DatasetFieldConstant.collectorTraining, lang); - writeI18NElement(xmlw, "frequenc", version, DatasetFieldConstant.frequencyOfDataCollection, lang); - writeI18NElement(xmlw, "sampProc", version, DatasetFieldConstant.samplingProcedure, lang); + XmlWriterUtil.writeI18NElement(xmlw, "timeMeth", version, DatasetFieldConstant.timeMethod,lang); + XmlWriterUtil.writeI18NElement(xmlw, "dataCollector", version, DatasetFieldConstant.dataCollector, lang); + XmlWriterUtil.writeI18NElement(xmlw, "collectorTraining", version, DatasetFieldConstant.collectorTraining, lang); + XmlWriterUtil.writeI18NElement(xmlw, "frequenc", version, DatasetFieldConstant.frequencyOfDataCollection, lang); + XmlWriterUtil.writeI18NElement(xmlw, "sampProc", version, DatasetFieldConstant.samplingProcedure, lang); writeTargetSampleElement(xmlw, version); - writeI18NElement(xmlw, "deviat", version, DatasetFieldConstant.deviationsFromSampleDesign, lang); + XmlWriterUtil.writeI18NElement(xmlw, "deviat", version, DatasetFieldConstant.deviationsFromSampleDesign, lang); /* comes before : */ FieldDTO collModeFieldDTO = dto2FieldDTO(version, DatasetFieldConstant.collectionMode, "socialscience"); @@ -658,37 +660,37 @@ private static void writeMethodElement(XMLStreamWriter xmlw , DatasetVersionDTO // Below is a backward compatibility check allowing export to work in // an instance where the metadata block has not been updated yet. if (collModeFieldDTO.getMultiple()) { - writeI18NElementList(xmlw, "collMode", collModeFieldDTO.getMultipleVocab(), DatasetFieldConstant.collectionMode, collModeFieldDTO.getTypeClass(), "socialscience", lang); + XmlWriterUtil.writeI18NElementList(xmlw, "collMode", collModeFieldDTO.getMultipleVocab(), DatasetFieldConstant.collectionMode, collModeFieldDTO.getTypeClass(), "socialscience", lang); } else { - writeI18NElement(xmlw, "collMode", version, DatasetFieldConstant.collectionMode, lang); + XmlWriterUtil.writeI18NElement(xmlw, "collMode", version, DatasetFieldConstant.collectionMode, lang); } } /* and so does : */ - writeI18NElement(xmlw, "resInstru", version, DatasetFieldConstant.researchInstrument, lang); + XmlWriterUtil.writeI18NElement(xmlw, "resInstru", version, DatasetFieldConstant.researchInstrument, lang); xmlw.writeStartElement("sources"); - writeFullElementList(xmlw, "dataSrc", dto2PrimitiveList(version, DatasetFieldConstant.dataSources)); - writeI18NElement(xmlw, "srcOrig", version, DatasetFieldConstant.originOfSources, lang); - writeI18NElement(xmlw, "srcChar", version, DatasetFieldConstant.characteristicOfSources, lang); - writeI18NElement(xmlw, "srcDocu", version, DatasetFieldConstant.accessToSources, lang); + XmlWriterUtil.writeFullElementList(xmlw, "dataSrc", dto2PrimitiveList(version, DatasetFieldConstant.dataSources)); + XmlWriterUtil.writeI18NElement(xmlw, "srcOrig", version, DatasetFieldConstant.originOfSources, lang); + XmlWriterUtil.writeI18NElement(xmlw, "srcChar", version, DatasetFieldConstant.characteristicOfSources, lang); + XmlWriterUtil.writeI18NElement(xmlw, "srcDocu", version, DatasetFieldConstant.accessToSources, lang); xmlw.writeEndElement(); //sources - writeI18NElement(xmlw, "collSitu", version, DatasetFieldConstant.dataCollectionSituation, lang); - writeI18NElement(xmlw, "actMin", version, DatasetFieldConstant.actionsToMinimizeLoss, lang); + XmlWriterUtil.writeI18NElement(xmlw, "collSitu", version, DatasetFieldConstant.dataCollectionSituation, lang); + XmlWriterUtil.writeI18NElement(xmlw, "actMin", version, DatasetFieldConstant.actionsToMinimizeLoss, lang); /* "" has the uppercase C: */ - writeI18NElement(xmlw, "ConOps", version, DatasetFieldConstant.controlOperations, lang); - writeI18NElement(xmlw, "weight", version, DatasetFieldConstant.weighting, lang); - writeI18NElement(xmlw, "cleanOps", version, DatasetFieldConstant.cleaningOperations, lang); + XmlWriterUtil.writeI18NElement(xmlw, "ConOps", version, DatasetFieldConstant.controlOperations, lang); + XmlWriterUtil.writeI18NElement(xmlw, "weight", version, DatasetFieldConstant.weighting, lang); + XmlWriterUtil.writeI18NElement(xmlw, "cleanOps", version, DatasetFieldConstant.cleaningOperations, lang); xmlw.writeEndElement(); //dataColl /* before : */ writeNotesElement(xmlw, version); xmlw.writeStartElement("anlyInfo"); - //writeFullElement(xmlw, "anylInfo", dto2Primitive(version, DatasetFieldConstant.datasetLevelErrorNotes)); - writeI18NElement(xmlw, "respRate", version, DatasetFieldConstant.responseRate, lang); - writeI18NElement(xmlw, "EstSmpErr", version, DatasetFieldConstant.samplingErrorEstimates, lang); - writeI18NElement(xmlw, "dataAppr", version, DatasetFieldConstant.otherDataAppraisal, lang); + //XmlWriterUtil.writeFullElement(xmlw, "anylInfo", dto2Primitive(version, DatasetFieldConstant.datasetLevelErrorNotes)); + XmlWriterUtil.writeI18NElement(xmlw, "respRate", version, DatasetFieldConstant.responseRate, lang); + XmlWriterUtil.writeI18NElement(xmlw, "EstSmpErr", version, DatasetFieldConstant.samplingErrorEstimates, lang); + XmlWriterUtil.writeI18NElement(xmlw, "dataAppr", version, DatasetFieldConstant.otherDataAppraisal, lang); xmlw.writeEndElement(); //anlyInfo xmlw.writeEndElement();//method @@ -705,7 +707,7 @@ private static void writeSubjectElement(XMLStreamWriter xmlw, DatasetVersionDTO if (CITATION_BLOCK_NAME.equals(key)) { for (FieldDTO fieldDTO : value.getFields()) { if (DatasetFieldConstant.subject.equals(fieldDTO.getTypeName())) { - writeI18NElementList(xmlw, "keyword", fieldDTO.getMultipleVocab(), "subject", + XmlWriterUtil.writeI18NElementList(xmlw, "keyword", fieldDTO.getMultipleVocab(), "subject", fieldDTO.getTypeClass(), "citation", lang); } @@ -732,14 +734,10 @@ private static void writeSubjectElement(XMLStreamWriter xmlw, DatasetVersionDTO } if (!keywordValue.isEmpty()) { xmlw.writeStartElement("keyword"); - if (!keywordVocab.isEmpty()) { - writeAttribute(xmlw, "vocab", keywordVocab); - } - if (!keywordURI.isEmpty()) { - writeAttribute(xmlw, "vocabURI", keywordURI); - } + XmlWriterUtil.writeAttribute(xmlw, "vocab", keywordVocab); + XmlWriterUtil.writeAttribute(xmlw, "vocabURI", keywordURI); if (lang != null && isCVV) { - writeAttribute(xmlw, "xml:lang", defaultLocale.getLanguage()); + XmlWriterUtil.writeAttribute(xmlw, "xml:lang", defaultLocale.getLanguage()); xmlw.writeCharacters(ControlledVocabularyValue.getLocaleStrValue(keywordValue, DatasetFieldConstant.keywordValue, CITATION_BLOCK_NAME, defaultLocale, true)); @@ -753,13 +751,9 @@ DatasetFieldConstant.keywordValue, CITATION_BLOCK_NAME, new Locale(lang), false); if (translatedValue != null) { xmlw.writeStartElement("keyword"); - if (!keywordVocab.isEmpty()) { - writeAttribute(xmlw, "vocab", keywordVocab); - } - if (!keywordURI.isEmpty()) { - writeAttribute(xmlw, "vocabURI", keywordURI); - } - writeAttribute(xmlw, "xml:lang", lang); + XmlWriterUtil.writeAttribute(xmlw, "vocab", keywordVocab); + XmlWriterUtil.writeAttribute(xmlw, "vocabURI", keywordURI); + XmlWriterUtil.writeAttribute(xmlw, "xml:lang", lang); xmlw.writeCharacters(translatedValue); xmlw.writeEndElement(); // Keyword } @@ -792,14 +786,10 @@ DatasetFieldConstant.keywordValue, CITATION_BLOCK_NAME, new Locale(lang), } if (!topicClassificationValue.isEmpty()) { xmlw.writeStartElement("topcClas"); - if (!topicClassificationVocab.isEmpty()) { - writeAttribute(xmlw, "vocab", topicClassificationVocab); - } - if (!topicClassificationURI.isEmpty()) { - writeAttribute(xmlw, "vocabURI", topicClassificationURI); - } + XmlWriterUtil.writeAttribute(xmlw, "vocab", topicClassificationVocab); + XmlWriterUtil.writeAttribute(xmlw, "vocabURI", topicClassificationURI); if (lang != null && isCVV) { - writeAttribute(xmlw, "xml:lang", defaultLocale.getLanguage()); + XmlWriterUtil.writeAttribute(xmlw, "xml:lang", defaultLocale.getLanguage()); xmlw.writeCharacters(ControlledVocabularyValue.getLocaleStrValue( topicClassificationValue, DatasetFieldConstant.topicClassValue, CITATION_BLOCK_NAME, defaultLocale, true)); @@ -813,13 +803,9 @@ DatasetFieldConstant.keywordValue, CITATION_BLOCK_NAME, new Locale(lang), CITATION_BLOCK_NAME, new Locale(lang), false); if (translatedValue != null) { xmlw.writeStartElement("topcClas"); - if (!topicClassificationVocab.isEmpty()) { - writeAttribute(xmlw, "vocab", topicClassificationVocab); - } - if (!topicClassificationURI.isEmpty()) { - writeAttribute(xmlw, "vocabURI", topicClassificationURI); - } - writeAttribute(xmlw, "xml:lang", lang); + XmlWriterUtil.writeAttribute(xmlw, "vocab", topicClassificationVocab); + XmlWriterUtil.writeAttribute(xmlw, "vocabURI", topicClassificationURI); + XmlWriterUtil.writeAttribute(xmlw, "xml:lang", lang); xmlw.writeCharacters(translatedValue); xmlw.writeEndElement(); // topcClas } @@ -857,7 +843,7 @@ private static void writeAuthorsElement(XMLStreamWriter xmlw, DatasetVersionDTO if (!authorName.isEmpty()){ xmlw.writeStartElement("AuthEnty"); if(!authorAffiliation.isEmpty()){ - writeAttribute(xmlw,"affiliation",authorAffiliation); + XmlWriterUtil.writeAttribute(xmlw,"affiliation",authorAffiliation); } xmlw.writeCharacters(authorName); xmlw.writeEndElement(); //AuthEnty @@ -880,7 +866,7 @@ private static void writeAuthorsElement(XMLStreamWriter xmlw, DatasetVersionDTO if (!contributorName.isEmpty()){ xmlw.writeStartElement("othId"); if(!contributorType.isEmpty()){ - writeAttribute(xmlw,"role", contributorType); + XmlWriterUtil.writeAttribute(xmlw,"role", contributorType); } xmlw.writeCharacters(contributorName); xmlw.writeEndElement(); //othId @@ -922,10 +908,10 @@ private static void writeContactsElement(XMLStreamWriter xmlw, DatasetVersionDTO if (!datasetContactName.isEmpty()){ xmlw.writeStartElement("contact"); if(!datasetContactAffiliation.isEmpty()){ - writeAttribute(xmlw,"affiliation",datasetContactAffiliation); + XmlWriterUtil.writeAttribute(xmlw,"affiliation",datasetContactAffiliation); } if(!datasetContactEmail.isEmpty()){ - writeAttribute(xmlw,"email",datasetContactEmail); + XmlWriterUtil.writeAttribute(xmlw,"email",datasetContactEmail); } xmlw.writeCharacters(datasetContactName); xmlw.writeEndElement(); //AuthEnty @@ -969,14 +955,10 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT } if (!producerName.isEmpty()) { xmlw.writeStartElement("producer"); - if (!producerAffiliation.isEmpty()) { - writeAttribute(xmlw, "affiliation", producerAffiliation); - } - if (!producerAbbreviation.isEmpty()) { - writeAttribute(xmlw, "abbr", producerAbbreviation); - } + XmlWriterUtil.writeAttribute(xmlw, "affiliation", producerAffiliation); + XmlWriterUtil.writeAttribute(xmlw, "abbr", producerAbbreviation); /*if (!producerLogo.isEmpty()) { - writeAttribute(xmlw, "role", producerLogo); + XmlWriterUtil.writeAttribute(xmlw, "role", producerLogo); }*/ xmlw.writeCharacters(producerName); xmlw.writeEndElement(); //AuthEnty @@ -987,7 +969,7 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT } } } - writeFullElement(xmlw, "prodDate", dto2Primitive(version, DatasetFieldConstant.productionDate)); + XmlWriterUtil.writeFullElement(xmlw, "prodDate", XmlWriterUtil.dto2Primitive(version, DatasetFieldConstant.productionDate)); // productionPlace was made multiple as of 5.14: // (a quick backward compatibility check was added to dto2PrimitiveList(), // see the method for details) @@ -1033,17 +1015,11 @@ private static void writeDistributorsElement(XMLStreamWriter xmlw, DatasetVersio if (!distributorName.isEmpty()) { xmlw.writeStartElement("distrbtr"); if(DvObjectContainer.isMetadataLanguageSet(lang)) { - writeAttribute(xmlw, "xml:lang", lang); - } - if (!distributorAffiliation.isEmpty()) { - writeAttribute(xmlw, "affiliation", distributorAffiliation); - } - if (!distributorAbbreviation.isEmpty()) { - writeAttribute(xmlw, "abbr", distributorAbbreviation); - } - if (!distributorURL.isEmpty()) { - writeAttribute(xmlw, "URI", distributorURL); + xmlw.writeAttribute("xml:lang", lang); } + XmlWriterUtil.writeAttribute(xmlw, "affiliation", distributorAffiliation); + XmlWriterUtil.writeAttribute(xmlw, "abbr", distributorAbbreviation); + XmlWriterUtil.writeAttribute(xmlw, "URI", distributorURL); xmlw.writeCharacters(distributorName); xmlw.writeEndElement(); //AuthEnty } @@ -1102,7 +1078,7 @@ private static void writeRelPublElement(XMLStreamWriter xmlw, DatasetVersionDTO (In other words - titlStmt is mandatory! -L.A.) */ xmlw.writeStartElement("titlStmt"); - writeFullElement(xmlw, "titl", citation); + XmlWriterUtil.writeFullElement(xmlw, "titl", citation); if (IDNo != null && !IDNo.trim().equals("")) { xmlw.writeStartElement("IDNo"); @@ -1115,7 +1091,7 @@ private static void writeRelPublElement(XMLStreamWriter xmlw, DatasetVersionDTO xmlw.writeEndElement(); // titlStmt - writeFullElement(xmlw,"biblCit",citation); + XmlWriterUtil.writeFullElement(xmlw,"biblCit",citation); xmlw.writeEndElement(); //citation if (url != null && !url.trim().equals("") ) { xmlw.writeStartElement("ExtLink"); @@ -1164,10 +1140,10 @@ private static void writeAbstractElement(XMLStreamWriter xmlw, DatasetVersionDTO if (!descriptionText.isEmpty()){ xmlw.writeStartElement("abstract"); if(!descriptionDate.isEmpty()){ - writeAttribute(xmlw,"date",descriptionDate); + XmlWriterUtil.writeAttribute(xmlw,"date",descriptionDate); } if(DvObjectContainer.isMetadataLanguageSet(lang)) { - writeAttribute(xmlw, "xml:lang", lang); + xmlw.writeAttribute("xml:lang", lang); } xmlw.writeCharacters(descriptionText); xmlw.writeEndElement(); //abstract @@ -1201,7 +1177,7 @@ private static void writeGrantElement(XMLStreamWriter xmlw, DatasetVersionDTO da if (!grantNumber.isEmpty()){ xmlw.writeStartElement("grantNo"); if(!grantAgency.isEmpty()){ - writeAttribute(xmlw,"agency",grantAgency); + XmlWriterUtil.writeAttribute(xmlw,"agency",grantAgency); } xmlw.writeCharacters(grantNumber); xmlw.writeEndElement(); //grantno @@ -1235,7 +1211,7 @@ private static void writeOtherIdElement(XMLStreamWriter xmlw, DatasetVersionDTO if (!otherId.isEmpty()){ xmlw.writeStartElement("IDNo"); if(!otherIdAgency.isEmpty()){ - writeAttribute(xmlw,"agency",otherIdAgency); + XmlWriterUtil.writeAttribute(xmlw,"agency",otherIdAgency); } xmlw.writeCharacters(otherId); xmlw.writeEndElement(); //IDNo @@ -1269,7 +1245,7 @@ private static void writeSoftwareElement(XMLStreamWriter xmlw, DatasetVersionDTO if (!softwareName.isEmpty()){ xmlw.writeStartElement("software"); if(!softwareVersion.isEmpty()){ - writeAttribute(xmlw,"version",softwareVersion); + XmlWriterUtil.writeAttribute(xmlw,"version",softwareVersion); } xmlw.writeCharacters(softwareName); xmlw.writeEndElement(); //software @@ -1384,10 +1360,10 @@ private static void writeNotesElement(XMLStreamWriter xmlw, DatasetVersionDTO da if (!notesText.isEmpty()) { xmlw.writeStartElement("notes"); if(!notesType.isEmpty()){ - writeAttribute(xmlw,"type",notesType); + XmlWriterUtil.writeAttribute(xmlw,"type",notesType); } if(!notesSubject.isEmpty()){ - writeAttribute(xmlw,"subject",notesSubject); + XmlWriterUtil.writeAttribute(xmlw,"subject",notesSubject); } xmlw.writeCharacters(notesText); xmlw.writeEndElement(); @@ -1412,14 +1388,14 @@ private static void createOtherMats(XMLStreamWriter xmlw, List fileDtos // and observations, etc.) if (fileDTo.getDataFile().getDataTables() == null || fileDTo.getDataFile().getDataTables().isEmpty()) { xmlw.writeStartElement("otherMat"); - writeAttribute(xmlw, "ID", "f" + fileDTo.getDataFile().getId()); + XmlWriterUtil.writeAttribute(xmlw, "ID", "f" + fileDTo.getDataFile().getId()); String pidURL = fileDTo.getDataFile().getPidURL(); if (pidURL != null && !pidURL.isEmpty()){ - writeAttribute(xmlw, "URI", pidURL); + xmlw.writeAttribute("URI", pidURL); } else { - writeAttribute(xmlw, "URI", dataverseUrl + "/api/access/datafile/" + fileDTo.getDataFile().getId()); + xmlw.writeAttribute("URI", dataverseUrl + "/api/access/datafile/" + fileDTo.getDataFile().getId()); } - writeAttribute(xmlw, "level", "datafile"); + xmlw.writeAttribute("level", "datafile"); xmlw.writeStartElement("labl"); xmlw.writeCharacters(fileDTo.getDataFile().getFilename()); xmlw.writeEndElement(); // labl @@ -1430,9 +1406,9 @@ private static void createOtherMats(XMLStreamWriter xmlw, List fileDtos String contentType = fileDTo.getDataFile().getContentType(); if (!StringUtilisEmpty(contentType)) { xmlw.writeStartElement("notes"); - writeAttribute(xmlw, "level", LEVEL_FILE); - writeAttribute(xmlw, "type", NOTE_TYPE_CONTENTTYPE); - writeAttribute(xmlw, "subject", NOTE_SUBJECT_CONTENTTYPE); + xmlw.writeAttribute("level", LEVEL_FILE); + xmlw.writeAttribute("type", NOTE_TYPE_CONTENTTYPE); + xmlw.writeAttribute("subject", NOTE_SUBJECT_CONTENTTYPE); xmlw.writeCharacters(contentType); xmlw.writeEndElement(); // notes } @@ -1460,14 +1436,14 @@ private static void createOtherMatsFromFileMetadatas(XMLStreamWriter xmlw, JsonA // and observations, etc.) if (!fileJson.containsKey("dataTables")) { xmlw.writeStartElement("otherMat"); - writeAttribute(xmlw, "ID", "f" + fileJson.getJsonNumber(("id").toString())); + xmlw.writeAttribute("ID", "f" + fileJson.getJsonNumber(("id").toString())); if (fileJson.containsKey("pidUrl")){ - writeAttribute(xmlw, "URI", fileJson.getString("pidUrl")); + XmlWriterUtil.writeAttribute(xmlw, "URI", fileJson.getString("pidUrl")); } else { - writeAttribute(xmlw, "URI", dataverseUrl + "/api/access/datafile/" + fileJson.getJsonNumber("id").toString()); + xmlw.writeAttribute("URI", dataverseUrl + "/api/access/datafile/" + fileJson.getJsonNumber("id").toString()); } - writeAttribute(xmlw, "level", "datafile"); + xmlw.writeAttribute("level", "datafile"); xmlw.writeStartElement("labl"); xmlw.writeCharacters(fileJson.getString("filename")); xmlw.writeEndElement(); // labl @@ -1482,9 +1458,9 @@ private static void createOtherMatsFromFileMetadatas(XMLStreamWriter xmlw, JsonA // specially formatted notes section: if (fileJson.containsKey("contentType")) { xmlw.writeStartElement("notes"); - writeAttribute(xmlw, "level", LEVEL_FILE); - writeAttribute(xmlw, "type", NOTE_TYPE_CONTENTTYPE); - writeAttribute(xmlw, "subject", NOTE_SUBJECT_CONTENTTYPE); + xmlw.writeAttribute("level", LEVEL_FILE); + xmlw.writeAttribute("type", NOTE_TYPE_CONTENTTYPE); + xmlw.writeAttribute("subject", NOTE_SUBJECT_CONTENTTYPE); xmlw.writeCharacters(fileJson.getString("contentType")); xmlw.writeEndElement(); // notes } @@ -1502,33 +1478,7 @@ private static void writeFileDescription(XMLStreamWriter xmlw, FileDTO fileDTo) xmlw.writeEndElement(); // txt } - private static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) { - for (Map.Entry entry : datasetVersionDTO.getMetadataBlocks().entrySet()) { - MetadataBlockDTO value = entry.getValue(); - for (FieldDTO fieldDTO : value.getFields()) { - if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) { - return fieldDTO.getSinglePrimitive(); - } - } - } - return null; - } - - private static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName, Locale locale) { - for (Map.Entry entry : datasetVersionDTO.getMetadataBlocks().entrySet()) { - MetadataBlockDTO value = entry.getValue(); - for (FieldDTO fieldDTO : value.getFields()) { - if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) { - String rawVal = fieldDTO.getSinglePrimitive(); - if (fieldDTO.isControlledVocabularyField()) { - return ControlledVocabularyValue.getLocaleStrValue(rawVal, datasetFieldTypeName, value.getName(), - locale, false); - } - } - } - } - return null; - } + private static List dto2PrimitiveList(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) { for (Map.Entry entry : datasetVersionDTO.getMetadataBlocks().entrySet()) { @@ -1562,104 +1512,6 @@ private static FieldDTO dto2FieldDTO(DatasetVersionDTO datasetVersionDTO, String return null; } - private static void writeFullElementList(XMLStreamWriter xmlw, String name, List values) throws XMLStreamException { - //For the simplest Elements we can - if (values != null && !values.isEmpty()) { - for (String value : values) { - xmlw.writeStartElement(name); - xmlw.writeCharacters(value); - xmlw.writeEndElement(); // labl - } - } - } - - private static void writeI18NElementList(XMLStreamWriter xmlw, String name, List values, - String fieldTypeName, String fieldTypeClass, String metadataBlockName, String lang) - throws XMLStreamException { - - if (values != null && !values.isEmpty()) { - Locale defaultLocale = Locale.getDefault(); - for (String value : values) { - if (fieldTypeClass.equals("controlledVocabulary")) { - String localeVal = ControlledVocabularyValue.getLocaleStrValue(value, fieldTypeName, metadataBlockName, defaultLocale, false); - if (localeVal != null) { - - value = localeVal; - writeFullElement(xmlw, name, value, defaultLocale.getLanguage()); - } else { - writeFullElement(xmlw, name, value); - } - } else { - writeFullElement(xmlw, name, value); - } - } - if (lang != null && !defaultLocale.getLanguage().equals(lang)) { - // Get values in dataset metadata language - // Loop before testing fieldTypeClass to be ready for external CVV - for (String value : values) { - if (fieldTypeClass.equals("controlledVocabulary")) { - String localeVal = ControlledVocabularyValue.getLocaleStrValue(value, fieldTypeName, metadataBlockName, new Locale(lang), false); - if (localeVal != null) { - writeFullElement(xmlw, name, localeVal, lang); - } - } - } - } - } - } - - private static void writeI18NElement(XMLStreamWriter xmlw, String name, DatasetVersionDTO version, - String fieldTypeName, String lang) throws XMLStreamException { - // Get the default value - String val = dto2Primitive(version, fieldTypeName); - Locale defaultLocale = Locale.getDefault(); - // Get the language-specific value for the default language - // A null value is returned if this is not a CVV field - String localeVal = dto2Primitive(version, fieldTypeName, defaultLocale); - String requestedLocaleVal = null; - if (lang != null && localeVal != null && !defaultLocale.getLanguage().equals(lang)) { - // Also get the value in the requested locale/lang if that's not the default - // lang. - requestedLocaleVal = dto2Primitive(version, fieldTypeName, new Locale(lang)); - } - // FWIW locale-specific vals will only be non-null for CVV values (at present) - if (localeVal == null && requestedLocaleVal == null) { - // Not CVV/no translations so print without lang tag - writeFullElement(xmlw, name, val); - } else { - // Print in either/both languages if we have values - if (localeVal != null) { - // Print the value for the default locale with it's own lang tag - writeFullElement(xmlw, name, localeVal, defaultLocale.getLanguage()); - } - // Also print in the request lang (i.e. the metadata language for the dataset) if a value exists, print it with a lang tag - if (requestedLocaleVal != null) { - writeFullElement(xmlw, name, requestedLocaleVal, lang); - } - } - } - - private static void writeFullElement(XMLStreamWriter xmlw, String name, String value) throws XMLStreamException { - writeFullElement(xmlw, name, value, null); - } - - private static void writeFullElement (XMLStreamWriter xmlw, String name, String value, String lang) throws XMLStreamException { - //For the simplest Elements we can - if (!StringUtilisEmpty(value)) { - xmlw.writeStartElement(name); - if(DvObjectContainer.isMetadataLanguageSet(lang)) { - writeAttribute(xmlw, "xml:lang", lang); - } - xmlw.writeCharacters(value); - xmlw.writeEndElement(); // labl - } - } - - private static void writeAttribute(XMLStreamWriter xmlw, String name, String value) throws XMLStreamException { - if (!StringUtilisEmpty(value)) { - xmlw.writeAttribute(name, value); - } - } private static boolean StringUtilisEmpty(String str) { if (str == null || str.trim().equals("")) { @@ -1747,14 +1599,14 @@ public static void createDataDscr(XMLStreamWriter xmlw, JsonArray fileDetails) t } private static void createVarGroupDDI(XMLStreamWriter xmlw, JsonObject varGrp) throws XMLStreamException { xmlw.writeStartElement("varGrp"); - writeAttribute(xmlw, "ID", "VG" + varGrp.getJsonNumber("id").toString()); + xmlw.writeAttribute("ID", "VG" + varGrp.getJsonNumber("id").toString()); String vars = ""; JsonArray varsInGroup = varGrp.getJsonArray("dataVariableIds"); for (int j=0;j sumStat : dvar.getJsonObject("summaryStatistics").entrySet()) { xmlw.writeStartElement("sumStat"); - writeAttribute(xmlw, "type", sumStat.getKey()); + XmlWriterUtil.writeAttribute(xmlw, "type", sumStat.getKey()); xmlw.writeCharacters(((JsonString)sumStat.getValue()).getString()); xmlw.writeEndElement(); // sumStat } @@ -1917,7 +1769,7 @@ private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String f JsonObject varCat = varCats.getJsonObject(i); xmlw.writeStartElement("catgry"); if (varCat.getBoolean("isMissing")) { - writeAttribute(xmlw, "missing", "Y"); + xmlw.writeAttribute("missing", "Y"); } // catValu @@ -1928,7 +1780,7 @@ private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String f // label if (varCat.containsKey("label")) { xmlw.writeStartElement("labl"); - writeAttribute(xmlw, "level", "category"); + xmlw.writeAttribute("level", "category"); xmlw.writeCharacters(varCat.getString("label")); xmlw.writeEndElement(); // labl } @@ -1936,7 +1788,7 @@ private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String f // catStat if (varCat.containsKey("frequency")) { xmlw.writeStartElement("catStat"); - writeAttribute(xmlw, "type", "freq"); + xmlw.writeAttribute("type", "freq"); Double freq = varCat.getJsonNumber("frequency").doubleValue(); // if frequency is actually a long value, we want to write "100" instead of // "100.0" @@ -1955,8 +1807,8 @@ private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String f JsonObject cm = catMetas.getJsonObject(j); if (cm.getString("categoryValue").equals(varCat.getString("value"))) { xmlw.writeStartElement("catStat"); - writeAttribute(xmlw, "wgtd", "wgtd"); - writeAttribute(xmlw, "type", "freq"); + xmlw.writeAttribute("wgtd", "wgtd"); + xmlw.writeAttribute("type", "freq"); xmlw.writeCharacters(cm.getJsonNumber("wFreq").toString()); xmlw.writeEndElement(); // catStat break; @@ -1972,24 +1824,24 @@ private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String f // varFormat xmlw.writeEmptyElement("varFormat"); if(dvar.containsKey("variableFormatType")) { - writeAttribute(xmlw, "type", dvar.getString("variableFormatType").toLowerCase()); + XmlWriterUtil.writeAttribute(xmlw, "type", dvar.getString("variableFormatType").toLowerCase()); } else { throw new XMLStreamException("Illegal Variable Format Type!"); } if(dvar.containsKey("format")) { - writeAttribute(xmlw, "formatname", dvar.getString("format")); + XmlWriterUtil.writeAttribute(xmlw, "formatname", dvar.getString("format")); } //experiment writeAttribute(xmlw, "schema", dv.getFormatSchema()); if(dvar.containsKey("formatCategory")) { - writeAttribute(xmlw, "category", dvar.getString("formatCategory")); + XmlWriterUtil.writeAttribute(xmlw, "category", dvar.getString("formatCategory")); } // notes if (dvar.containsKey("UNF") && !dvar.getString("UNF").isBlank()) { xmlw.writeStartElement("notes"); - writeAttribute(xmlw, "subject", "Universal Numeric Fingerprint"); - writeAttribute(xmlw, "level", "variable"); - writeAttribute(xmlw, "type", "Dataverse:UNF"); + xmlw.writeAttribute("subject", "Universal Numeric Fingerprint"); + xmlw.writeAttribute("level", "variable"); + xmlw.writeAttribute("type", "Dataverse:UNF"); xmlw.writeCharacters(dvar.getString("UNF")); xmlw.writeEndElement(); //notes } @@ -2020,8 +1872,8 @@ private static void createFileDscr(XMLStreamWriter xmlw, JsonArray fileDetails) } xmlw.writeStartElement("fileDscr"); String fileId = fileJson.getJsonNumber("id").toString(); - writeAttribute(xmlw, "ID", "f" + fileId); - writeAttribute(xmlw, "URI", dataverseUrl + "/api/access/datafile/" + fileId); + xmlw.writeAttribute("ID", "f" + fileId); + xmlw.writeAttribute("URI", dataverseUrl + "/api/access/datafile/" + fileId); xmlw.writeStartElement("fileTxt"); xmlw.writeStartElement("fileName"); @@ -2064,9 +1916,9 @@ private static void createFileDscr(XMLStreamWriter xmlw, JsonArray fileDetails) // (Universal Numeric Fingerprint) signature: if ((dt!=null) && (dt.containsKey("UNF") && !dt.getString("UNF").isBlank())) { xmlw.writeStartElement("notes"); - writeAttribute(xmlw, "level", LEVEL_FILE); - writeAttribute(xmlw, "type", NOTE_TYPE_UNF); - writeAttribute(xmlw, "subject", NOTE_SUBJECT_UNF); + xmlw.writeAttribute("level", LEVEL_FILE); + xmlw.writeAttribute("type", NOTE_TYPE_UNF); + xmlw.writeAttribute("subject", NOTE_SUBJECT_UNF); xmlw.writeCharacters(dt.getString("UNF")); xmlw.writeEndElement(); // notes } @@ -2075,9 +1927,9 @@ private static void createFileDscr(XMLStreamWriter xmlw, JsonArray fileDetails) JsonArray tags = fileJson.getJsonArray("tabularTags"); for (int j = 0; j < tags.size(); j++) { xmlw.writeStartElement("notes"); - writeAttribute(xmlw, "level", LEVEL_FILE); - writeAttribute(xmlw, "type", NOTE_TYPE_TAG); - writeAttribute(xmlw, "subject", NOTE_SUBJECT_TAG); + xmlw.writeAttribute("level", LEVEL_FILE); + xmlw.writeAttribute("type", NOTE_TYPE_TAG); + xmlw.writeAttribute("subject", NOTE_SUBJECT_TAG); xmlw.writeCharacters(tags.getString(j)); xmlw.writeEndElement(); // notes } @@ -2091,13 +1943,7 @@ private static void createFileDscr(XMLStreamWriter xmlw, JsonArray fileDetails) - private static boolean checkParentElement(XMLStreamWriter xmlw, String elementName, boolean elementAdded) throws XMLStreamException { - if (!elementAdded) { - xmlw.writeStartElement(elementName); - } - return true; - } public static void datasetHtmlDDI(InputStream datafile, OutputStream outputStream) throws XMLStreamException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java new file mode 100644 index 00000000000..e932307d3d0 --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java @@ -0,0 +1,174 @@ +package edu.harvard.iq.dataverse.util.xml; + +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.commons.lang3.StringUtils; + +import edu.harvard.iq.dataverse.ControlledVocabularyValue; +import edu.harvard.iq.dataverse.DvObjectContainer; +import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO; +import edu.harvard.iq.dataverse.api.dto.FieldDTO; +import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO; + +public class XmlWriterUtil { + + public static void writeFullElementList(XMLStreamWriter xmlw, String name, List values) throws XMLStreamException { + // For the simplest Elements we can + if (values != null && !values.isEmpty()) { + for (String value : values) { + xmlw.writeStartElement(name); + xmlw.writeCharacters(value); + xmlw.writeEndElement(); // labl + } + } + } + + public static void writeI18NElementList(XMLStreamWriter xmlw, String name, List values, + String fieldTypeName, String fieldTypeClass, String metadataBlockName, String lang) + throws XMLStreamException { + + if (values != null && !values.isEmpty()) { + Locale defaultLocale = Locale.getDefault(); + for (String value : values) { + if (fieldTypeClass.equals("controlledVocabulary")) { + String localeVal = ControlledVocabularyValue.getLocaleStrValue(value, fieldTypeName, metadataBlockName, defaultLocale, false); + if (localeVal != null) { + + value = localeVal; + writeFullElement(xmlw, name, value, defaultLocale.getLanguage()); + } else { + writeFullElement(xmlw, name, value); + } + } else { + writeFullElement(xmlw, name, value); + } + } + if (lang != null && !defaultLocale.getLanguage().equals(lang)) { + // Get values in dataset metadata language + // Loop before testing fieldTypeClass to be ready for external CVV + for (String value : values) { + if (fieldTypeClass.equals("controlledVocabulary")) { + String localeVal = ControlledVocabularyValue.getLocaleStrValue(value, fieldTypeName, metadataBlockName, new Locale(lang), false); + if (localeVal != null) { + writeFullElement(xmlw, name, localeVal, lang); + } + } + } + } + } + } + + public static void writeI18NElement(XMLStreamWriter xmlw, String name, DatasetVersionDTO version, + String fieldTypeName, String lang) throws XMLStreamException { + // Get the default value + String val = dto2Primitive(version, fieldTypeName); + Locale defaultLocale = Locale.getDefault(); + // Get the language-specific value for the default language + // A null value is returned if this is not a CVV field + String localeVal = dto2Primitive(version, fieldTypeName, defaultLocale); + String requestedLocaleVal = null; + if (lang != null && localeVal != null && !defaultLocale.getLanguage().equals(lang)) { + // Also get the value in the requested locale/lang if that's not the default + // lang. + requestedLocaleVal = dto2Primitive(version, fieldTypeName, new Locale(lang)); + } + // FWIW locale-specific vals will only be non-null for CVV values (at present) + if (localeVal == null && requestedLocaleVal == null) { + // Not CVV/no translations so print without lang tag + writeFullElement(xmlw, name, val); + } else { + // Print in either/both languages if we have values + if (localeVal != null) { + // Print the value for the default locale with it's own lang tag + writeFullElement(xmlw, name, localeVal, defaultLocale.getLanguage()); + } + // Also print in the request lang (i.e. the metadata language for the dataset) + // if a value exists, print it with a lang tag + if (requestedLocaleVal != null) { + writeFullElement(xmlw, name, requestedLocaleVal, lang); + } + } + } + + public static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) { + for (Map.Entry entry : datasetVersionDTO.getMetadataBlocks().entrySet()) { + MetadataBlockDTO value = entry.getValue(); + for (FieldDTO fieldDTO : value.getFields()) { + if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) { + return fieldDTO.getSinglePrimitive(); + } + } + } + return null; + } + + public static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName, Locale locale) { + for (Map.Entry entry : datasetVersionDTO.getMetadataBlocks().entrySet()) { + MetadataBlockDTO value = entry.getValue(); + for (FieldDTO fieldDTO : value.getFields()) { + if (datasetFieldTypeName.equals(fieldDTO.getTypeName())) { + String rawVal = fieldDTO.getSinglePrimitive(); + if (fieldDTO.isControlledVocabularyField()) { + return ControlledVocabularyValue.getLocaleStrValue(rawVal, datasetFieldTypeName, value.getName(), + locale, false); + } + } + } + } + return null; + } + + public static void writeFullElement(XMLStreamWriter xmlw, String name, String value) throws XMLStreamException { + writeFullElement(xmlw, name, value, null); + } + + public static void writeFullElement(XMLStreamWriter xmlw, String name, String value, String lang) throws XMLStreamException { + // For the simplest Elements we can + if (!StringUtils.isEmpty(value)) { + xmlw.writeStartElement(name); + if (DvObjectContainer.isMetadataLanguageSet(lang)) { + writeAttribute(xmlw, "xml:lang", lang); + } + xmlw.writeCharacters(value); + xmlw.writeEndElement(); // labl + } + } + + public static void writeAttribute(XMLStreamWriter xmlw, String name, String value) throws XMLStreamException { + if (!StringUtils.isEmpty(value)) { + xmlw.writeAttribute(name, value); + } + } + + public static boolean checkParentElement(XMLStreamWriter xmlw, String elementName, boolean elementAdded) throws XMLStreamException { + if (!elementAdded) { + xmlw.writeStartElement(elementName); + } + + return true; + } + + public static void writeFullElementWithAttributes(XMLStreamWriter xmlw, String name, Map attributeMap, String value) throws XMLStreamException { + if (!StringUtils.isEmpty(value)) { + xmlw.writeStartElement(name); + for (String key : attributeMap.keySet()) { + writeAttribute(xmlw, key, attributeMap.get(key)); + } + xmlw.writeCharacters(value); + xmlw.writeEndElement(); // labl + } + } + + public static boolean writeOpenTagIfNeeded(XMLStreamWriter xmlw, String tag, boolean element_check) throws XMLStreamException { + // check if the current tag isn't opened + if (!element_check) { + xmlw.writeStartElement(tag); // + } + return true; + } +} From 1a46155a5ed37545455a194650301cbee5691358 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 10:32:21 -0400 Subject: [PATCH 073/366] note duplicate method --- .../iq/dataverse/export/openaire/OpenAireExportUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java index 49ceabc5900..820ced3d6c4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java @@ -1428,6 +1428,8 @@ public static void writeFundingReferencesElement(XMLStreamWriter xmlw, DatasetVe writeEndTag(xmlw, fundingReference_check); } + + //Duplicates XmlWriterUtil.dto2Primitive private static String dto2Primitive(DatasetVersionDTO datasetVersionDTO, String datasetFieldTypeName) { // give the single value of the given metadata for (Map.Entry entry : datasetVersionDTO.getMetadataBlocks().entrySet()) { From ace656ce890d6bd4ecb1b7000995e0934a2c214e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 10:33:13 -0400 Subject: [PATCH 074/366] remove xml template doc, refactor to generate xml, adding OA fields --- .../pidproviders/doi/XmlMetadataTemplate.java | 819 +++++++++++++----- .../doi/datacite_metadata_template.xml | 2 +- 2 files changed, 617 insertions(+), 204 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 30e4dfd79cc..8a5fe9f9d32 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1,208 +1,599 @@ package edu.harvard.iq.dataverse.pidproviders.doi; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.MalformedURLException; +import java.net.URL; import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; -import java.util.logging.Level; +import java.util.Map; +import java.util.Optional; import java.util.logging.Logger; +import java.util.stream.Collectors; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; +import org.ocpsoft.common.util.Strings; import edu.harvard.iq.dataverse.DataFile; import edu.harvard.iq.dataverse.Dataset; import edu.harvard.iq.dataverse.DatasetAuthor; +import edu.harvard.iq.dataverse.DatasetField; +import edu.harvard.iq.dataverse.DatasetFieldCompoundValue; +import edu.harvard.iq.dataverse.DatasetFieldConstant; +import edu.harvard.iq.dataverse.DatasetFieldType; +import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DvObject; +import edu.harvard.iq.dataverse.GlobalId; +import edu.harvard.iq.dataverse.api.dto.DatasetDTO; +import edu.harvard.iq.dataverse.api.dto.FieldDTO; +import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO; +import edu.harvard.iq.dataverse.export.DDIExporter; import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; +import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider; +import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider; +import edu.harvard.iq.dataverse.util.PersonOrOrgUtil; +import edu.harvard.iq.dataverse.util.StringUtil; +import edu.harvard.iq.dataverse.util.xml.XmlPrinter; +import edu.harvard.iq.dataverse.util.xml.XmlWriterUtil; +import jakarta.json.JsonObject; public class XmlMetadataTemplate { - private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.DataCiteMetadataTemplate"); - private static String template; - - static { - try (InputStream in = XmlMetadataTemplate.class.getResourceAsStream("datacite_metadata_template.xml")) { - template = new String(in.readAllBytes(), StandardCharsets.UTF_8); - } catch (Exception e) { - logger.log(Level.SEVERE, "datacite metadata template load error"); - logger.log(Level.SEVERE, "String " + e.toString()); - logger.log(Level.SEVERE, "localized message " + e.getLocalizedMessage()); - logger.log(Level.SEVERE, "cause " + e.getCause()); - logger.log(Level.SEVERE, "message " + e.getMessage()); - } - } + private static final Logger logger = Logger.getLogger(XmlMetadataTemplate.class.getName()); - private String xmlMetadata; - private String identifier; - private List datafileIdentifiers; - private List creators; - private String title; - private String publisher; - private String publisherYear; - private List authors; - private String description; - private List contacts; - private List producers; - - public List getProducers() { - return producers; - } + public static final String XML_NAMESPACE = "http://datacite.org/schema/kernel-4"; + public static final String XML_SCHEMA_LOCATION = "http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4.5/metadata.xsd"; + public static final String XML_XSI = "http://www.w3.org/2001/XMLSchema-instance"; + public static final String XML_SCHEMA_VERSION = "4.5"; - public void setProducers(List producers) { - this.producers = producers; - } + private DoiMetadata doiMetadata; - public List getContacts() { - return contacts; + public XmlMetadataTemplate() { } - public void setContacts(List contacts) { - this.contacts = contacts; + public XmlMetadataTemplate(DoiMetadata doiMetadata) { + this.doiMetadata = doiMetadata; } - public String getDescription() { - return description; + public String generateXML(DvObject dvObject) { + try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { + generateXML(dvObject, outputStream); + + String xml = outputStream.toString(); + return XmlPrinter.prettyPrintXml(xml); + } catch (XMLStreamException | IOException e) { + logger.severe("Unable to generate DataCite XML for DOI: " + dvObject.getGlobalId().asString() + " : " + e.getMessage()); + e.printStackTrace(); + } + return null; } - public void setDescription(String description) { - this.description = description; - } + private void generateXML(DvObject dvObject, OutputStream outputStream) throws XMLStreamException { + // Could/should use dataset metadata language for metadata from DvObject itself? + String language = null; // machine locale? e.g. for Publisher which is global + String metadataLanguage = null; // when set, otherwise = language? + XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream); + xmlw.writeStartElement("resource"); + xmlw.writeDefaultNamespace(XML_NAMESPACE); + xmlw.writeAttribute("xmlns:xsi", XML_XSI); + xmlw.writeAttribute("xsi:schemaLocation", XML_SCHEMA_LOCATION); + + writeIdentifier(xmlw, dvObject); + writeCreators(xmlw, doiMetadata.getAuthors()); + writeTitles(xmlw, dvObject, language); + writePublisher(xmlw, dvObject); + writePublicationYear(xmlw, dvObject); + writeSubjects(xmlw, dvObject); + writeContributors(xmlw, dvObject); + writeDates(xmlw, dvObject); + writeLanguage(xmlw, dvObject); + writeResourceType(xmlw, dvObject); + writeAlternateIdentifiers(xmlw, dvObject); + writeRelatedIdentifiers(xmlw, dvObject); + writeSize(xmlw, dvObject); + writeFormats(xmlw, dvObject); + writeVersion(xmlw, dvObject); + writeAccessRights(xmlw, dvObject); + writeDescriptions(xmlw, dvObject); + writeGeoLocations(xmlw, dvObject); + writeFundingReferences(xmlw, dvObject); - public List getAuthors() { - return authors; - } + StringBuilder contributorsElement = new StringBuilder(); + if (doiMetadata.getContacts() != null) { + for (String[] contact : doiMetadata.getContacts()) { + if (!contact[0].isEmpty()) { + contributorsElement.append("" + + StringEscapeUtils.escapeXml10(contact[0]) + ""); + if (!contact[1].isEmpty()) { + contributorsElement.append("" + StringEscapeUtils.escapeXml10(contact[1]) + ""); + } + contributorsElement.append(""); + } + } + } - public void setAuthors(List authors) { - this.authors = authors; - } + if (doiMetadata.getProducers() != null) { + for (String[] producer : doiMetadata.getProducers()) { + contributorsElement.append("" + StringEscapeUtils.escapeXml10(producer[0]) + + ""); + if (!producer[1].isEmpty()) { + contributorsElement.append("" + StringEscapeUtils.escapeXml10(producer[1]) + ""); + } + contributorsElement.append(""); + } + } - public XmlMetadataTemplate() { - } + String relIdentifiers = generateRelatedIdentifiers(dvObject); - public List getDatafileIdentifiers() { - return datafileIdentifiers; } - public void setDatafileIdentifiers(List datafileIdentifiers) { - this.datafileIdentifiers = datafileIdentifiers; - } - public XmlMetadataTemplate(String xmlMetaData) { - this.xmlMetadata = xmlMetaData; - Document doc = Jsoup.parseBodyFragment(xmlMetaData); - Elements identifierElements = doc.select("identifier"); - if (identifierElements.size() > 0) { - identifier = identifierElements.get(0).html(); - } - Elements creatorElements = doc.select("creatorName"); - creators = new ArrayList<>(); - for (Element creatorElement : creatorElements) { - creators.add(creatorElement.html()); + /** + * 3, Title(s) (with optional type sub-properties) (M) + * + * @param xmlw + * The Stream writer + * @param dvObject + * The dataset/file + * @param language + * the metadata language + * @return + * @throws XMLStreamException + */ + private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String language) throws XMLStreamException { + String title = doiMetadata.getTitle(); + String subTitle = null; + List altTitles = null; + // Only Datasets can have a subtitle or alternative titles + if (dvObject instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersion(); + Optional subTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.subTitle)).findFirst(); + if (subTitleField.isPresent()) { + subTitle = subTitleField.get().getValue(); + } + Optional altTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.alternativeTitle)).findFirst(); + if (altTitleField.isPresent()) { + altTitles = altTitleField.get().getValues(); + } } - Elements titleElements = doc.select("title"); - if (titleElements.size() > 0) { - title = titleElements.get(0).html(); + + if (StringUtils.isNotBlank(title) || StringUtils.isNotBlank(subTitle) || (altTitles != null && !String.join("", altTitles).isBlank())) { + xmlw.writeStartElement("titles"); + XmlWriterUtil.writeFullElement(xmlw, "title", title, language); + + Map attributes = new HashMap(); + attributes.put("titleType", "Subtitle"); + + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, title); + + attributes.clear(); + attributes.put("titleType", "AlternativeTitle"); + + for (String altTitle : altTitles) { + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, altTitle); + } + + xmlw.writeEndElement(); } - Elements publisherElements = doc.select("publisher"); - if (publisherElements.size() > 0) { - publisher = publisherElements.get(0).html(); + } + + /** + * 1, Identifier (with mandatory type sub-property) (M) Note DataCite expects + * identifierType="DOI" but OpenAire allows several others (see + * https://guidelines.readthedocs.io/en/latest/data/field_identifier.html#d-identifiertype) + * Dataverse is currently only capable of creating DOI, Handle, or URL types + * from the OpenAire list (the last from PermaLinks) ToDo - If we add,e.g., an + * ARK or PURL provider, this code has to change or we'll need to refactor so + * that the identifiertype and id value can be sent via the JSON/ORE + * + * @param xmlw + * The Steam writer + * @param dvObject + * The dataset or file with the PID + * @throws XMLStreamException + */ + private void writeIdentifier(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + GlobalId pid = dvObject.getGlobalId(); + // identifier with identifierType attribute + Map identifier_map = new HashMap(); + String identifierType = null; + String identifier = null; + switch (pid.getProtocol()) { + case AbstractDOIProvider.DOI_PROTOCOL: + identifierType = AbstractDOIProvider.DOI_PROTOCOL.toUpperCase(); + identifier = pid.asRawIdentifier(); + break; + case HandlePidProvider.HDL_PROTOCOL: + identifierType = "Handle"; + identifier = pid.asRawIdentifier(); + break; + case PermaLinkPidProvider.PERMA_PROTOCOL: + identifierType = "URL"; + identifier = pid.asURL(); + break; } - Elements publisherYearElements = doc.select("publicationYear"); - if (publisherYearElements.size() > 0) { - publisherYear = publisherYearElements.get(0).html(); + Map attributeMap = new HashMap(); + attributeMap.put("identifierType", identifierType); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "identifier", attributeMap, identifier); + } + + /** + * 2, Creator (with optional given name, family name, name identifier and + * affiliation sub-properties) (M) + * + * @param xmlw + * The stream writer + * @param authorList + * - the list of authors + * @throws XMLStreamException + */ + public void writeCreators(XMLStreamWriter xmlw, List authorList) throws XMLStreamException { + // creators -> creator -> creatorName with nameType attribute, givenName, + // familyName, nameIdentifier + // write all creators + xmlw.writeStartElement("creators"); // + + if (authorList != null && !authorList.isEmpty()) { + for (DatasetAuthor author : authorList) { + String creatorName = StringEscapeUtils.escapeXml10(author.getName().getDisplayValue()); + String affiliation = null; + if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) { + affiliation = StringEscapeUtils.escapeXml10(author.getAffiliation().getDisplayValue()); + } + String nameIdentifier = null; + String nameIdentifierScheme = null; + if (StringUtils.isNotBlank(author.getIdValue()) && StringUtils.isNotBlank(author.getIdType())) { + nameIdentifier = author.getIdValue(); + if(nameIdentifier != null) { + // Normalizes to the URL form of the identifier, returns null if the identifier + // is not valid given the type + nameIdentifier = author.getIdentifierAsUrl(); + } + nameIdentifierScheme = author.getIdType(); + } + + if (StringUtils.isNotBlank(creatorName)) { + xmlw.writeStartElement("creator"); // + JsonObject creatorObj = PersonOrOrgUtil.getPersonOrOrganization(creatorName, false, + StringUtils.containsIgnoreCase(nameIdentifierScheme, "orcid")); + + writeEntityElements(xmlw, "creator", null, creatorObj, affiliation, nameIdentifier, nameIdentifierScheme); + xmlw.writeEndElement(); // + } + + else { + // Authors unavailable + XmlWriterUtil.writeFullElement(xmlw, "creator", "creatorName", AbstractPidProvider.UNAVAILABLE); + } + } } + xmlw.writeEndElement(); // } - public String generateXML(DvObject dvObject) { + private void writePublisher(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + // publisher should already be non null - :unav if it wasn't available + XmlWriterUtil.writeFullElement(xmlw, "publisher", doiMetadata.getPublisher()); + } + + private void writePublicationYear(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { // Can't use "UNKNOWN" here because DataCite will respond with "[facet // 'pattern'] the value 'unknown' is not accepted by the pattern '[\d]{4}'" - String publisherYearFinal = "9999"; + String pubYear = "9999"; // FIXME: Investigate why this.publisherYear is sometimes null now that pull // request #4606 has been merged. - if (this.publisherYear != null) { + if (doiMetadata.getPublisherYear() != null) { // Added to prevent a NullPointerException when trying to destroy datasets when // using DataCite rather than EZID. - publisherYearFinal = this.publisherYear; + pubYear = doiMetadata.getPublisherYear(); } - xmlMetadata = template.replace("${identifier}", getIdentifier().trim()).replace("${title}", this.title) - .replace("${publisher}", this.publisher).replace("${publisherYear}", publisherYearFinal) - .replace("${description}", this.description); - - StringBuilder creatorsElement = new StringBuilder(); - if (authors != null && !authors.isEmpty()) { - for (DatasetAuthor author : authors) { - creatorsElement.append(""); - creatorsElement.append(author.getName().getDisplayValue()); - creatorsElement.append(""); - - if (author.getIdType() != null && author.getIdValue() != null && !author.getIdType().isEmpty() - && !author.getIdValue().isEmpty() && author.getAffiliation() != null - && !author.getAffiliation().getDisplayValue().isEmpty()) { - - if (author.getIdType().equals("ORCID")) { - creatorsElement.append( - "" - + author.getIdValue() + ""); - } - if (author.getIdType().equals("ISNI")) { - creatorsElement.append( - "" - + author.getIdValue() + ""); - } - if (author.getIdType().equals("LCNA")) { - creatorsElement.append( - "" - + author.getIdValue() + ""); - } - } - if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) { - creatorsElement - .append("" + author.getAffiliation().getDisplayValue() + ""); + XmlWriterUtil.writeFullElement(xmlw, "publicationYear", String.valueOf(pubYear)); + } + + /** + * 6, Subject (with scheme sub-property) R + * + * @param xmlw + * The Steam writer + * @param dvObject + * The Dataset/DataFile + * @throws XMLStreamException + */ + private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + // subjects -> subject with subjectScheme and schemeURI attributes when + // available + boolean subjectsCreated = false; + List subjects = null; + List compoundKeywords = null; + List compoundTopics = null; + // Dataset Subject= Dataverse subject, keyword, and/or topic classification + // fields + if (dvObject instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersionForCopy(); + dv.getDatasetSubjects(); + for (DatasetField dsf : dv.getDatasetFields()) { + if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.keyword)) { + compoundKeywords = dsf.getDatasetFieldCompoundValues(); + } else if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.topicClassification)) { + compoundTopics = dsf.getDatasetFieldCompoundValues(); } - creatorsElement.append(""); } - } else { - creatorsElement.append("").append(AbstractPidProvider.UNAVAILABLE) - .append(""); + } else if (dvObject instanceof DataFile df) { + subjects = df.getTagLabels(); + } + for (String subject : subjects) { + if (StringUtils.isNotBlank(subject)) { + subjectsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "subjects", subjectsCreated); + XmlWriterUtil.writeFullElement(xmlw, "subject", StringEscapeUtils.escapeXml10(subject)); + } } + for (DatasetFieldCompoundValue keywordFieldValue : compoundKeywords) { + String keyword = null; + String scheme = null; + String schemeUri = null; + + for (DatasetField subField : keywordFieldValue.getChildDatasetFields()) { + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.keyword: + keyword = subField.getValue(); + break; + case DatasetFieldConstant.keywordVocab: + scheme = subField.getValue(); + break; + case DatasetFieldConstant.keywordVocabURI: + schemeUri = subField.getValue(); + break; + } + } + if (StringUtils.isNotBlank(keyword)) { + Map attributesMap = new HashMap(); + if (StringUtils.isNotBlank(scheme)) { + attributesMap.put("subjectScheme", scheme); + } + if (StringUtils.isNotBlank(schemeUri)) { + attributesMap.put("schemeURI", schemeUri); + } + subjectsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "subjects", subjectsCreated); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "subject", attributesMap, StringEscapeUtils.escapeXml10(keyword)); + } + } + for (DatasetFieldCompoundValue topicFieldValue : compoundTopics) { + String topic = null; + String scheme = null; + String schemeUri = null; + + for (DatasetField subField : topicFieldValue.getChildDatasetFields()) { + + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.topicClassValue: + topic = subField.getValue(); + break; + case DatasetFieldConstant.topicClassVocab: + scheme = subField.getValue(); + break; + case DatasetFieldConstant.topicClassVocabURI: + schemeUri = subField.getValue(); + break; + } + } + if (StringUtils.isNotBlank(topic)) { + Map attributesMap = new HashMap(); + if (StringUtils.isNotBlank(scheme)) { + attributesMap.put("subjectScheme", scheme); + } + if (StringUtils.isNotBlank(schemeUri)) { + attributesMap.put("schemeURI", schemeUri); + } + subjectsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "subjects", subjectsCreated); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "subject", attributesMap, StringEscapeUtils.escapeXml10(topic)); + } + } + if (subjectsCreated) { + xmlw.writeEndElement(); + } + } - xmlMetadata = xmlMetadata.replace("${creators}", creatorsElement.toString()); + /** + * 7, Contributor (with optional given name, family name, name identifier + * and affiliation sub-properties) + * + * @see #writeContributorElement(javax.xml.stream.XMLStreamWriter, + * java.lang.String, java.lang.String, java.lang.String) + * + * @param xmlw The stream writer + * @param dvObject The Dataset/DataFile + * @throws XMLStreamException + */ + private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + boolean contributorsCreated = false; + List compoundProducers = null; + List compoundDistributors = null; + List compoundContacts = null; + List compoundContributors = null; + // Dataset Subject= Dataverse subject, keyword, and/or topic classification + // fields + //ToDo Include for files? + /*if(dvObject instanceof DataFile df) { + dvObject = df.getOwner(); + }*/ + + if (dvObject instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersionForCopy(); + for (DatasetField dsf : dv.getDatasetFields()) { + switch (dsf.getDatasetFieldType().getName()) { + case DatasetFieldConstant.producer: + compoundProducers = dsf.getDatasetFieldCompoundValues(); + break; + case DatasetFieldConstant.distributor: + compoundDistributors = dsf.getDatasetFieldCompoundValues(); + break; + case DatasetFieldConstant.contact: + compoundContacts = dsf.getDatasetFieldCompoundValues(); + break; + case DatasetFieldConstant.contributor: + compoundContributors = dsf.getDatasetFieldCompoundValues(); + } + } + } + + + for (DatasetFieldCompoundValue producerFieldValue : compoundProducers) { + String producer = null; + String affiliation = null; + + for (DatasetField subField : producerFieldValue.getChildDatasetFields()) { + + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.producerName: + producer = subField.getValue(); + break; + case DatasetFieldConstant.producerAffiliation: + affiliation = subField.getValue(); + break; + } + } + if (StringUtils.isNotBlank(producer)) { + contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); + JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(producer, false, false); + writeEntityElements(xmlw, "contributor", "Producer", entityObject, affiliation, null, null); + } - StringBuilder contributorsElement = new StringBuilder(); - if (this.getContacts() != null) { - for (String[] contact : this.getContacts()) { - if (!contact[0].isEmpty()) { - contributorsElement.append("" - + contact[0] + ""); - if (!contact[1].isEmpty()) { - contributorsElement.append("" + contact[1] + ""); - } - contributorsElement.append(""); + } + + for (DatasetFieldCompoundValue distributorFieldValue : compoundDistributors) { + String distributor = null; + String affiliation = null; + + for (DatasetField subField : distributorFieldValue.getChildDatasetFields()) { + + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.distributorName: + distributor = subField.getValue(); + break; + case DatasetFieldConstant.distributorAffiliation: + affiliation = subField.getValue(); + break; } } + if (StringUtils.isNotBlank(distributor)) { + contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); + JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(distributor, false, false); + writeEntityElements(xmlw, "contributor", "Distributor", entityObject, affiliation, null, null); + } + } + for (DatasetFieldCompoundValue contactFieldValue : compoundContacts) { + String contact = null; + String affiliation = null; + + for (DatasetField subField : contactFieldValue.getChildDatasetFields()) { + + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.datasetContactName: + contact = subField.getValue(); + break; + case DatasetFieldConstant.datasetContactAffiliation: + affiliation = subField.getValue(); + break; + } + } + if (StringUtils.isNotBlank(contact)) { + contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); + JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(contact, false, false); + writeEntityElements(xmlw, "contributor", "ContactPerson", entityObject, affiliation, null, null); + } - if (this.getProducers() != null) { - for (String[] producer : this.getProducers()) { - contributorsElement.append("" + producer[0] - + ""); - if (!producer[1].isEmpty()) { - contributorsElement.append("" + producer[1] + ""); + } + for (DatasetFieldCompoundValue contributorFieldValue : compoundContributors) { + String contributor = null; + String contributorType = null; + + for (DatasetField subField : contributorFieldValue.getChildDatasetFields()) { + + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.contributorName: + contributor = subField.getValue(); + break; + case DatasetFieldConstant.contributorType: + contributorType = subField.getValue().replace(" ", ""); + break; } - contributorsElement.append(""); } + // QDR - doesn't have Funder in the contributor type list. + // Using a string isn't i18n + if (StringUtils.isNotBlank(contributor) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) { + contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); + JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(contributor, false, false); + writeEntityElements(xmlw, "contributor", contributorType, entityObject, null, null, null); + } + + } + + if (contributorsCreated) { + xmlw.writeEndElement(); } + } - String relIdentifiers = generateRelatedIdentifiers(dvObject); + private void writeEntityElements(XMLStreamWriter xmlw, String elementName, String type, JsonObject entityObject, String affiliation, String nameIdentifier, String nameIdentifierScheme) throws XMLStreamException { + xmlw.writeStartElement(elementName); + Map attributeMap = new HashMap(); + if (StringUtils.isNotBlank(type)) { + attributeMap.put("contributorType", type); + } + // person name=, + if (entityObject.getBoolean("isPerson")) { + attributeMap.put("nameType", "Personal"); + } else { + attributeMap.put("nameType", "Organizational"); + } + XmlWriterUtil.writeFullElementWithAttributes(xmlw, elementName + "Name", attributeMap, + StringEscapeUtils.escapeXml10(entityObject.getString("fullName"))); + if (entityObject.containsKey("givenName")) { + XmlWriterUtil.writeFullElement(xmlw, "givenName", StringEscapeUtils.escapeXml10(entityObject.getString("givenName"))); + } + if (entityObject.containsKey("familyName")) { + XmlWriterUtil.writeFullElement(xmlw, "familyName", StringEscapeUtils.escapeXml10(entityObject.getString("familyName"))); + } - xmlMetadata = xmlMetadata.replace("${relatedIdentifiers}", relIdentifiers); + if (nameIdentifier != null) { + attributeMap.clear(); + URL url; + try { + url = new URL(nameIdentifier); + String protocol = url.getProtocol(); + String authority = url.getAuthority(); + String site = String.format("%s://%s", protocol, authority); + attributeMap.put("schemeURI", site); + attributeMap.put("nameIdentifierScheme", nameIdentifierScheme); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "nameIdentifier", attributeMap, nameIdentifier); + } catch (MalformedURLException e) { + logger.warning("DatasetAuthor.getIdentifierAsUrl returned a Malformed URL: " + nameIdentifier); + } + } + + if (StringUtils.isNotBlank(affiliation)) { + attributeMap.clear(); + if (affiliation.startsWith("https://ror.org/")) { - xmlMetadata = xmlMetadata.replace("{$contributors}", contributorsElement.toString()); - return xmlMetadata; + attributeMap.put("schemeURI", "https://ror.org"); + attributeMap.put("affiliationIdentifierScheme", "ROR"); + } + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(affiliation)); + } + xmlw.writeEndElement(); } private String generateRelatedIdentifiers(DvObject dvObject) { @@ -210,9 +601,67 @@ private String generateRelatedIdentifiers(DvObject dvObject) { StringBuilder sb = new StringBuilder(); if (dvObject.isInstanceofDataset()) { Dataset dataset = (Dataset) dvObject; + + List relatedPublications = dataset.getLatestVersionForCopy().getRelatedPublications(); + if (!relatedPublications.isEmpty()) { + for (DatasetRelPublication relatedPub : relatedPublications) { + String pubIdType = relatedPub.getIdType(); + String identifier = relatedPub.getIdNumber(); + /* + * Note - with identifier and url fields, it's not clear that there's a single + * way those two fields are used for all identifier types In QDR, at this time, + * doi and isbn types always have the raw number in the identifier field, + * whereas there are examples where URLs are in the identifier or url fields. + * The code here addresses those practices and is not generic. + */ + if (pubIdType != null) { + switch (pubIdType) { + case "doi": + if (identifier != null && identifier.length() != 0) { + appendIdentifier(sb, "DOI", "IsSupplementTo", "doi:" + identifier); + } + break; + case "isbn": + if (identifier != null && identifier.length() != 0) { + appendIdentifier(sb, "ISBN", "IsSupplementTo", "ISBN:" + identifier); + } + break; + case "url": + if (identifier != null && identifier.length() != 0) { + appendIdentifier(sb, "URL", "IsSupplementTo", identifier); + } else { + String pubUrl = relatedPub.getUrl(); + if (pubUrl != null && pubUrl.length() > 0) { + appendIdentifier(sb, "URL", "IsSupplementTo", pubUrl); + } + } + break; + default: + if (identifier != null && identifier.length() != 0) { + if (pubIdType.equalsIgnoreCase("arXiv")) { + pubIdType = "arXiv"; + } else if (pubIdType.equalsIgnoreCase("handle")) { + // Initial cap required for handle + pubIdType = "Handle"; + } else if (!pubIdType.equals("bibcode")) { + pubIdType = pubIdType.toUpperCase(); + } + // For all others, do a generic attempt to match the identifier type to the + // datacite schema and send the raw identifier as the value + appendIdentifier(sb, pubIdType, "IsSupplementTo", identifier); + } + break; + } + + } else { + logger.info(relatedPub.getIdNumber() + relatedPub.getUrl() + relatedPub.getTitle()); + } + } + } + if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) { - datafileIdentifiers = new ArrayList<>(); + List datafileIdentifiers = new ArrayList<>(); for (DataFile dataFile : dataset.getFiles()) { if (dataFile.getGlobalId() != null) { if (sb.toString().isEmpty()) { @@ -229,14 +678,23 @@ private String generateRelatedIdentifiers(DvObject dvObject) { } } else if (dvObject.isInstanceofDataFile()) { DataFile df = (DataFile) dvObject; - sb.append(""); - sb.append("" - + df.getOwner().getGlobalId() + ""); - sb.append(""); + appendIdentifier(sb, "DOI", "IsPartOf", df.getOwner().getGlobalId().asString()); + if (sb.length() != 0) { + // Should always be true + sb.append(""); + } } return sb.toString(); } + + private void appendIdentifier(StringBuilder sb, String idType, String relationType, String identifier) { + if (sb.toString().isEmpty()) { + sb.append(""); + } + sb.append("" + identifier + ""); + } + public void generateFileIdentifiers(DvObject dvObject) { if (dvObject.isInstanceofDataset()) { @@ -244,71 +702,26 @@ public void generateFileIdentifiers(DvObject dvObject) { if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) { - datafileIdentifiers = new ArrayList<>(); + List datafileIdentifiers = new ArrayList<>(); for (DataFile dataFile : dataset.getFiles()) { datafileIdentifiers.add(dataFile.getIdentifier()); - int x = xmlMetadata.indexOf("") - 1; - xmlMetadata = xmlMetadata.replace("{relatedIdentifier}", dataFile.getIdentifier()); - xmlMetadata = xmlMetadata.substring(0, x) + "${relatedIdentifier}" - + template.substring(x, template.length() - 1); + // int x = xmlMetadata.indexOf("") - 1; + // xmlMetadata = xmlMetadata.replace("{relatedIdentifier}", + // dataFile.getIdentifier()); + // xmlMetadata = xmlMetadata.substring(0, x) + "${relatedIdentifier}" + // + template.substring(x, template.length() - 1); } } else { - xmlMetadata = xmlMetadata.replace( - "${relatedIdentifier}", - ""); + // xmlMetadata = xmlMetadata.replace( + // "${relatedIdentifier}", + // ""); } } } - public static String getTemplate() { - return template; - } - - public static void setTemplate(String template) { - XmlMetadataTemplate.template = template; - } - - public String getIdentifier() { - return identifier; - } - - public void setIdentifier(String identifier) { - this.identifier = identifier; - } - - public List getCreators() { - return creators; - } - - public void setCreators(List creators) { - this.creators = creators; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getPublisher() { - return publisher; - } - - public void setPublisher(String publisher) { - this.publisher = publisher; - } - - public String getPublisherYear() { - return publisherYear; - } - - public void setPublisherYear(String publisherYear) { - this.publisherYear = publisherYear; - } - } \ No newline at end of file diff --git a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml index abe7ce79972..8348691d4c7 100644 --- a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml +++ b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml @@ -1,5 +1,5 @@ - ${identifier} From dba03e2bb1597d4e01317139d950e305d0d9dec5 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 10:33:40 -0400 Subject: [PATCH 075/366] refactor source of XML info --- .../iq/dataverse/export/DataCiteExporter.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java b/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java index 8caf32b2df0..c21d6b5cd1a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/DataCiteExporter.java @@ -7,6 +7,7 @@ import io.gdcc.spi.export.ExportException; import io.gdcc.spi.export.Exporter; import io.gdcc.spi.export.XMLExporter; +import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate; import edu.harvard.iq.dataverse.util.BundleUtil; import java.io.IOException; import java.io.OutputStream; @@ -20,11 +21,7 @@ */ @AutoService(Exporter.class) public class DataCiteExporter implements XMLExporter { - - private static String DEFAULT_XML_NAMESPACE = "http://datacite.org/schema/kernel-3"; - private static String DEFAULT_XML_SCHEMALOCATION = "http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd"; - private static String DEFAULT_XML_VERSION = "3.0"; - + public static final String NAME = "Datacite"; @Override @@ -60,17 +57,17 @@ public Boolean isAvailableToUsers() { @Override public String getXMLNameSpace() { - return DataCiteExporter.DEFAULT_XML_NAMESPACE; + return XmlMetadataTemplate.XML_NAMESPACE; } @Override public String getXMLSchemaLocation() { - return DataCiteExporter.DEFAULT_XML_SCHEMALOCATION; + return XmlMetadataTemplate.XML_SCHEMA_LOCATION; } @Override public String getXMLSchemaVersion() { - return DataCiteExporter.DEFAULT_XML_VERSION; + return XmlMetadataTemplate.XML_SCHEMA_VERSION; } } From af3e24b0b7bc1bff2c378f2a682455fe6aef0ee2 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 10:34:09 -0400 Subject: [PATCH 076/366] add code to get raw alphanumeric pid value --- src/main/java/edu/harvard/iq/dataverse/GlobalId.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/GlobalId.java b/src/main/java/edu/harvard/iq/dataverse/GlobalId.java index a542cb52ac0..1c8783c5bd5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GlobalId.java +++ b/src/main/java/edu/harvard/iq/dataverse/GlobalId.java @@ -100,6 +100,13 @@ public String asURL() { } return null; } + + public String asRawIdentifier() { + if (protocol == null || authority == null || identifier == null) { + return ""; + } + return authority + separator + identifier; + } From fa23884647c893285e456d749a741d6d36ac90eb Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 13:58:32 -0400 Subject: [PATCH 077/366] remove duplicate method --- .../edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java index e932307d3d0..8ec426ead1f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlWriterUtil.java @@ -145,13 +145,6 @@ public static void writeAttribute(XMLStreamWriter xmlw, String name, String valu } } - public static boolean checkParentElement(XMLStreamWriter xmlw, String elementName, boolean elementAdded) throws XMLStreamException { - if (!elementAdded) { - xmlw.writeStartElement(elementName); - } - - return true; - } public static void writeFullElementWithAttributes(XMLStreamWriter xmlw, String name, Map attributeMap, String value) throws XMLStreamException { if (!StringUtils.isEmpty(value)) { From 0d22d6c580df4aa689b019dfdc88321a59e02e4d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 3 May 2024 13:59:22 -0400 Subject: [PATCH 078/366] dates, resourceType, alternate Ids --- .../pidproviders/doi/XmlMetadataTemplate.java | 224 +++++++++++++++++- 1 file changed, 215 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 8a5fe9f9d32..92bf7afd273 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -6,12 +6,14 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -26,6 +28,8 @@ import org.jsoup.select.Elements; import org.ocpsoft.common.util.Strings; +import edu.harvard.iq.dataverse.AlternativePersistentIdentifier; +import edu.harvard.iq.dataverse.ControlledVocabularyValue; import edu.harvard.iq.dataverse.DataFile; import edu.harvard.iq.dataverse.Dataset; import edu.harvard.iq.dataverse.DatasetAuthor; @@ -33,9 +37,11 @@ import edu.harvard.iq.dataverse.DatasetFieldCompoundValue; import edu.harvard.iq.dataverse.DatasetFieldConstant; import edu.harvard.iq.dataverse.DatasetFieldType; +import edu.harvard.iq.dataverse.DatasetFieldValue; import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DvObject; import edu.harvard.iq.dataverse.GlobalId; +import edu.harvard.iq.dataverse.api.Util; import edu.harvard.iq.dataverse.api.dto.DatasetDTO; import edu.harvard.iq.dataverse.api.dto.FieldDTO; import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO; @@ -207,8 +213,6 @@ private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String languag */ private void writeIdentifier(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { GlobalId pid = dvObject.getGlobalId(); - // identifier with identifierType attribute - Map identifier_map = new HashMap(); String identifierType = null; String identifier = null; switch (pid.getProtocol()) { @@ -315,9 +319,9 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt // subjects -> subject with subjectScheme and schemeURI attributes when // available boolean subjectsCreated = false; - List subjects = null; - List compoundKeywords = null; - List compoundTopics = null; + List subjects = new ArrayList(); + List compoundKeywords = new ArrayList(); + List compoundTopics = new ArrayList(); // Dataset Subject= Dataverse subject, keyword, and/or topic classification // fields if (dvObject instanceof Dataset d) { @@ -419,10 +423,10 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt */ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { boolean contributorsCreated = false; - List compoundProducers = null; - List compoundDistributors = null; - List compoundContacts = null; - List compoundContributors = null; + List compoundProducers = new ArrayList(); + List compoundDistributors = new ArrayList(); + List compoundContacts = new ArrayList(); + List compoundContributors = new ArrayList(); // Dataset Subject= Dataverse subject, keyword, and/or topic classification // fields //ToDo Include for files? @@ -596,6 +600,208 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin xmlw.writeEndElement(); } + /** + * 8, Date (with type sub-property) (R) + * + * @param xmlw The Steam writer + * @param dvObject The dataset/datafile + * @throws XMLStreamException + */ + private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + boolean datesWritten = false; + String dateOfDistribution = null; + String dateOfProduction = null; + String dateOfDeposit = null; + Date releaseDate = null; + List datesOfCollection = new ArrayList(); + + if (dvObject instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersionForCopy(); + releaseDate = dv.getReleaseTime(); + for (DatasetField dsf : dv.getDatasetFields()) { + switch (dsf.getDatasetFieldType().getName()) { + case DatasetFieldConstant.distributionDate: + dateOfDistribution = dsf.getValue(); + break; + case DatasetFieldConstant.productionDate: + dateOfProduction = dsf.getValue(); + break; + case DatasetFieldConstant.dateOfDeposit: + dateOfDeposit = dsf.getValue(); + break; + case DatasetFieldConstant.dateOfCollection: + datesOfCollection = dsf.getDatasetFieldCompoundValues(); + } + } + } + Map attributes = new HashMap(); + if (StringUtils.isNotBlank(dateOfDistribution)) { + datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); + attributes.put("dateType", "Issued"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, dateOfDistribution); + } + // dates -> date with dateType attribute + + if (StringUtils.isNotBlank(dateOfProduction)) { + datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); + attributes.put("dateType", "Created"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, dateOfProduction); + } + if (StringUtils.isNotBlank(dateOfDeposit)) { + datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); + attributes.put("dateType", "Submitted"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, dateOfDeposit); + } + + if (releaseDate != null) { + String date = Util.getDateTimeFormat().format(releaseDate); + datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); + + attributes.put("dateType", "Available"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, date); + } + if (datesOfCollection != null) { + for (DatasetFieldCompoundValue collectionDateFieldValue : datesOfCollection) { + String startDate = null; + String endDate = null; + + for (DatasetField subField : collectionDateFieldValue.getChildDatasetFields()) { + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.dateOfCollectionStart: + startDate = subField.getValue(); + break; + case DatasetFieldConstant.dateOfCollectionEnd: + endDate = subField.getValue(); + break; + } + } + if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { + datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); + attributes.put("dateType", "Collected"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, (startDate + "/" + endDate).trim()); + } + } + } + if (datesWritten) { + xmlw.writeEndElement(); + } + } + + + // 9, Language (MA), language + private void writeLanguage(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + //Currently not supported. Spec indicates one 'primary' language. Could send the first entry in DatasetFieldConstant.language or send iff there is only one entry, and/or default to the machine's default lang? + return; + } + + // 10, ResourceType (with mandatory general type + // description sub- property) (M) + private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + List kindOfDataValues = new ArrayList(); + Map attributes = new HashMap(); + + attributes.put("resourceTypeGeneral", "Dataset"); + if (dvObject instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersionForCopy(); + for (DatasetField dsf : dv.getDatasetFields()) { + switch (dsf.getDatasetFieldType().getName()) { + case DatasetFieldConstant.kindOfData: + kindOfDataValues = dsf.getControlledVocabularyValues(); + break; + } + + if (kindOfDataValues.isEmpty()) { + // Write an attribute only element if there are no kindOfData values. + xmlw.writeStartElement("resourceType"); + xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral")); + xmlw.writeEndElement(); + } else { + for (ControlledVocabularyValue kindOfDataValue : kindOfDataValues) { + String resourceType = kindOfDataValue.getStrValue(); + if (StringUtils.isNotBlank(resourceType)) { + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, resourceType); + } + } + } + } + } + } + + /** + * 11 AlternateIdentifier (with type sub-property) (O) + * + * @param xmlw The Steam writer + * @param dvObject The dataset/datafile + * @throws XMLStreamException + */ + private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + List otherIdentifiers = new ArrayList(); + Set altPids = dvObject.getAlternativePersistentIndentifiers(); + + boolean alternatesWritten = false; + + Map attributes = new HashMap(); + if (dvObject instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersionForCopy(); + for (DatasetField dsf : dv.getDatasetFields()) { + if (DatasetFieldConstant.otherId.equals(dsf.getDatasetFieldType().getName())) { + otherIdentifiers = dsf.getDatasetFieldCompoundValues(); + break; + } + } + } + if (!altPids.isEmpty()) { + alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternativeIdentifiers", alternatesWritten); + } + for (AlternativePersistentIdentifier altPid : altPids) { + String identifierType = null; + String identifier = null; + switch (altPid.getProtocol()) { + case AbstractDOIProvider.DOI_PROTOCOL: + identifierType = AbstractDOIProvider.DOI_PROTOCOL.toUpperCase(); + identifier = altPid.getAuthority() + "/" + altPid.getIdentifier(); + break; + case HandlePidProvider.HDL_PROTOCOL: + identifierType = "Handle"; + identifier = altPid.getAuthority() + "/" + altPid.getIdentifier(); + break; + default: + // The AlternativePersistentIdentifier class isn't really ready for anything but + // doi or handle pids, but will add this as a default. + identifierType = ":unav"; + identifier = altPid.getAuthority() + altPid.getIdentifier(); + break; + } + attributes.put("alternativeIdentifierType", identifierType); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier); + + } + for (DatasetFieldCompoundValue otherIdentifier : otherIdentifiers) { + String identifierType = null; + String identifier = null; + for (DatasetField subField : otherIdentifier.getChildDatasetFields()) { + identifierType = ":unav"; + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.otherIdAgency: + identifierType = subField.getValue(); + break; + case DatasetFieldConstant.otherIdValue: + identifier = subField.getValue(); + break; + } + } + attributes.put("alternativeIdentifierType", identifierType); + if (!StringUtils.isBlank(identifier)) { + alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternativeIdentifiers", alternatesWritten); + + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier); + } + } + if (alternatesWritten) { + xmlw.writeEndElement(); + } + } + private String generateRelatedIdentifiers(DvObject dvObject) { StringBuilder sb = new StringBuilder(); From d69bf414f3cc3b5fc8e0214b0c5c4fc6f7ec155e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 8 May 2024 13:19:56 -0400 Subject: [PATCH 079/366] more methods --- .../pidproviders/doi/XmlMetadataTemplate.java | 313 +++++++++++++----- 1 file changed, 223 insertions(+), 90 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 92bf7afd273..eb2465257a1 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -47,6 +47,7 @@ import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO; import edu.harvard.iq.dataverse.export.DDIExporter; import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; +import edu.harvard.iq.dataverse.pidproviders.PidUtil; import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider; import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider; @@ -146,7 +147,6 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM } - /** * 3, Title(s) (with optional type sub-properties) (M) * @@ -802,132 +802,265 @@ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) } } - private String generateRelatedIdentifiers(DvObject dvObject) { + /** + * 12, RelatedIdentifier (with type and relation type sub-properties) (R) + * + * @param xmlw The Steam writer + * @param dvObject the dataset/datafile + * @throws XMLStreamException + */ + private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + + boolean relatedIdentifiersWritten = false; + + Map attributes = new HashMap(); - StringBuilder sb = new StringBuilder(); - if (dvObject.isInstanceofDataset()) { - Dataset dataset = (Dataset) dvObject; + if (dvObject instanceof Dataset dataset) { List relatedPublications = dataset.getLatestVersionForCopy().getRelatedPublications(); if (!relatedPublications.isEmpty()) { for (DatasetRelPublication relatedPub : relatedPublications) { + attributes.clear(); + String pubIdType = relatedPub.getIdType(); String identifier = relatedPub.getIdNumber(); + String url = relatedPub.getUrl(); /* * Note - with identifier and url fields, it's not clear that there's a single - * way those two fields are used for all identifier types In QDR, at this time, - * doi and isbn types always have the raw number in the identifier field, - * whereas there are examples where URLs are in the identifier or url fields. - * The code here addresses those practices and is not generic. + * way those two fields are used for all identifier types. The code here is + * ~best effort to interpret those fields. */ - if (pubIdType != null) { - switch (pubIdType) { - case "doi": - if (identifier != null && identifier.length() != 0) { - appendIdentifier(sb, "DOI", "IsSupplementTo", "doi:" + identifier); - } - break; - case "isbn": - if (identifier != null && identifier.length() != 0) { - appendIdentifier(sb, "ISBN", "IsSupplementTo", "ISBN:" + identifier); - } - break; - case "url": - if (identifier != null && identifier.length() != 0) { - appendIdentifier(sb, "URL", "IsSupplementTo", identifier); - } else { - String pubUrl = relatedPub.getUrl(); - if (pubUrl != null && pubUrl.length() > 0) { - appendIdentifier(sb, "URL", "IsSupplementTo", pubUrl); - } - } - break; - default: - if (identifier != null && identifier.length() != 0) { - if (pubIdType.equalsIgnoreCase("arXiv")) { - pubIdType = "arXiv"; - } else if (pubIdType.equalsIgnoreCase("handle")) { - // Initial cap required for handle - pubIdType = "Handle"; - } else if (!pubIdType.equals("bibcode")) { - pubIdType = pubIdType.toUpperCase(); - } - // For all others, do a generic attempt to match the identifier type to the - // datacite schema and send the raw identifier as the value - appendIdentifier(sb, pubIdType, "IsSupplementTo", identifier); - } - break; + pubIdType = getCanonicalPublicationType(pubIdType); + + // Prefer url if set, otherwise check identifier + String relatedIdentifier = url; + if (StringUtils.isBlank(relatedIdentifier)) { + relatedIdentifier = identifier; + } + // For types where we understand the protocol, get the canonical form + switch (pubIdType) { + case "DOI": + if (!relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http")) { + relatedIdentifier = "doi:" + relatedIdentifier; + } + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + } catch (IllegalArgumentException e) { + relatedIdentifier = null; } + break; + case "Handle": + if (!relatedIdentifier.startsWith("hdl:") || relatedIdentifier.startsWith("http")) { + relatedIdentifier = "hdl:" + relatedIdentifier; + } + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + } catch (IllegalArgumentException e) { + relatedIdentifier = null; + } + break; + case "URL": + break; + default: + + // For non-URL types, if a URL is given, split the string to get a schemeUri + try { + URL relatedUrl = new URL(relatedIdentifier); + String protocol = relatedUrl.getProtocol(); + String authority = relatedUrl.getAuthority(); + String site = String.format("%s://%s", protocol, authority); + relatedIdentifier = relatedIdentifier.substring(site.length()); + attributes.put("schemeURI", site); + } catch (MalformedURLException e) { + // Just an identifier + } + } - } else { - logger.info(relatedPub.getIdNumber() + relatedPub.getUrl() + relatedPub.getTitle()); + if (StringUtils.isNotBlank(relatedIdentifier)) { + // Still have a valid entry + attributes.put("relatedIdentifierType", pubIdType); + attributes.put("relationType", "IsSupplementTo"); + relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, relatedIdentifier); } } } - if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) { - - List datafileIdentifiers = new ArrayList<>(); + attributes.clear(); + attributes.put("relationType", "HasPart"); for (DataFile dataFile : dataset.getFiles()) { - if (dataFile.getGlobalId() != null) { - if (sb.toString().isEmpty()) { - sb.append(""); + GlobalId pid = dataFile.getGlobalId(); + if (pid != null) { + String pubIdType = getCanonicalPublicationType(pid.getProtocol()); + if (pubIdType != null) { + attributes.put("relatedIdentifierType", pubIdType); + relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, pid.asRawIdentifier()); } - sb.append("" - + dataFile.getGlobalId() + ""); } } - - if (!sb.toString().isEmpty()) { - sb.append(""); - } } - } else if (dvObject.isInstanceofDataFile()) { - DataFile df = (DataFile) dvObject; - appendIdentifier(sb, "DOI", "IsPartOf", df.getOwner().getGlobalId().asString()); - if (sb.length() != 0) { - // Should always be true - sb.append(""); + } else if (dvObject instanceof DataFile df) { + GlobalId pid = df.getOwner().getGlobalId(); + if (pid != null) { + String pubIdType = getCanonicalPublicationType(pid.getProtocol()); + if (pubIdType != null) { + + attributes.clear(); + attributes.put("relationType", "IsPartOf"); + relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, pid.asRawIdentifier()); + } } } - return sb.toString(); + if (relatedIdentifiersWritten) { + xmlw.writeEndElement(); + } } - private void appendIdentifier(StringBuilder sb, String idType, String relationType, String identifier) { - if (sb.toString().isEmpty()) { - sb.append(""); + static HashMap relatedIdentifierTypeMap = new HashMap(); + + private static String getCanonicalPublicationType(String pubIdType) { + if (relatedIdentifierTypeMap.isEmpty()) { + relatedIdentifierTypeMap.put("ARK".toLowerCase(), "ARK"); + relatedIdentifierTypeMap.put("arXiv", "arXiv"); + relatedIdentifierTypeMap.put("bibcode".toLowerCase(), "bibcode"); + relatedIdentifierTypeMap.put("DOI".toLowerCase(), "DOI"); + relatedIdentifierTypeMap.put("EAN13".toLowerCase(), "EAN13"); + relatedIdentifierTypeMap.put("EISSN".toLowerCase(), "EISSN"); + relatedIdentifierTypeMap.put("Handle".toLowerCase(), "Handle"); + relatedIdentifierTypeMap.put("IGSN".toLowerCase(), "IGSN"); + relatedIdentifierTypeMap.put("ISBN".toLowerCase(), "ISBN"); + relatedIdentifierTypeMap.put("ISSN".toLowerCase(), "ISSN"); + relatedIdentifierTypeMap.put("ISTC".toLowerCase(), "ISTC"); + relatedIdentifierTypeMap.put("LISSN".toLowerCase(), "LISSN"); + relatedIdentifierTypeMap.put("LSID".toLowerCase(), "LSID"); + relatedIdentifierTypeMap.put("PISSN".toLowerCase(), "PISSN"); + relatedIdentifierTypeMap.put("PMID".toLowerCase(), "PMID"); + relatedIdentifierTypeMap.put("PURL".toLowerCase(), "PURL"); + relatedIdentifierTypeMap.put("UPC".toLowerCase(), "UPC"); + relatedIdentifierTypeMap.put("URL".toLowerCase(), "URL"); + relatedIdentifierTypeMap.put("URN".toLowerCase(), "URN"); + relatedIdentifierTypeMap.put("WOS".toLowerCase(), "WOS"); + // Add entry for Handle protocol so this can be used with GlobalId/getProtocol() + relatedIdentifierTypeMap.put("hdl".toLowerCase(), "Handle"); } - sb.append("" + identifier + ""); + return relatedIdentifierTypeMap.get(pubIdType); } - public void generateFileIdentifiers(DvObject dvObject) { + private void writeSize(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + // sizes -> size + boolean sizesWritten = false; + List dataFiles = new ArrayList(); - if (dvObject.isInstanceofDataset()) { - Dataset dataset = (Dataset) dvObject; + if (dvObject instanceof Dataset dataset) { + dataFiles = dataset.getFiles(); + } else if (dvObject instanceof DataFile df) { + dataFiles.add(df); + } + if (dataFiles != null && !dataFiles.isEmpty()) { + for (DataFile dataFile : dataFiles) { + Long size = dataFile.getFilesize(); + if (size != -1) { + sizesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "sizes", sizesWritten); + XmlWriterUtil.writeFullElement(xmlw, "size", size.toString()); + } + } + } + if (sizesWritten) { + xmlw.writeEndElement(); + } - if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) { + } - List datafileIdentifiers = new ArrayList<>(); - for (DataFile dataFile : dataset.getFiles()) { - datafileIdentifiers.add(dataFile.getIdentifier()); - // int x = xmlMetadata.indexOf("") - 1; - // xmlMetadata = xmlMetadata.replace("{relatedIdentifier}", - // dataFile.getIdentifier()); - // xmlMetadata = xmlMetadata.substring(0, x) + "${relatedIdentifier}" - // + template.substring(x, template.length() - 1); + private void writeFormats(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + boolean formatsWritten = false; + List dataFiles = new ArrayList(); + + if (dvObject instanceof Dataset dataset) { + dataFiles = dataset.getFiles(); + } else if (dvObject instanceof DataFile df) { + dataFiles.add(df); + } + if (dataFiles != null && !dataFiles.isEmpty()) { + for (DataFile dataFile : dataFiles) { + String format = dataFile.getContentType(); + if (StringUtils.isNotBlank(format)) { + formatsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "formats", formatsWritten); + XmlWriterUtil.writeFullElement(xmlw, "format", format); } + /* Should original formats be sent? What about original sizes above? + if(dataFile.isTabularData()) { + String originalFormat = dataFile.getOriginalFileFormat(); + if(StringUtils.isNotBlank(originalFormat)) { + XmlWriterUtil.writeFullElement(xmlw, "format", format); + } + }*/ + } + } + if (formatsWritten) { + xmlw.writeEndElement(); + } + + } - } else { - // xmlMetadata = xmlMetadata.replace( - // "${relatedIdentifier}", - // ""); + private void writeVersion(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + Dataset d = null; + if(dvObject instanceof Dataset) { + d = (Dataset) dvObject; + } else if (dvObject instanceof DataFile) { + d = ((DataFile) dvObject).getOwner(); + } + if(d !=null) { + DatasetVersion dv = d.getLatestVersionForCopy(); + String version = dv.getFriendlyVersionNumber(); + if (StringUtils.isNotBlank(version)) { + XmlWriterUtil.writeFullElement(xmlw, "version", version); } } + } + private void writeAccessRights(XMLStreamWriter xmlw, DvObject dvObject) { + // rightsList -> rights with rightsURI attribute + xmlw.writeStartElement("rightsList"); // + + // set terms from the info:eu-repo-Access-Terms vocabulary + writeRightsHeader(xmlw, language); + boolean restrict = false; + boolean closed = false; + + if (datasetVersionDTO.isFileAccessRequest()) { + restrict = true; + } + if (datasetVersionDTO.getFiles() != null) { + for (int i = 0; i < datasetVersionDTO.getFiles().size(); i++) { + if (datasetVersionDTO.getFiles().get(i).isRestricted()) { + closed = true; + break; + } + } + } + + if (restrict && closed) { + xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/restrictedAccess"); + } else if (!restrict && closed) { + xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/closedAccess"); + } else { + xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/openAccess"); + } + xmlw.writeEndElement(); // + + writeRightsHeader(xmlw, language); + if (datasetVersionDTO.getLicense() != null) { + xmlw.writeAttribute("rightsURI", datasetVersionDTO.getLicense().getUri()); + xmlw.writeCharacters(datasetVersionDTO.getLicense().getName()); + } + xmlw.writeEndElement(); // + xmlw.writeEndElement(); // + } } \ No newline at end of file From 04b367f641fe8e8da77c8eceafd7a012985f9a1f Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 15 May 2024 10:41:07 -0400 Subject: [PATCH 080/366] only one field to look for --- src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java index 943693355a3..d723cf3d528 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java @@ -1344,6 +1344,7 @@ public List getGeographicCoverage() { } } + break; } return geoCoverages; } From 003431dde79bc7b80077c1aa6d0998329e85f4e3 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 15 May 2024 10:41:30 -0400 Subject: [PATCH 081/366] use common util method --- .../edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java index 0c861cb6c09..c0e3057696a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java @@ -1715,12 +1715,12 @@ private static void createVarDDI(XMLStreamWriter xmlw, JsonObject dvar, String f // range.getBeginValueType().getName().equals(DB_VAR_RANGE_TYPE_POINT)) { if (range.getBoolean("hasBeginValueType") && range.getBoolean("isBeginValueTypePoint")) { if (range.containsKey("beginValue")) { - invalrngAdded = XmlWriterUtil.checkParentElement(xmlw, "invalrng", invalrngAdded); + invalrngAdded = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "invalrng", invalrngAdded); xmlw.writeEmptyElement("item"); XmlWriterUtil.writeAttribute(xmlw, "VALUE", range.getString("beginValue")); } } else { - invalrngAdded = XmlWriterUtil.checkParentElement(xmlw, "invalrng", invalrngAdded); + invalrngAdded = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "invalrng", invalrngAdded); xmlw.writeEmptyElement("range"); if (range.getBoolean("hasBeginValueType") && range.containsKey("beginValue")) { if (range.getBoolean("isBeginValueTypeMin")) { From fea2f5e01d9a9e3d37f1714e3aaba8dc32f84ab0 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 15 May 2024 10:42:29 -0400 Subject: [PATCH 082/366] access rights descriptions, geolocations, funding refs --- .../pidproviders/doi/XmlMetadataTemplate.java | 297 +++++++++++++++--- 1 file changed, 249 insertions(+), 48 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index eb2465257a1..be55b7a4837 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -41,16 +41,20 @@ import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DvObject; import edu.harvard.iq.dataverse.GlobalId; +import edu.harvard.iq.dataverse.TermsOfUseAndAccess; import edu.harvard.iq.dataverse.api.Util; import edu.harvard.iq.dataverse.api.dto.DatasetDTO; import edu.harvard.iq.dataverse.api.dto.FieldDTO; import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO; +import edu.harvard.iq.dataverse.dataset.DatasetUtil; import edu.harvard.iq.dataverse.export.DDIExporter; +import edu.harvard.iq.dataverse.license.License; import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; import edu.harvard.iq.dataverse.pidproviders.PidUtil; import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider; import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider; +import edu.harvard.iq.dataverse.util.BundleUtil; import edu.harvard.iq.dataverse.util.PersonOrOrgUtil; import edu.harvard.iq.dataverse.util.StringUtil; import edu.harvard.iq.dataverse.util.xml.XmlPrinter; @@ -117,34 +121,6 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM writeDescriptions(xmlw, dvObject); writeGeoLocations(xmlw, dvObject); writeFundingReferences(xmlw, dvObject); - - StringBuilder contributorsElement = new StringBuilder(); - if (doiMetadata.getContacts() != null) { - for (String[] contact : doiMetadata.getContacts()) { - if (!contact[0].isEmpty()) { - contributorsElement.append("" - + StringEscapeUtils.escapeXml10(contact[0]) + ""); - if (!contact[1].isEmpty()) { - contributorsElement.append("" + StringEscapeUtils.escapeXml10(contact[1]) + ""); - } - contributorsElement.append(""); - } - } - } - - if (doiMetadata.getProducers() != null) { - for (String[] producer : doiMetadata.getProducers()) { - contributorsElement.append("" + StringEscapeUtils.escapeXml10(producer[0]) - + ""); - if (!producer[1].isEmpty()) { - contributorsElement.append("" + StringEscapeUtils.escapeXml10(producer[1]) + ""); - } - contributorsElement.append(""); - } - } - - String relIdentifiers = generateRelatedIdentifiers(dvObject); - } /** @@ -1025,42 +1001,267 @@ private void writeVersion(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStr } - private void writeAccessRights(XMLStreamWriter xmlw, DvObject dvObject) { + private void writeAccessRights(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { // rightsList -> rights with rightsURI attribute xmlw.writeStartElement("rightsList"); // // set terms from the info:eu-repo-Access-Terms vocabulary - writeRightsHeader(xmlw, language); - boolean restrict = false; + xmlw.writeStartElement("rights"); // + DatasetVersion dv = null; boolean closed = false; + if (dvObject instanceof Dataset d) { + dv = d.getLatestVersionForCopy(); + closed = dv.isHasRestrictedFile(); + } else if (dvObject instanceof DataFile df) { + dv = df.getOwner().getLatestVersionForCopy(); - if (datasetVersionDTO.isFileAccessRequest()) { - restrict = true; - } - if (datasetVersionDTO.getFiles() != null) { - for (int i = 0; i < datasetVersionDTO.getFiles().size(); i++) { - if (datasetVersionDTO.getFiles().get(i).isRestricted()) { - closed = true; - break; - } - } + closed = df.isRestricted(); } + TermsOfUseAndAccess terms = dv.getTermsOfUseAndAccess(); + boolean requestsAllowed = terms.isFileAccessRequest(); + License license = terms.getLicense(); - if (restrict && closed) { + if (requestsAllowed && closed) { xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/restrictedAccess"); - } else if (!restrict && closed) { + } else if (!requestsAllowed && closed) { xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/closedAccess"); } else { xmlw.writeAttribute("rightsURI", "info:eu-repo/semantics/openAccess"); } xmlw.writeEndElement(); // + xmlw.writeStartElement("rights"); // - writeRightsHeader(xmlw, language); - if (datasetVersionDTO.getLicense() != null) { - xmlw.writeAttribute("rightsURI", datasetVersionDTO.getLicense().getUri()); - xmlw.writeCharacters(datasetVersionDTO.getLicense().getName()); + if (license != null) { + xmlw.writeAttribute("rightsURI", license.getUri().toString()); + xmlw.writeCharacters(license.getName()); + } else { + xmlw.writeAttribute("rightsURI", DatasetUtil.getLicenseURI(dv)); + xmlw.writeCharacters(BundleUtil.getStringFromBundle("license.custom.description")); + ; } xmlw.writeEndElement(); // - xmlw.writeEndElement(); // + xmlw.writeEndElement(); // + } + + private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + // descriptions -> description with descriptionType attribute + boolean descriptionsWritten = false; + List descriptions = null; + DatasetVersion dv = null; + + if (dvObject instanceof Dataset d) { + dv = d.getLatestVersionForCopy(); + dv.getDescriptions(); + } else if (dvObject instanceof DataFile df) { + String description = df.getDescription(); + if (description != null) { + descriptions = new ArrayList(); + descriptions.add(description); + } + } + Map attributes = new HashMap(); + attributes.put("descriptionType", "Abstract"); + for (String description : descriptions) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, description); + ; + } + + if (dv != null) { + List dsfs = dv.getDatasetFields(); + + for (DatasetField dsf : dsfs) { + + switch (dsf.getDatasetFieldType().getName()) { + case DatasetFieldConstant.software: + attributes.clear(); + attributes.put("descriptionType", "TechnicalInfo"); + List dsfcvs = dsf.getDatasetFieldCompoundValues(); + for (DatasetFieldCompoundValue dsfcv : dsfcvs) { + + String softwareName = null; + String softwareVersion = null; + List childDsfs = dsfcv.getChildDatasetFields(); + for (DatasetField childDsf : childDsfs) { + if (DatasetFieldConstant.softwareName.equals(childDsf.getDatasetFieldType().getName())) { + softwareName = childDsf.getValue(); + } else if (DatasetFieldConstant.softwareVersion.equals(childDsf.getDatasetFieldType().getName())) { + softwareVersion = childDsf.getValue(); + } + } + if (StringUtils.isNotBlank(softwareName)) { + if (StringUtils.isNotBlank(softwareVersion)) { + } + softwareName = softwareName + ", " + softwareVersion; + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, softwareName); + } + } + break; + case DatasetFieldConstant.originOfSources: + case DatasetFieldConstant.characteristicOfSources: + case DatasetFieldConstant.accessToSources: + attributes.clear(); + attributes.put("descriptionType", "Methods"); + String method = dsf.getValue(); + if (StringUtils.isNotBlank(method)) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, method); + + } + break; + case DatasetFieldConstant.series: + attributes.clear(); + attributes.put("descriptionType", "SeriesInformation"); + dsfcvs = dsf.getDatasetFieldCompoundValues(); + for (DatasetFieldCompoundValue dsfcv : dsfcvs) { + List childDsfs = dsfcv.getChildDatasetFields(); + for (DatasetField childDsf : childDsfs) { + + if (DatasetFieldConstant.seriesInformation.equals(childDsf.getDatasetFieldType().getName())) { + String seriesInformation = childDsf.getValue(); + if (StringUtils.isNotBlank(seriesInformation)) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, seriesInformation); + } + break; + } + } + } + break; + case DatasetFieldConstant.notesText: + attributes.clear(); + attributes.put("descriptionType", "Other"); + String notesText = dsf.getValue(); + if (StringUtils.isNotBlank(notesText)) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, notesText); + } + break; + + } + } + + } + + if (descriptionsWritten) { + xmlw.writeEndElement(); // + } + } + + private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + if (dvObject instanceof Dataset d) { + boolean geoLocationsWritten = false; + DatasetVersion dv = d.getLatestVersionForCopy(); + + List places = dv.getGeographicCoverage(); + if (places != null && !places.isEmpty()) { + // geoLocationPlace + geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocation", geoLocationsWritten); + + for (String[] place : places) { + ArrayList placeList = new ArrayList(); + for (String placePart : place) { + placeList.add(placePart); + } + XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", Strings.join(placeList, ", ")); + } + } + boolean boundingBoxFound = false; + boolean productionPlaceFound = false; + for (DatasetField dsf : dv.getDatasetFields()) { + switch (dsf.getDatasetFieldType().getName()) { + case DatasetFieldConstant.geographicBoundingBox: + boundingBoxFound = true; + for (DatasetFieldCompoundValue dsfcv : dsf.getDatasetFieldCompoundValues()) { + List childDsfs = dsfcv.getChildDatasetFields(); + String nLatitude = null; + String sLatitude = null; + String eLongitude = null; + String wLongitude = null; + for (DatasetField childDsf : childDsfs) { + switch (childDsf.getDatasetFieldType().getName()) { + case DatasetFieldConstant.northLatitude: + nLatitude = childDsf.getValue(); + break; + case DatasetFieldConstant.southLatitude: + sLatitude = childDsf.getValue(); + break; + case DatasetFieldConstant.eastLongitude: + eLongitude = childDsf.getValue(); + break; + case DatasetFieldConstant.westLongitude: + wLongitude = childDsf.getValue(); + + } + } + if (StringUtils.isNoneBlank(wLongitude, eLongitude, nLatitude, sLatitude)) { + geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocation", geoLocationsWritten); + if (wLongitude.equals(eLongitude) && nLatitude.equals(sLatitude)) { + // A point + xmlw.writeStartElement("geoLocationPoint"); + XmlWriterUtil.writeFullElement(xmlw, "pointLongitude", eLongitude); + XmlWriterUtil.writeFullElement(xmlw, "pointLatitude", sLatitude); + xmlw.writeEndElement(); + } else { + // A box + xmlw.writeStartElement("geoLocationBox"); + XmlWriterUtil.writeFullElement(xmlw, "westBoundLongitude", wLongitude); + XmlWriterUtil.writeFullElement(xmlw, "eastBoundLongitude", eLongitude); + XmlWriterUtil.writeFullElement(xmlw, "southBoundLatitude", sLatitude); + XmlWriterUtil.writeFullElement(xmlw, "northBoundLatitude", nLatitude); + xmlw.writeEndElement(); + + } + } + } + case DatasetFieldConstant.productionPlace: + productionPlaceFound = true; + // geoLocationPlace + geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocation", geoLocationsWritten); + List prodPlaces = dsf.getValues(); + for (String prodPlace : prodPlaces) { + XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", prodPlace); + } + break; + } + if (boundingBoxFound && productionPlaceFound) { + break; + } + } + if (geoLocationsWritten) { + xmlw.writeEndElement(); // + } + } + + } + + + private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + // fundingReferences -> fundingReference -> funderName, awardNumber + boolean fundingReferenceWritten = false; + DatasetVersion dv = null; + if (dvObject instanceof Dataset d) { + dv = d.getLatestVersionForCopy(); + } else if (dvObject instanceof DataFile df) { + dv = df.getOwner().getLatestVersionForCopy(); + } + if (dv != null) { + List funders = dv.getFunders(); + if (!funders.isEmpty()) { + + for (String funder : funders) { + if (!StringUtils.isBlank(funder)) { + fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); + xmlw.writeStartElement("fundingReference"); // + XmlWriterUtil.writeFullElement(xmlw, "funderName", funder); + xmlw.writeEndElement(); // + } + } + if (fundingReferenceWritten) { + xmlw.writeEndElement(); // + } + } + } } } \ No newline at end of file From 3c52b6a2031a55c8840948681930a1824b02820b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 17 May 2024 15:36:18 -0400 Subject: [PATCH 083/366] altTitles npe --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index be55b7a4837..a2c744be2ed 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -138,7 +138,7 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String language) throws XMLStreamException { String title = doiMetadata.getTitle(); String subTitle = null; - List altTitles = null; + List altTitles = new ArrayList<>(); // Only Datasets can have a subtitle or alternative titles if (dvObject instanceof Dataset d) { DatasetVersion dv = d.getLatestVersion(); From bab2a0d270b766916dfd9578fd25ab05332f0958 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Sat, 18 May 2024 12:25:07 -0400 Subject: [PATCH 084/366] fixes and test --- .../pidproviders/doi/XmlMetadataTemplate.java | 64 ++++++----- .../doi/datacite/XmlMetadataTemplateTest.java | 108 ++++++++++++++++++ 2 files changed, 144 insertions(+), 28 deletions(-) create mode 100644 src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index a2c744be2ed..e9b7b0faa26 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -21,6 +21,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; + import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -84,6 +85,7 @@ public String generateXML(DvObject dvObject) { generateXML(dvObject, outputStream); String xml = outputStream.toString(); + logger.info(xml); return XmlPrinter.prettyPrintXml(xml); } catch (XMLStreamException | IOException e) { logger.severe("Unable to generate DataCite XML for DOI: " + dvObject.getGlobalId().asString() + " : " + e.getMessage()); @@ -98,10 +100,11 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM String metadataLanguage = null; // when set, otherwise = language? XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream); xmlw.writeStartElement("resource"); + xmlw.writeDefaultNamespace(XML_NAMESPACE); xmlw.writeAttribute("xmlns:xsi", XML_XSI); xmlw.writeAttribute("xsi:schemaLocation", XML_SCHEMA_LOCATION); - + writeIdentifier(xmlw, dvObject); writeCreators(xmlw, doiMetadata.getAuthors()); writeTitles(xmlw, dvObject, language); @@ -121,6 +124,8 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM writeDescriptions(xmlw, dvObject); writeGeoLocations(xmlw, dvObject); writeFundingReferences(xmlw, dvObject); + xmlw.writeEndElement(); + xmlw.flush(); } /** @@ -726,32 +731,34 @@ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) } } } - if (!altPids.isEmpty()) { + + if (altPids != null && !altPids.isEmpty()) { alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternativeIdentifiers", alternatesWritten); - } - for (AlternativePersistentIdentifier altPid : altPids) { - String identifierType = null; - String identifier = null; - switch (altPid.getProtocol()) { - case AbstractDOIProvider.DOI_PROTOCOL: - identifierType = AbstractDOIProvider.DOI_PROTOCOL.toUpperCase(); - identifier = altPid.getAuthority() + "/" + altPid.getIdentifier(); - break; - case HandlePidProvider.HDL_PROTOCOL: - identifierType = "Handle"; - identifier = altPid.getAuthority() + "/" + altPid.getIdentifier(); - break; - default: - // The AlternativePersistentIdentifier class isn't really ready for anything but - // doi or handle pids, but will add this as a default. - identifierType = ":unav"; - identifier = altPid.getAuthority() + altPid.getIdentifier(); - break; - } - attributes.put("alternativeIdentifierType", identifierType); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier); + for (AlternativePersistentIdentifier altPid : altPids) { + String identifierType = null; + String identifier = null; + switch (altPid.getProtocol()) { + case AbstractDOIProvider.DOI_PROTOCOL: + identifierType = AbstractDOIProvider.DOI_PROTOCOL.toUpperCase(); + identifier = altPid.getAuthority() + "/" + altPid.getIdentifier(); + break; + case HandlePidProvider.HDL_PROTOCOL: + identifierType = "Handle"; + identifier = altPid.getAuthority() + "/" + altPid.getIdentifier(); + break; + default: + // The AlternativePersistentIdentifier class isn't really ready for anything but + // doi or handle pids, but will add this as a default. + identifierType = ":unav"; + identifier = altPid.getAuthority() + altPid.getIdentifier(); + break; + } + attributes.put("alternativeIdentifierType", identifierType); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier); + } } + for (DatasetFieldCompoundValue otherIdentifier : otherIdentifiers) { String identifierType = null; String identifier = null; @@ -1061,10 +1068,11 @@ private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject) throws X } Map attributes = new HashMap(); attributes.put("descriptionType", "Abstract"); - for (String description : descriptions) { - descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, description); - ; + if (descriptions != null) { + for (String description : descriptions) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, description); + } } if (dv != null) { diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java new file mode 100644 index 00000000000..e576398a474 --- /dev/null +++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java @@ -0,0 +1,108 @@ +package edu.harvard.iq.dataverse.pidproviders.doi.datacite; + +import edu.harvard.iq.dataverse.Dataset; +import edu.harvard.iq.dataverse.DatasetField; +import edu.harvard.iq.dataverse.DatasetFieldConstant; +import edu.harvard.iq.dataverse.DatasetFieldType; +import edu.harvard.iq.dataverse.DatasetVersion; +import edu.harvard.iq.dataverse.DatasetVersion.VersionState; +import edu.harvard.iq.dataverse.DataverseServiceBean; +import edu.harvard.iq.dataverse.GlobalId; +import edu.harvard.iq.dataverse.TermsOfUseAndAccess; +import edu.harvard.iq.dataverse.branding.BrandingUtil; +import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean; +import edu.harvard.iq.dataverse.pidproviders.PidUtil; +import edu.harvard.iq.dataverse.pidproviders.doi.DoiMetadata; +import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate; +import edu.harvard.iq.dataverse.settings.JvmSettings; +import edu.harvard.iq.dataverse.settings.SettingsServiceBean; +import edu.harvard.iq.dataverse.util.SystemConfig; +import edu.harvard.iq.dataverse.util.testing.JvmSetting; +import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.extension.ExtendWith; + +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; + +@ExtendWith(MockitoExtension.class) +@LocalJvmSettings +@JvmSetting(key = JvmSettings.SITE_URL, value = "https://example.com") + +public class XmlMetadataTemplateTest { + + static DataverseServiceBean dataverseSvc; + static SettingsServiceBean settingsSvc; + static PidProviderFactoryBean pidService; + static final String DEFAULT_NAME = "LibraScholar"; + + @BeforeAll + public static void setupMocks() { + dataverseSvc = Mockito.mock(DataverseServiceBean.class); + settingsSvc = Mockito.mock(SettingsServiceBean.class); + BrandingUtil.injectServices(dataverseSvc, settingsSvc); + + // initial values (needed here for other tests where this method is reused!) + Mockito.when(settingsSvc.getValueForKey(SettingsServiceBean.Key.InstallationName)).thenReturn(DEFAULT_NAME); + Mockito.when(dataverseSvc.getRootDataverseName()).thenReturn(DEFAULT_NAME); + + pidService = Mockito.mock(PidProviderFactoryBean.class); + Mockito.when(pidService.isGlobalIdLocallyUnique(any(GlobalId.class))).thenReturn(true); + Mockito.when(pidService.getProducer()).thenReturn("RootDataverse"); + + } + + /** + */ + @Test + public void testDataCiteXMLCreation() throws IOException { + DoiMetadata doiMetadata = new DoiMetadata(); + doiMetadata.setTitle("A Title"); + List creators = new ArrayList(); + creators.add("Alice"); + creators.add("Bob"); + doiMetadata.setCreators(creators); + doiMetadata.setPublisher("Dataverse"); + XmlMetadataTemplate template = new XmlMetadataTemplate(doiMetadata); + + Dataset d = new Dataset(); + GlobalId doi = new GlobalId("doi", "10.5072", "FK2/ABCDEF", null, null, null); + d.setGlobalId(doi); + DatasetVersion dv = new DatasetVersion(); + TermsOfUseAndAccess toa = new TermsOfUseAndAccess(); + toa.setTermsOfUse("Some terms"); + dv.setTermsOfUseAndAccess(toa); + dv.setDataset(d); + DatasetFieldType primitiveDSFType = new DatasetFieldType(DatasetFieldConstant.title, + DatasetFieldType.FieldType.TEXT, false); + DatasetField testDatasetField = new DatasetField(); + + dv.setVersionState(VersionState.DRAFT); + + testDatasetField.setDatasetVersion(dv); + testDatasetField.setDatasetFieldType(primitiveDSFType); + testDatasetField.setSingleValue("First Title"); + List fields = new ArrayList<>(); + fields.add(testDatasetField); + dv.setDatasetFields(fields); + ArrayList dsvs = new ArrayList<>(); + dsvs.add(0, dv); + d.setVersions(dsvs); + + String xml = template.generateXML(d); + System.out.println("Output is " + xml); + + } + +} From 3cca63d2f6ff4052852876d9ccfe52424d2da615 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 20 May 2024 14:55:46 -0400 Subject: [PATCH 085/366] fix for empty rel pub entry --- .../pidproviders/doi/XmlMetadataTemplate.java | 179 +++++++++--------- 1 file changed, 94 insertions(+), 85 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index e9b7b0faa26..8725feca546 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -21,7 +21,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; - import org.apache.commons.lang3.StringUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -97,14 +96,14 @@ public String generateXML(DvObject dvObject) { private void generateXML(DvObject dvObject, OutputStream outputStream) throws XMLStreamException { // Could/should use dataset metadata language for metadata from DvObject itself? String language = null; // machine locale? e.g. for Publisher which is global - String metadataLanguage = null; // when set, otherwise = language? + String metadataLanguage = null; // when set, otherwise = language? XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream); xmlw.writeStartElement("resource"); - + xmlw.writeDefaultNamespace(XML_NAMESPACE); xmlw.writeAttribute("xmlns:xsi", XML_XSI); xmlw.writeAttribute("xsi:schemaLocation", XML_SCHEMA_LOCATION); - + writeIdentifier(xmlw, dvObject); writeCreators(xmlw, doiMetadata.getAuthors()); writeTitles(xmlw, dvObject, language); @@ -242,7 +241,7 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList) String nameIdentifierScheme = null; if (StringUtils.isNotBlank(author.getIdValue()) && StringUtils.isNotBlank(author.getIdType())) { nameIdentifier = author.getIdValue(); - if(nameIdentifier != null) { + if (nameIdentifier != null) { // Normalizes to the URL form of the identifier, returns null if the identifier // is not valid given the type nameIdentifier = author.getIdentifierAsUrl(); @@ -392,14 +391,16 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt } /** - * 7, Contributor (with optional given name, family name, name identifier - * and affiliation sub-properties) + * 7, Contributor (with optional given name, family name, name identifier and + * affiliation sub-properties) * * @see #writeContributorElement(javax.xml.stream.XMLStreamWriter, - * java.lang.String, java.lang.String, java.lang.String) + * java.lang.String, java.lang.String, java.lang.String) * - * @param xmlw The stream writer - * @param dvObject The Dataset/DataFile + * @param xmlw + * The stream writer + * @param dvObject + * The Dataset/DataFile * @throws XMLStreamException */ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { @@ -410,11 +411,11 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X List compoundContributors = new ArrayList(); // Dataset Subject= Dataverse subject, keyword, and/or topic classification // fields - //ToDo Include for files? - /*if(dvObject instanceof DataFile df) { - dvObject = df.getOwner(); - }*/ - + // ToDo Include for files? + /* + * if(dvObject instanceof DataFile df) { dvObject = df.getOwner(); } + */ + if (dvObject instanceof Dataset d) { DatasetVersion dv = d.getLatestVersionForCopy(); for (DatasetField dsf : dv.getDatasetFields()) { @@ -433,8 +434,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X } } } - - + for (DatasetFieldCompoundValue producerFieldValue : compoundProducers) { String producer = null; String affiliation = null; @@ -457,7 +457,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X } } - + for (DatasetFieldCompoundValue distributorFieldValue : compoundDistributors) { String distributor = null; String affiliation = null; @@ -517,7 +517,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X break; } } - // QDR - doesn't have Funder in the contributor type list. + // QDR - doesn't have Funder in the contributor type list. // Using a string isn't i18n if (StringUtils.isNotBlank(contributor) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) { contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); @@ -526,7 +526,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X } } - + if (contributorsCreated) { xmlw.writeEndElement(); } @@ -568,7 +568,7 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin logger.warning("DatasetAuthor.getIdentifierAsUrl returned a Malformed URL: " + nameIdentifier); } } - + if (StringUtils.isNotBlank(affiliation)) { attributeMap.clear(); if (affiliation.startsWith("https://ror.org/")) { @@ -584,8 +584,10 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin /** * 8, Date (with type sub-property) (R) * - * @param xmlw The Steam writer - * @param dvObject The dataset/datafile + * @param xmlw + * The Steam writer + * @param dvObject + * The dataset/datafile * @throws XMLStreamException */ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { @@ -668,15 +670,16 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } } - // 9, Language (MA), language private void writeLanguage(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { - //Currently not supported. Spec indicates one 'primary' language. Could send the first entry in DatasetFieldConstant.language or send iff there is only one entry, and/or default to the machine's default lang? + // Currently not supported. Spec indicates one 'primary' language. Could send + // the first entry in DatasetFieldConstant.language or send iff there is only + // one entry, and/or default to the machine's default lang? return; } - - // 10, ResourceType (with mandatory general type - // description sub- property) (M) + + // 10, ResourceType (with mandatory general type + // description sub- property) (M) private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { List kindOfDataValues = new ArrayList(); Map attributes = new HashMap(); @@ -711,8 +714,10 @@ private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws X /** * 11 AlternateIdentifier (with type sub-property) (O) * - * @param xmlw The Steam writer - * @param dvObject The dataset/datafile + * @param xmlw + * The Steam writer + * @param dvObject + * The dataset/datafile * @throws XMLStreamException */ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { @@ -731,7 +736,7 @@ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) } } } - + if (altPids != null && !altPids.isEmpty()) { alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternativeIdentifiers", alternatesWritten); for (AlternativePersistentIdentifier altPid : altPids) { @@ -788,8 +793,10 @@ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) /** * 12, RelatedIdentifier (with type and relation type sub-properties) (R) * - * @param xmlw The Steam writer - * @param dvObject the dataset/datafile + * @param xmlw + * The Steam writer + * @param dvObject + * the dataset/datafile * @throws XMLStreamException */ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { @@ -813,6 +820,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th * way those two fields are used for all identifier types. The code here is * ~best effort to interpret those fields. */ + pubIdType = getCanonicalPublicationType(pubIdType); // Prefer url if set, otherwise check identifier @@ -821,49 +829,52 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th relatedIdentifier = identifier; } // For types where we understand the protocol, get the canonical form - switch (pubIdType) { - case "DOI": - if (!relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http")) { - relatedIdentifier = "doi:" + relatedIdentifier; - } - try { - GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); - relatedIdentifier = pid.asRawIdentifier(); - } catch (IllegalArgumentException e) { - relatedIdentifier = null; - } - break; - case "Handle": - if (!relatedIdentifier.startsWith("hdl:") || relatedIdentifier.startsWith("http")) { - relatedIdentifier = "hdl:" + relatedIdentifier; - } - try { - GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); - relatedIdentifier = pid.asRawIdentifier(); - } catch (IllegalArgumentException e) { - relatedIdentifier = null; - } - break; - case "URL": - break; - default: - - // For non-URL types, if a URL is given, split the string to get a schemeUri - try { - URL relatedUrl = new URL(relatedIdentifier); - String protocol = relatedUrl.getProtocol(); - String authority = relatedUrl.getAuthority(); - String site = String.format("%s://%s", protocol, authority); - relatedIdentifier = relatedIdentifier.substring(site.length()); - attributes.put("schemeURI", site); - } catch (MalformedURLException e) { - // Just an identifier + if (pubIdType != null) { + switch (pubIdType) { + case "DOI": + if (!relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http")) { + relatedIdentifier = "doi:" + relatedIdentifier; + } + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + } catch (IllegalArgumentException e) { + relatedIdentifier = null; + } + break; + case "Handle": + if (!relatedIdentifier.startsWith("hdl:") || relatedIdentifier.startsWith("http")) { + relatedIdentifier = "hdl:" + relatedIdentifier; + } + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + } catch (IllegalArgumentException e) { + relatedIdentifier = null; + } + break; + case "URL": + break; + default: + + // For non-URL types, if a URL is given, split the string to get a schemeUri + try { + URL relatedUrl = new URL(relatedIdentifier); + String protocol = relatedUrl.getProtocol(); + String authority = relatedUrl.getAuthority(); + String site = String.format("%s://%s", protocol, authority); + relatedIdentifier = relatedIdentifier.substring(site.length()); + attributes.put("schemeURI", site); + } catch (MalformedURLException e) { + // Just an identifier + } } } - if (StringUtils.isNotBlank(relatedIdentifier)) { // Still have a valid entry - attributes.put("relatedIdentifierType", pubIdType); + if (pubIdType != null) { + attributes.put("relatedIdentifierType", pubIdType); + } attributes.put("relationType", "IsSupplementTo"); relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, relatedIdentifier); @@ -905,7 +916,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th static HashMap relatedIdentifierTypeMap = new HashMap(); - + private static String getCanonicalPublicationType(String pubIdType) { if (relatedIdentifierTypeMap.isEmpty()) { relatedIdentifierTypeMap.put("ARK".toLowerCase(), "ARK"); @@ -976,13 +987,12 @@ private void writeFormats(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStr formatsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "formats", formatsWritten); XmlWriterUtil.writeFullElement(xmlw, "format", format); } - /* Should original formats be sent? What about original sizes above? - if(dataFile.isTabularData()) { - String originalFormat = dataFile.getOriginalFileFormat(); - if(StringUtils.isNotBlank(originalFormat)) { - XmlWriterUtil.writeFullElement(xmlw, "format", format); - } - }*/ + /* + * Should original formats be sent? What about original sizes above? + * if(dataFile.isTabularData()) { String originalFormat = + * dataFile.getOriginalFileFormat(); if(StringUtils.isNotBlank(originalFormat)) + * { XmlWriterUtil.writeFullElement(xmlw, "format", format); } } + */ } } if (formatsWritten) { @@ -993,19 +1003,19 @@ private void writeFormats(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStr private void writeVersion(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { Dataset d = null; - if(dvObject instanceof Dataset) { + if (dvObject instanceof Dataset) { d = (Dataset) dvObject; } else if (dvObject instanceof DataFile) { d = ((DataFile) dvObject).getOwner(); } - if(d !=null) { + if (d != null) { DatasetVersion dv = d.getLatestVersionForCopy(); - String version = dv.getFriendlyVersionNumber(); + String version = dv.getFriendlyVersionNumber(); if (StringUtils.isNotBlank(version)) { XmlWriterUtil.writeFullElement(xmlw, "version", version); } } - + } private void writeAccessRights(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { @@ -1244,7 +1254,6 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X } - private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { // fundingReferences -> fundingReference -> funderName, awardNumber boolean fundingReferenceWritten = false; From 30c80a9a5a27c51d8ca8130375d358aadb447a4f Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 20 May 2024 15:32:13 -0400 Subject: [PATCH 086/366] bugs: remove bad nesting, dupe values --- .../pidproviders/doi/XmlMetadataTemplate.java | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 8725feca546..74da57094c4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -158,20 +158,22 @@ private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String languag if (StringUtils.isNotBlank(title) || StringUtils.isNotBlank(subTitle) || (altTitles != null && !String.join("", altTitles).isBlank())) { xmlw.writeStartElement("titles"); - XmlWriterUtil.writeFullElement(xmlw, "title", title, language); - + if (StringUtils.isNotBlank(title)) { + XmlWriterUtil.writeFullElement(xmlw, "title", title, language); + } Map attributes = new HashMap(); - attributes.put("titleType", "Subtitle"); - - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, title); - - attributes.clear(); - attributes.put("titleType", "AlternativeTitle"); - for (String altTitle : altTitles) { - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, altTitle); + if (StringUtils.isNotBlank(subTitle)) { + attributes.put("titleType", "Subtitle"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, subTitle); + } + if ((altTitles != null && !String.join("", altTitles).isBlank())) { + attributes.clear(); + attributes.put("titleType", "AlternativeTitle"); + for (String altTitle : altTitles) { + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "title", attributes, altTitle); + } } - xmlw.writeEndElement(); } } @@ -250,12 +252,9 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList) } if (StringUtils.isNotBlank(creatorName)) { - xmlw.writeStartElement("creator"); // JsonObject creatorObj = PersonOrOrgUtil.getPersonOrOrganization(creatorName, false, StringUtils.containsIgnoreCase(nameIdentifierScheme, "orcid")); - writeEntityElements(xmlw, "creator", null, creatorObj, affiliation, nameIdentifier, nameIdentifierScheme); - xmlw.writeEndElement(); // } else { @@ -693,21 +692,21 @@ private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws X kindOfDataValues = dsf.getControlledVocabularyValues(); break; } - - if (kindOfDataValues.isEmpty()) { - // Write an attribute only element if there are no kindOfData values. - xmlw.writeStartElement("resourceType"); - xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral")); - xmlw.writeEndElement(); - } else { - for (ControlledVocabularyValue kindOfDataValue : kindOfDataValues) { - String resourceType = kindOfDataValue.getStrValue(); - if (StringUtils.isNotBlank(resourceType)) { - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, resourceType); - } + } + if (kindOfDataValues.isEmpty()) { + // Write an attribute only element if there are no kindOfData values. + xmlw.writeStartElement("resourceType"); + xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral")); + xmlw.writeEndElement(); + } else { + for (ControlledVocabularyValue kindOfDataValue : kindOfDataValues) { + String resourceType = kindOfDataValue.getStrValue(); + if (StringUtils.isNotBlank(resourceType)) { + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, resourceType); } } } + } } From a2acdebbac758317b5d2d07fc1af01859f8bfa85 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 20 May 2024 16:54:02 -0400 Subject: [PATCH 087/366] add XML Validation to test --- .../iq/dataverse/util/xml/XmlValidator.java | 5 +++ .../doi/datacite/XmlMetadataTemplateTest.java | 45 +++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java index 586ca50b6fd..cec64ab95b7 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/xml/XmlValidator.java @@ -24,7 +24,12 @@ public class XmlValidator { private static final Logger logger = Logger.getLogger(XmlValidator.class.getCanonicalName()); public static boolean validateXmlSchema(String fileToValidate, URL schemaToValidateAgainst) throws MalformedURLException, SAXException, IOException { + Source xmlFile = new StreamSource(new File(fileToValidate)); + return validateXmlSchema(xmlFile, schemaToValidateAgainst); + } + + public static boolean validateXmlSchema(Source xmlFile, URL schemaToValidateAgainst) throws MalformedURLException, SAXException, IOException { SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); Schema schema = schemaFactory.newSchema(schemaToValidateAgainst); Validator validator = schema.newValidator(); diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java index e576398a474..c1bbc3bebc1 100644 --- a/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java @@ -1,9 +1,11 @@ package edu.harvard.iq.dataverse.pidproviders.doi.datacite; import edu.harvard.iq.dataverse.Dataset; +import edu.harvard.iq.dataverse.DatasetAuthor; import edu.harvard.iq.dataverse.DatasetField; import edu.harvard.iq.dataverse.DatasetFieldConstant; import edu.harvard.iq.dataverse.DatasetFieldType; +import edu.harvard.iq.dataverse.DatasetFieldType.FieldType; import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DatasetVersion.VersionState; import edu.harvard.iq.dataverse.DataverseServiceBean; @@ -19,12 +21,17 @@ import edu.harvard.iq.dataverse.util.SystemConfig; import edu.harvard.iq.dataverse.util.testing.JvmSetting; import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings; +import edu.harvard.iq.dataverse.util.xml.XmlValidator; import java.io.IOException; +import java.io.StringReader; +import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Map; +import javax.xml.transform.stream.StreamSource; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeAll; @@ -32,6 +39,7 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import org.xml.sax.SAXException; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; @@ -69,10 +77,32 @@ public static void setupMocks() { public void testDataCiteXMLCreation() throws IOException { DoiMetadata doiMetadata = new DoiMetadata(); doiMetadata.setTitle("A Title"); - List creators = new ArrayList(); - creators.add("Alice"); - creators.add("Bob"); - doiMetadata.setCreators(creators); + DatasetFieldType dft = new DatasetFieldType(DatasetFieldConstant.authorName, FieldType.TEXT, false); + dft.setDisplayFormat("#VALUE"); + DatasetFieldType dft2 = new DatasetFieldType(DatasetFieldConstant.authorAffiliation, FieldType.TEXT, false); + dft2.setDisplayFormat("#VALUE"); + DatasetAuthor alice = new DatasetAuthor(); + DatasetField df1 = new DatasetField(); + df1.setDatasetFieldType(dft); + df1.setSingleValue("Alice"); + alice.setName(df1); + DatasetField df2 = new DatasetField(); + df2.setDatasetFieldType(dft2); + df2.setSingleValue("Harvard University"); + alice.setAffiliation(df2); + DatasetAuthor bob = new DatasetAuthor(); + DatasetField df3 = new DatasetField(); + df3.setDatasetFieldType(dft); + df3.setSingleValue("Bob"); + bob.setName(df3); + DatasetField df4 = new DatasetField(); + df4.setDatasetFieldType(dft2); + df4.setSingleValue("QDR"); + bob.setAffiliation(df4); + List authors = new ArrayList<>(); + authors.add(alice); + authors.add(bob); + doiMetadata.setAuthors(authors); doiMetadata.setPublisher("Dataverse"); XmlMetadataTemplate template = new XmlMetadataTemplate(doiMetadata); @@ -102,6 +132,13 @@ public void testDataCiteXMLCreation() throws IOException { String xml = template.generateXML(d); System.out.println("Output is " + xml); + try { + StreamSource source = new StreamSource(new StringReader(xml)); + source.setSystemId("DataCite XML for test dataset"); + assertTrue(XmlValidator.validateXmlSchema(source, new URL("https://schema.datacite.org/meta/kernel-4/metadata.xsd"))); + } catch (SAXException e) { + System.out.println("Invalid schema: " + e.getMessage()); + } } From 3ec7a0b680ec5f04d650e830bb391c6be1f176f2 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 23 May 2024 16:24:09 -0400 Subject: [PATCH 088/366] fix contributorType --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 74da57094c4..6e4d81d6248 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -535,7 +535,7 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin xmlw.writeStartElement(elementName); Map attributeMap = new HashMap(); if (StringUtils.isNotBlank(type)) { - attributeMap.put("contributorType", type); + xmlw.writeAttribute("contributorType", type); } // person name=, if (entityObject.getBoolean("isPerson")) { From 842dee678530391264b2869ec71ab70258901189 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 23 May 2024 17:21:57 -0400 Subject: [PATCH 089/366] add geolocations element and multiple geolocation --- .../pidproviders/doi/XmlMetadataTemplate.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 6e4d81d6248..d0986616bb4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1174,15 +1174,18 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X List places = dv.getGeographicCoverage(); if (places != null && !places.isEmpty()) { // geoLocationPlace - geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocation", geoLocationsWritten); - + geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten); for (String[] place : places) { + xmlw.startElement("geoLocation"); // + ArrayList placeList = new ArrayList(); for (String placePart : place) { placeList.add(placePart); } XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", Strings.join(placeList, ", ")); + xmlw.endElement(); // } + } boolean boundingBoxFound = false; boolean productionPlaceFound = false; @@ -1213,7 +1216,8 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X } } if (StringUtils.isNoneBlank(wLongitude, eLongitude, nLatitude, sLatitude)) { - geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocation", geoLocationsWritten); + geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten); + xmlw.startElement("geoLocation"); // if (wLongitude.equals(eLongitude) && nLatitude.equals(sLatitude)) { // A point xmlw.writeStartElement("geoLocationPoint"); @@ -1230,15 +1234,18 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X xmlw.writeEndElement(); } + xmlw.endElement(); // } } case DatasetFieldConstant.productionPlace: productionPlaceFound = true; // geoLocationPlace - geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocation", geoLocationsWritten); + geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten); List prodPlaces = dsf.getValues(); for (String prodPlace : prodPlaces) { + xmlw.startElement("geoLocation"); // XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", prodPlace); + xmlw.endElement(); // } break; } From 81a7c4a946ee4e54ae91913c6de6857fb6a553ba Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 23 May 2024 17:29:19 -0400 Subject: [PATCH 090/366] typos --- .../pidproviders/doi/XmlMetadataTemplate.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index d0986616bb4..127a1930860 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1176,14 +1176,14 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X // geoLocationPlace geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten); for (String[] place : places) { - xmlw.startElement("geoLocation"); // + xmlw.writeStartElement("geoLocation"); // ArrayList placeList = new ArrayList(); for (String placePart : place) { placeList.add(placePart); } XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", Strings.join(placeList, ", ")); - xmlw.endElement(); // + xmlw.writeEndElement(); // } } @@ -1217,7 +1217,7 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X } if (StringUtils.isNoneBlank(wLongitude, eLongitude, nLatitude, sLatitude)) { geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten); - xmlw.startElement("geoLocation"); // + xmlw.writeStartElement("geoLocation"); // if (wLongitude.equals(eLongitude) && nLatitude.equals(sLatitude)) { // A point xmlw.writeStartElement("geoLocationPoint"); @@ -1234,7 +1234,7 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X xmlw.writeEndElement(); } - xmlw.endElement(); // + xmlw.writeEndElement(); // } } case DatasetFieldConstant.productionPlace: @@ -1243,9 +1243,9 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X geoLocationsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "geoLocations", geoLocationsWritten); List prodPlaces = dsf.getValues(); for (String prodPlace : prodPlaces) { - xmlw.startElement("geoLocation"); // + xmlw.writeStartElement("geoLocation"); // XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", prodPlace); - xmlw.endElement(); // + xmlw.writeEndElement(); // } break; } From ed5eab0deb487ebfbb53157a40e2cf409d5f40ab Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 09:53:12 -0400 Subject: [PATCH 091/366] try execute inside the main method trying to avoid a separate tx boundary --- .../command/impl/CuratePublishedDatasetVersionCommand.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java index f83041d87bd..fbff40a9c80 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java @@ -167,9 +167,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException { DeleteDatasetVersionCommand cmd; cmd = new DeleteDatasetVersionCommand(getRequest(), savedDataset); - ctxt.engine().submit(cmd); - // Running the command above reindexes the dataset, so we don't need to do it - // again in here. + cmd.execute(ctxt); // And update metadata at PID provider ctxt.engine().submit( From 39673f05e6d4394d3549c58a5d487a9c732113c2 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 10:41:42 -0400 Subject: [PATCH 092/366] Fix subject, keyword --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 127a1930860..85e28670cfc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -305,8 +305,10 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt // fields if (dvObject instanceof Dataset d) { DatasetVersion dv = d.getLatestVersionForCopy(); - dv.getDatasetSubjects(); for (DatasetField dsf : dv.getDatasetFields()) { + if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.subject)) { + subjects.addAll(dsf.getValues()); + } if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.keyword)) { compoundKeywords = dsf.getDatasetFieldCompoundValues(); } else if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.topicClassification)) { @@ -330,7 +332,7 @@ private void writeSubjects(XMLStreamWriter xmlw, DvObject dvObject) throws XMLSt for (DatasetField subField : keywordFieldValue.getChildDatasetFields()) { switch (subField.getDatasetFieldType().getName()) { - case DatasetFieldConstant.keyword: + case DatasetFieldConstant.keywordValue: keyword = subField.getValue(); break; case DatasetFieldConstant.keywordVocab: From 36097d61bbf0c92aab48db01ff02e1c23b86be1a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 10:41:51 -0400 Subject: [PATCH 093/366] fix geo coverage --- src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java index d723cf3d528..6648419216d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java @@ -1342,9 +1342,8 @@ public List getGeographicCoverage() { } geoCoverages.add(coverageItem); } - + break; } - break; } return geoCoverages; } From a5d3b3e5a40b049176a6c3a205b1199c2117694e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 11:47:04 -0400 Subject: [PATCH 094/366] adjust funders to include grant number, add xml escaping for description --- .../pidproviders/doi/XmlMetadataTemplate.java | 70 +++++++++++++++---- 1 file changed, 58 insertions(+), 12 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 85e28670cfc..3b6a5cb2906 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1082,7 +1082,7 @@ private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject) throws X if (descriptions != null) { for (String description : descriptions) { descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, description); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, StringEscapeUtils.escapeXml10(description)); } } @@ -1272,21 +1272,67 @@ private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) thr dv = df.getOwner().getLatestVersionForCopy(); } if (dv != null) { - List funders = dv.getFunders(); - if (!funders.isEmpty()) { - - for (String funder : funders) { - if (!StringUtils.isBlank(funder)) { - fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); - xmlw.writeStartElement("fundingReference"); // - XmlWriterUtil.writeFullElement(xmlw, "funderName", funder); - xmlw.writeEndElement(); // + List retList = new ArrayList<>(); + for (DatasetField dsf : dv.getDatasetFields()) { + if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributor)) { + boolean addFunder = false; + for (DatasetFieldCompoundValue contributorValue : dsf.getDatasetFieldCompoundValues()) { + String contributorName = null; + String contributorType = null; + for (DatasetField subField : contributorValue.getChildDatasetFields()) { + if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributorName)) { + contributorName = subField.getDisplayValue(); + } + if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.contributorType)) { + contributorType = subField.getRawValue(); + } + } + // SEK 02/12/2019 move outside loop to prevent contrib type to carry over to + // next contributor + // TODO: Consider how this will work in French, Chinese, etc. + if ("Funder".equals(contributorType)) { + if (!StringUtils.isBlank(contributorName)) { + fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); + xmlw.writeStartElement("fundingReference"); // + XmlWriterUtil.writeFullElement(xmlw, "funderName", contributorName); + xmlw.writeEndElement(); // + } + } } } - if (fundingReferenceWritten) { - xmlw.writeEndElement(); // + if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumber)) { + for (DatasetFieldCompoundValue grantObject : dsf.getDatasetFieldCompoundValues()) { + String funder = null; + String awardNumber = null; + for (DatasetField subField : grantObject.getChildDatasetFields()) { + // It would be nice to do something with grantNumberValue (the actual number) + // but schema.org doesn't support it. + if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumberAgency)) { + String grantAgency = subField.getDisplayValue(); + funder = grantAgency; + } else if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.grantNumberValue)) { + String grantNumberValue = subField.getDisplayValue(); + awardNumber = grantNumberValue; + } + } + if (!StringUtils.isBlank(funder)) { + fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); + xmlw.writeStartElement("fundingReference"); // + XmlWriterUtil.writeFullElement(xmlw, "funderName", funder); + if (StringUtils.isNotBlank(awardNumber)) { + writeFullElement(xmlw, null, "awardNumber", null, awardNumber); + } + xmlw.writeEndElement(); // + } + + } } } + + if (fundingReferenceWritten) { + xmlw.writeEndElement(); // + } + } } } \ No newline at end of file From 8a12444d3b835a1df989bc674337897b7feaf1d2 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 11:49:03 -0400 Subject: [PATCH 095/366] bug: add dataset descriptions --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 3b6a5cb2906..564768991cb 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1069,7 +1069,7 @@ private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject) throws X if (dvObject instanceof Dataset d) { dv = d.getLatestVersionForCopy(); - dv.getDescriptions(); + descriptions = dv.getDescriptions(); } else if (dvObject instanceof DataFile df) { String description = df.getDescription(); if (description != null) { From f3e5dc1d00e1d68a734b4c593ae5b874bb5d14a2 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 11:54:50 -0400 Subject: [PATCH 096/366] typo, add xml escape for funder --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 564768991cb..a4fd4585028 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1294,7 +1294,7 @@ private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) thr if (!StringUtils.isBlank(contributorName)) { fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); xmlw.writeStartElement("fundingReference"); // - XmlWriterUtil.writeFullElement(xmlw, "funderName", contributorName); + XmlWriterUtil.writeFullElement(xmlw, "funderName", StringEscapeUtils.escapeXml10(contributorName)); xmlw.writeEndElement(); // } } @@ -1318,9 +1318,9 @@ private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) thr if (!StringUtils.isBlank(funder)) { fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); xmlw.writeStartElement("fundingReference"); // - XmlWriterUtil.writeFullElement(xmlw, "funderName", funder); + XmlWriterUtil.writeFullElement(xmlw, "funderName", StringEscapeUtils.escapeXml10(funder)); if (StringUtils.isNotBlank(awardNumber)) { - writeFullElement(xmlw, null, "awardNumber", null, awardNumber); + writeFullElement(xmlw, null, "awardNumber", StringEscapeUtils.escapeXml10(awardNumber)); } xmlw.writeEndElement(); // } From 5610c950212f2d3d80d7144c37c98e6cd0b71c5e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 12:00:09 -0400 Subject: [PATCH 097/366] still typo --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index a4fd4585028..e2883cad1f9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1320,7 +1320,7 @@ private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) thr xmlw.writeStartElement("fundingReference"); // XmlWriterUtil.writeFullElement(xmlw, "funderName", StringEscapeUtils.escapeXml10(funder)); if (StringUtils.isNotBlank(awardNumber)) { - writeFullElement(xmlw, null, "awardNumber", StringEscapeUtils.escapeXml10(awardNumber)); + XmlWriterUtil.writeFullElement(xmlw, "awardNumber", StringEscapeUtils.escapeXml10(awardNumber)); } xmlw.writeEndElement(); // } From 7148b03360b00363f6550aed5d5d851ab7c2c356 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 14:14:48 -0400 Subject: [PATCH 098/366] mark contact as deprecated - unused --- .../java/edu/harvard/iq/dataverse/DatasetFieldConstant.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java index 22bad42df96..c3e385dcff2 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java @@ -156,6 +156,8 @@ public class DatasetFieldConstant implements java.io.Serializable { public final static String confidentialityDeclaration="confidentialityDeclaration"; public final static String specialPermissions="specialPermissions"; public final static String restrictions="restrictions"; + @Deprecated + //Doesn't appear to be used and is not datasetContact public final static String contact="contact"; public final static String citationRequirements="citationRequirements"; public final static String depositorRequirements="depositorRequirements"; From 0470459316b3338bd940ea2f9afcf9ec1430eab1 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 14:14:59 -0400 Subject: [PATCH 099/366] more fixes --- .../pidproviders/doi/XmlMetadataTemplate.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index e2883cad1f9..fd5a4ecf7fb 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -427,7 +427,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X case DatasetFieldConstant.distributor: compoundDistributors = dsf.getDatasetFieldCompoundValues(); break; - case DatasetFieldConstant.contact: + case DatasetFieldConstant.datasetContact: compoundContacts = dsf.getDatasetFieldCompoundValues(); break; case DatasetFieldConstant.contributor: @@ -638,7 +638,7 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } if (releaseDate != null) { - String date = Util.getDateTimeFormat().format(releaseDate); + String date = Util.getDateFormat().format(releaseDate); datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); attributes.put("dateType", "Available"); @@ -660,6 +660,14 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } } if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { + if(StringUtils.isNotBlank(startDate)) { + Date start = Util.getDateTimeFormat().parse(startDate); + startDate = Util.getDateFormat().format(start); + } + if(StringUtils.isNotBlank(endDate)) { + Date end = Util.getDateTimeFormat().parse(endDate); + endDate = Util.getDateFormat().format(end); + } datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); attributes.put("dateType", "Collected"); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, (startDate + "/" + endDate).trim()); @@ -675,14 +683,14 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea private void writeLanguage(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { // Currently not supported. Spec indicates one 'primary' language. Could send // the first entry in DatasetFieldConstant.language or send iff there is only - // one entry, and/or default to the machine's default lang? + // one entry, and/or default to the machine's default lang, or the dataverse metadatalang? return; } // 10, ResourceType (with mandatory general type // description sub- property) (M) private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { - List kindOfDataValues = new ArrayList(); + List kindOfDataValues = new ArrayList(); Map attributes = new HashMap(); attributes.put("resourceTypeGeneral", "Dataset"); @@ -691,7 +699,7 @@ private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws X for (DatasetField dsf : dv.getDatasetFields()) { switch (dsf.getDatasetFieldType().getName()) { case DatasetFieldConstant.kindOfData: - kindOfDataValues = dsf.getControlledVocabularyValues(); + kindOfDataValues.addAll(dsf.getValues()); break; } } @@ -701,8 +709,7 @@ private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws X xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral")); xmlw.writeEndElement(); } else { - for (ControlledVocabularyValue kindOfDataValue : kindOfDataValues) { - String resourceType = kindOfDataValue.getStrValue(); + for (String resourceType : kindOfDataValues) { if (StringUtils.isNotBlank(resourceType)) { XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, resourceType); } @@ -821,14 +828,16 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th * way those two fields are used for all identifier types. The code here is * ~best effort to interpret those fields. */ + logger.info("Found relpub: " + pubIdType + " " + identifier + " " + url); pubIdType = getCanonicalPublicationType(pubIdType); - +logger.info("Canonical type: " + pubIdType); // Prefer url if set, otherwise check identifier String relatedIdentifier = url; if (StringUtils.isBlank(relatedIdentifier)) { relatedIdentifier = identifier; } + logger.info("Related identifier: " + relatedIdentifier); // For types where we understand the protocol, get the canonical form if (pubIdType != null) { switch (pubIdType) { @@ -836,12 +845,15 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th if (!relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http")) { relatedIdentifier = "doi:" + relatedIdentifier; } + logger.info("Intermediate Related identifier: " + relatedIdentifier); try { GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); relatedIdentifier = pid.asRawIdentifier(); } catch (IllegalArgumentException e) { + logger.warning("Invalid DOI: " + e.getLocalizedMessage()); relatedIdentifier = null; } + logger.info("Final Related identifier: " + relatedIdentifier); break; case "Handle": if (!relatedIdentifier.startsWith("hdl:") || relatedIdentifier.startsWith("http")) { From c0265da5324c6f68e9356a44261ce6b166ded6b8 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 14:22:29 -0400 Subject: [PATCH 100/366] catch parseexception --- .../pidproviders/doi/XmlMetadataTemplate.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index fd5a4ecf7fb..9ed417e77ce 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -5,6 +5,7 @@ import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; +import java.text.ParseException; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -661,12 +662,20 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { if(StringUtils.isNotBlank(startDate)) { + try { Date start = Util.getDateTimeFormat().parse(startDate); startDate = Util.getDateFormat().format(start); + } catch (ParseException e) { + logger.warning("Could not parse date: " + startDate); + } } if(StringUtils.isNotBlank(endDate)) { + try { Date end = Util.getDateTimeFormat().parse(endDate); - endDate = Util.getDateFormat().format(end); + endDate = Util.getDateFormat().format(end); + } catch (ParseException e) { + logger.warning("Could not parse date: " + endDate); + }; } datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); attributes.put("dateType", "Collected"); From 2ff867850500aa9b2eb5712348b65cf48ed4b917 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 14:52:42 -0400 Subject: [PATCH 101/366] fix alternateIdentifier, related PID parsing, series --- .../pidproviders/doi/XmlMetadataTemplate.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 9ed417e77ce..7f861b3e42d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -755,7 +755,7 @@ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) } if (altPids != null && !altPids.isEmpty()) { - alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternativeIdentifiers", alternatesWritten); + alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternateIdentifiers", alternatesWritten); for (AlternativePersistentIdentifier altPid : altPids) { String identifierType = null; String identifier = null; @@ -775,7 +775,7 @@ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) identifier = altPid.getAuthority() + altPid.getIdentifier(); break; } - attributes.put("alternativeIdentifierType", identifierType); + attributes.put("alternateIdentifierType", identifierType); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier); } @@ -795,9 +795,9 @@ private void writeAlternateIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) break; } } - attributes.put("alternativeIdentifierType", identifierType); + attributes.put("alternateIdentifierType", identifierType); if (!StringUtils.isBlank(identifier)) { - alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternativeIdentifiers", alternatesWritten); + alternatesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "alternateIdentifiers", alternatesWritten); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "alternateIdentifier", attributes, identifier); } @@ -851,7 +851,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th if (pubIdType != null) { switch (pubIdType) { case "DOI": - if (!relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http")) { + if (!relatedIdentifier.startsWith("doi:") || !relatedIdentifier.startsWith("http")) { relatedIdentifier = "doi:" + relatedIdentifier; } logger.info("Intermediate Related identifier: " + relatedIdentifier); @@ -865,7 +865,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th logger.info("Final Related identifier: " + relatedIdentifier); break; case "Handle": - if (!relatedIdentifier.startsWith("hdl:") || relatedIdentifier.startsWith("http")) { + if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) { relatedIdentifier = "hdl:" + relatedIdentifier; } try { @@ -1158,7 +1158,7 @@ private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject) throws X List childDsfs = dsfcv.getChildDatasetFields(); for (DatasetField childDsf : childDsfs) { - if (DatasetFieldConstant.seriesInformation.equals(childDsf.getDatasetFieldType().getName())) { + if (DatasetFieldConstant.seriesName.equals(childDsf.getDatasetFieldType().getName())) { String seriesInformation = childDsf.getValue(); if (StringUtils.isNotBlank(seriesInformation)) { descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); From 182f3d7bca310c54eb44f0452c76671b26b03824 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 14:53:47 -0400 Subject: [PATCH 102/366] catch PID update exception to avoid corrupt dataset --- .../CuratePublishedDatasetVersionCommand.java | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java index fbff40a9c80..dd8b19e0c3b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java @@ -1,6 +1,7 @@ package edu.harvard.iq.dataverse.engine.command.impl; import edu.harvard.iq.dataverse.authorization.Permission; +import edu.harvard.iq.dataverse.batch.util.LoggingUtil; import edu.harvard.iq.dataverse.datavariable.VarGroup; import edu.harvard.iq.dataverse.engine.command.CommandContext; import edu.harvard.iq.dataverse.engine.command.DataverseRequest; @@ -151,7 +152,11 @@ public Dataset execute(CommandContext ctxt) throws CommandException { tempDataset.setThumbnailFile(publishedFmd.getDataFile()); } } - + if(logger.isLoggable(Level.FINE)) { + for(FileMetadata fmd: updateVersion.getFileMetadatas()) { + logger.fine("Id: " + fmd.getId() + " label: " + fmd.getLabel()); + } + } // Update modification time on the published version and the dataset updateVersion.setLastUpdateTime(getTimestamp()); tempDataset.setModificationTime(getTimestamp()); @@ -170,28 +175,38 @@ public Dataset execute(CommandContext ctxt) throws CommandException { cmd.execute(ctxt); // And update metadata at PID provider - ctxt.engine().submit( - new UpdateDvObjectPIDMetadataCommand(savedDataset, getRequest())); - - //And the exported metadata files try { - ExportService instance = ExportService.getInstance(); - instance.exportAllFormats(getDataset()); - } catch (ExportException ex) { - // Just like with indexing, a failure to export is not a fatal condition. - logger.log(Level.WARNING, "Curate Published DatasetVersion: exception while exporting metadata files:{0}", ex.getMessage()); + ctxt.engine().submit( + new UpdateDvObjectPIDMetadataCommand(savedDataset, getRequest())); + } catch (CommandException ex) { + //Make this non-fatal as after the DeleteDatasetVersionCommand, we can't roll back - for some reason no datasetfields remain in the DB + //(The old version doesn't need them and the new version doesn't get updated to include them?) + logger.log(Level.WARNING, "Curate Published DatasetVersion: exception while updating PID metadata:{0}", ex.getMessage()); } - - // Update so that getDataset() in updateDatasetUser will get the up-to-date copy // (with no draft version) setDataset(savedDataset); updateDatasetUser(ctxt); - - - return savedDataset; } + @Override + public boolean onSuccess(CommandContext ctxt, Object r) { + boolean retVal = true; + Dataset d = (Dataset) r; + + ctxt.index().asyncIndexDataset(d, true); + + // And the exported metadata files + try { + ExportService instance = ExportService.getInstance(); + instance.exportAllFormats(d); + } catch (ExportException ex) { + // Just like with indexing, a failure to export is not a fatal condition. + retVal = false; + logger.log(Level.WARNING, "Curate Published DatasetVersion: exception while exporting metadata files:{0}", ex.getMessage()); + } + return retVal; + } } From be903555bcc3c21169b3a7343a076c331d308bf6 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 16:24:40 -0400 Subject: [PATCH 103/366] try long sleep --- .../java/edu/harvard/iq/dataverse/DatasetServiceBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java index dab0ff43fcf..29de42f3578 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java @@ -944,9 +944,9 @@ public void callFinalizePublishCommandAsynchronously(Long datasetId, CommandCont // portion of the PublishDatasetCommand. I'm going to leave the 1 second // sleep below, for just in case reasons: -- L.A. try { - Thread.sleep(1000); + Thread.sleep(5000); } catch (Exception ex) { - logger.warning("Failed to sleep for a second."); + logger.warning("Failed to sleep for five seconds."); } logger.fine("Running FinalizeDatasetPublicationCommand, asynchronously"); Dataset theDataset = find(datasetId); From e458e8ca5c14f48d8da94d83c2cb40e76e9198d6 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 16:53:28 -0400 Subject: [PATCH 104/366] set dv released before pid publicize, go back to short time --- .../java/edu/harvard/iq/dataverse/DatasetServiceBean.java | 4 ++-- .../command/impl/FinalizeDatasetPublicationCommand.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java index 29de42f3578..18bd6dc74ee 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java @@ -944,9 +944,9 @@ public void callFinalizePublishCommandAsynchronously(Long datasetId, CommandCont // portion of the PublishDatasetCommand. I'm going to leave the 1 second // sleep below, for just in case reasons: -- L.A. try { - Thread.sleep(5000); + Thread.sleep(1000); } catch (Exception ex) { - logger.warning("Failed to sleep for five seconds."); + logger.warning("Failed to sleep for one second."); } logger.fine("Running FinalizeDatasetPublicationCommand, asynchronously"); Dataset theDataset = find(datasetId); diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java index 287e877f6e0..299bb3168de 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetPublicationCommand.java @@ -211,7 +211,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException { if (theDataset.getLatestVersion().getVersionState() != RELEASED) { // some imported datasets may already be released. - + theDataset.getLatestVersion().setVersionState(RELEASED); if (!datasetExternallyReleased) { publicizeExternalIdentifier(theDataset, ctxt); // Will throw a CommandException, unless successful. @@ -220,7 +220,6 @@ public Dataset execute(CommandContext ctxt) throws CommandException { // a failure - it will remove any locks, and it will send a // proper notification to the user(s). } - theDataset.getLatestVersion().setVersionState(RELEASED); } final Dataset ds = ctxt.em().merge(theDataset); From 27fe7b4d0dad6124d5e036c8ec5d36b31a371a9b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 24 May 2024 17:03:13 -0400 Subject: [PATCH 105/366] always use latest version for copy --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 7f861b3e42d..0adc9984b3d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -146,7 +146,7 @@ private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String languag List altTitles = new ArrayList<>(); // Only Datasets can have a subtitle or alternative titles if (dvObject instanceof Dataset d) { - DatasetVersion dv = d.getLatestVersion(); + DatasetVersion dv = d.getLatestVersionForCopy(); Optional subTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.subTitle)).findFirst(); if (subTitleField.isPresent()) { subTitle = subTitleField.get().getValue(); From 00a383007686b49b938f88415b476e377d054f98 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 09:53:40 -0400 Subject: [PATCH 106/366] handle deaccession, fix relatedIDtype for files --- .../edu/harvard/iq/dataverse/DataFile.java | 19 +++ .../pidproviders/doi/XmlMetadataTemplate.java | 117 +++++++++++------- 2 files changed, 90 insertions(+), 46 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index 29a4a14c021..1a610d9ea6e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -1123,4 +1123,23 @@ private boolean tagExists(String tagLabel) { } return false; } + + public boolean isDeaccessioned() { + // return true, if all published versions were deaccessioned + boolean inDeaccessionedVersions = false; + for (FileMetadata fmd : getFileMetadatas()) { + DatasetVersion testDsv = fmd.getDatasetVersion(); + if (testDsv.isReleased()) { + return false; + } + // Also check for draft version + if (testDsv.isDraft()) { + return false; + } + if (testDsv.isDeaccessioned()) { + inDeaccessionedVersions = true; + } + } + return inDeaccessionedVersions; // since any published version would have already returned + } } // end of class diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 0adc9984b3d..96ee84fe13b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -100,30 +100,41 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM String metadataLanguage = null; // when set, otherwise = language? XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream); xmlw.writeStartElement("resource"); - + boolean deaccessioned=false; + if(dvObject instanceof Dataset d) { + deaccessioned=d.isDeaccessioned(); + } else if (dvObject instanceof DataFile df) { + deaccessioned = df.isDeaccessioned(); + } xmlw.writeDefaultNamespace(XML_NAMESPACE); xmlw.writeAttribute("xmlns:xsi", XML_XSI); xmlw.writeAttribute("xsi:schemaLocation", XML_SCHEMA_LOCATION); writeIdentifier(xmlw, dvObject); - writeCreators(xmlw, doiMetadata.getAuthors()); - writeTitles(xmlw, dvObject, language); - writePublisher(xmlw, dvObject); - writePublicationYear(xmlw, dvObject); - writeSubjects(xmlw, dvObject); - writeContributors(xmlw, dvObject); - writeDates(xmlw, dvObject); - writeLanguage(xmlw, dvObject); + writeCreators(xmlw, doiMetadata.getAuthors(), deaccessioned); + writeTitles(xmlw, dvObject, language, deaccessioned); + writePublisher(xmlw, dvObject, deaccessioned); + writePublicationYear(xmlw, dvObject, deaccessioned); + if (!deaccessioned) { + writeSubjects(xmlw, dvObject); + writeContributors(xmlw, dvObject); + writeDates(xmlw, dvObject); + writeLanguage(xmlw, dvObject); + } writeResourceType(xmlw, dvObject); - writeAlternateIdentifiers(xmlw, dvObject); - writeRelatedIdentifiers(xmlw, dvObject); - writeSize(xmlw, dvObject); - writeFormats(xmlw, dvObject); - writeVersion(xmlw, dvObject); - writeAccessRights(xmlw, dvObject); - writeDescriptions(xmlw, dvObject); - writeGeoLocations(xmlw, dvObject); - writeFundingReferences(xmlw, dvObject); + if (!deaccessioned) { + writeAlternateIdentifiers(xmlw, dvObject); + writeRelatedIdentifiers(xmlw, dvObject); + writeSize(xmlw, dvObject); + writeFormats(xmlw, dvObject); + writeVersion(xmlw, dvObject); + writeAccessRights(xmlw, dvObject); + } + writeDescriptions(xmlw, dvObject, deaccessioned); + if (!deaccessioned) { + writeGeoLocations(xmlw, dvObject); + writeFundingReferences(xmlw, dvObject); + } xmlw.writeEndElement(); xmlw.flush(); } @@ -140,23 +151,29 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM * @return * @throws XMLStreamException */ - private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String language) throws XMLStreamException { - String title = doiMetadata.getTitle(); + private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String language, boolean deaccessioned) throws XMLStreamException { + String title = null; String subTitle = null; List altTitles = new ArrayList<>(); - // Only Datasets can have a subtitle or alternative titles - if (dvObject instanceof Dataset d) { - DatasetVersion dv = d.getLatestVersionForCopy(); - Optional subTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.subTitle)).findFirst(); - if (subTitleField.isPresent()) { - subTitle = subTitleField.get().getValue(); - } - Optional altTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.alternativeTitle)).findFirst(); - if (altTitleField.isPresent()) { - altTitles = altTitleField.get().getValues(); + + if (!deaccessioned) { + doiMetadata.getTitle(); + + // Only Datasets can have a subtitle or alternative titles + if (dvObject instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersionForCopy(); + Optional subTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.subTitle)).findFirst(); + if (subTitleField.isPresent()) { + subTitle = subTitleField.get().getValue(); + } + Optional altTitleField = dv.getDatasetFields().stream().filter(f -> f.getDatasetFieldType().getName().equals(DatasetFieldConstant.alternativeTitle)).findFirst(); + if (altTitleField.isPresent()) { + altTitles = altTitleField.get().getValues(); + } } + } else { + title = AbstractDOIProvider.UNAVAILABLE; } - if (StringUtils.isNotBlank(title) || StringUtils.isNotBlank(subTitle) || (altTitles != null && !String.join("", altTitles).isBlank())) { xmlw.writeStartElement("titles"); if (StringUtils.isNotBlank(title)) { @@ -227,13 +244,13 @@ private void writeIdentifier(XMLStreamWriter xmlw, DvObject dvObject) throws XML * - the list of authors * @throws XMLStreamException */ - public void writeCreators(XMLStreamWriter xmlw, List authorList) throws XMLStreamException { + public void writeCreators(XMLStreamWriter xmlw, List authorList, boolean deaccessioned) throws XMLStreamException { // creators -> creator -> creatorName with nameType attribute, givenName, // familyName, nameIdentifier // write all creators xmlw.writeStartElement("creators"); // - if (authorList != null && !authorList.isEmpty()) { + if (!deaccessioned && authorList != null && !authorList.isEmpty()) { for (DatasetAuthor author : authorList) { String creatorName = StringEscapeUtils.escapeXml10(author.getName().getDisplayValue()); String affiliation = null; @@ -267,18 +284,21 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList) xmlw.writeEndElement(); // } - private void writePublisher(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + private void writePublisher(XMLStreamWriter xmlw, DvObject dvObject, boolean deaccessioned) throws XMLStreamException { // publisher should already be non null - :unav if it wasn't available + if(deaccessioned) { + doiMetadata.setPublisher(AbstractPidProvider.UNAVAILABLE); + } XmlWriterUtil.writeFullElement(xmlw, "publisher", doiMetadata.getPublisher()); } - private void writePublicationYear(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + private void writePublicationYear(XMLStreamWriter xmlw, DvObject dvObject, boolean deaccessioned) throws XMLStreamException { // Can't use "UNKNOWN" here because DataCite will respond with "[facet // 'pattern'] the value 'unknown' is not accepted by the pattern '[\d]{4}'" String pubYear = "9999"; // FIXME: Investigate why this.publisherYear is sometimes null now that pull // request #4606 has been merged. - if (doiMetadata.getPublisherYear() != null) { + if (! deaccessioned && (doiMetadata.getPublisherYear() != null)) { // Added to prevent a NullPointerException when trying to destroy datasets when // using DataCite rather than EZID. pubYear = doiMetadata.getPublisherYear(); @@ -926,6 +946,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th attributes.clear(); attributes.put("relationType", "IsPartOf"); + attributes.put("relatedIdentifierType", pubIdType); relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, pid.asRawIdentifier()); } @@ -1082,20 +1103,24 @@ private void writeAccessRights(XMLStreamWriter xmlw, DvObject dvObject) throws X xmlw.writeEndElement(); // } - private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { + private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject, boolean deaccessioned) throws XMLStreamException { // descriptions -> description with descriptionType attribute boolean descriptionsWritten = false; List descriptions = null; DatasetVersion dv = null; - - if (dvObject instanceof Dataset d) { - dv = d.getLatestVersionForCopy(); - descriptions = dv.getDescriptions(); - } else if (dvObject instanceof DataFile df) { - String description = df.getDescription(); - if (description != null) { - descriptions = new ArrayList(); - descriptions.add(description); + if(deaccessioned) { + descriptions = new ArrayList(); + descriptions.add(AbstractDOIProvider.UNAVAILABLE); + } else { + if (dvObject instanceof Dataset d) { + dv = d.getLatestVersionForCopy(); + descriptions = dv.getDescriptions(); + } else if (dvObject instanceof DataFile df) { + String description = df.getDescription(); + if (description != null) { + descriptions = new ArrayList(); + descriptions.add(description); + } } } Map attributes = new HashMap(); From 1faf0cd84c5ef52a8e88afb7989e238058870916 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 10:26:30 -0400 Subject: [PATCH 107/366] missed assignment for title --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 96ee84fe13b..b2008e14a89 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -157,7 +157,7 @@ private void writeTitles(XMLStreamWriter xmlw, DvObject dvObject, String languag List altTitles = new ArrayList<>(); if (!deaccessioned) { - doiMetadata.getTitle(); + title = doiMetadata.getTitle(); // Only Datasets can have a subtitle or alternative titles if (dvObject instanceof Dataset d) { From 23dd581c98b921908b2cdcca13d32e8731c76e7e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 10:54:06 -0400 Subject: [PATCH 108/366] fix creator for deaccessioned --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index b2008e14a89..8f962204302 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -249,8 +249,10 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList, // familyName, nameIdentifier // write all creators xmlw.writeStartElement("creators"); // - - if (!deaccessioned && authorList != null && !authorList.isEmpty()) { + if(deaccessioned) { + authorList = null; + } + if (authorList != null && !authorList.isEmpty()) { for (DatasetAuthor author : authorList) { String creatorName = StringEscapeUtils.escapeXml10(author.getName().getDisplayValue()); String affiliation = null; From 3bbd2e9dfc4cd3d1e5cebd5a9cf7dbbfe52c1fa4 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 11:51:50 -0400 Subject: [PATCH 109/366] correct fix for creators when deaccessioned --- .../pidproviders/doi/XmlMetadataTemplate.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 8f962204302..a3eca9ef9a0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -250,8 +250,10 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList, // write all creators xmlw.writeStartElement("creators"); // if(deaccessioned) { + //skip the loop below authorList = null; } + boolean nothingWritten = true; if (authorList != null && !authorList.isEmpty()) { for (DatasetAuthor author : authorList) { String creatorName = StringEscapeUtils.escapeXml10(author.getName().getDisplayValue()); @@ -274,15 +276,17 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList, if (StringUtils.isNotBlank(creatorName)) { JsonObject creatorObj = PersonOrOrgUtil.getPersonOrOrganization(creatorName, false, StringUtils.containsIgnoreCase(nameIdentifierScheme, "orcid")); + nothingWritten = false; writeEntityElements(xmlw, "creator", null, creatorObj, affiliation, nameIdentifier, nameIdentifierScheme); } - else { - // Authors unavailable - XmlWriterUtil.writeFullElement(xmlw, "creator", "creatorName", AbstractPidProvider.UNAVAILABLE); - } + } } + if (nothingWritten) { + // Authors unavailable + XmlWriterUtil.writeFullElement(xmlw, "creator", "creatorName", AbstractPidProvider.UNAVAILABLE); + } xmlw.writeEndElement(); // } From 4def6da32c207223fb2cf9d5aada50f921ddd474 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 12:00:15 -0400 Subject: [PATCH 110/366] remove bad value and lang --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index a3eca9ef9a0..2d09c67fea9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -285,7 +285,7 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList, } if (nothingWritten) { // Authors unavailable - XmlWriterUtil.writeFullElement(xmlw, "creator", "creatorName", AbstractPidProvider.UNAVAILABLE); + XmlWriterUtil.writeFullElement(xmlw, "creator", AbstractPidProvider.UNAVAILABLE); } xmlw.writeEndElement(); // } From eac477ec3c2fef4f48759b110f6157081b301eff Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 12:46:07 -0400 Subject: [PATCH 111/366] add creatorName sub element for deaccession/no names case --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 2d09c67fea9..a660a80448a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -285,7 +285,9 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList, } if (nothingWritten) { // Authors unavailable - XmlWriterUtil.writeFullElement(xmlw, "creator", AbstractPidProvider.UNAVAILABLE); + xmlw.writeStartElement("creator"); + XmlWriterUtil.writeFullElement(xmlw, "creatorName", AbstractPidProvider.UNAVAILABLE); + xmlw.writeEndElement("creator"); } xmlw.writeEndElement(); // } From 154ac8a91554be29492d62454f1b0e52501b5af2 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 12:49:59 -0400 Subject: [PATCH 112/366] typo --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index a660a80448a..732a633116e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -287,7 +287,7 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList, // Authors unavailable xmlw.writeStartElement("creator"); XmlWriterUtil.writeFullElement(xmlw, "creatorName", AbstractPidProvider.UNAVAILABLE); - xmlw.writeEndElement("creator"); + xmlw.writeEndElement(); } xmlw.writeEndElement(); // } From 9144f6c96ae0685a7ac719d2203f0aed3f71e85e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 13:16:32 -0400 Subject: [PATCH 113/366] fix resourceType - always 1 entry --- .../pidproviders/doi/XmlMetadataTemplate.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 732a633116e..8f6211c0730 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -736,23 +736,24 @@ private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws X for (DatasetField dsf : dv.getDatasetFields()) { switch (dsf.getDatasetFieldType().getName()) { case DatasetFieldConstant.kindOfData: - kindOfDataValues.addAll(dsf.getValues()); + List vals = dsf.getValues(); + for(String val: vals) { + if(StringUtils.isNotBlank(val)) { + kindOfDataValues.add(val); + } + } break; } } - if (kindOfDataValues.isEmpty()) { + if (!kindOfDataValues.isEmpty()) { + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, String.join(", ", kindOfDataValues)); + + } else { // Write an attribute only element if there are no kindOfData values. xmlw.writeStartElement("resourceType"); xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral")); xmlw.writeEndElement(); - } else { - for (String resourceType : kindOfDataValues) { - if (StringUtils.isNotBlank(resourceType)) { - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, resourceType); - } - } } - } } From a5870fbaf3a89e9c6100b8e1f4371caa291c1e23 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 28 May 2024 13:26:41 -0400 Subject: [PATCH 114/366] Also handle file case for resourceType --- .../pidproviders/doi/XmlMetadataTemplate.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 8f6211c0730..7d817d57a2a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -745,16 +745,17 @@ private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws X break; } } - if (!kindOfDataValues.isEmpty()) { - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, String.join(", ", kindOfDataValues)); - - } else { - // Write an attribute only element if there are no kindOfData values. - xmlw.writeStartElement("resourceType"); - xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral")); - xmlw.writeEndElement(); - } } + if (!kindOfDataValues.isEmpty()) { + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, String.join(", ", kindOfDataValues)); + + } else { + // Write an attribute only element if there are no kindOfData values. + xmlw.writeStartElement("resourceType"); + xmlw.writeAttribute("resourceTypeGeneral", attributes.get("resourceTypeGeneral")); + xmlw.writeEndElement(); + } + } /** From 24db2af2bfe9564eedc1ee9aedae8b9048bd551e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 31 May 2024 14:47:06 -0400 Subject: [PATCH 115/366] missed changes --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 7d817d57a2a..f5bd009e8d7 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -23,6 +23,7 @@ import javax.xml.stream.XMLStreamWriter; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.StringEscapeUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; @@ -39,6 +40,7 @@ import edu.harvard.iq.dataverse.DatasetFieldConstant; import edu.harvard.iq.dataverse.DatasetFieldType; import edu.harvard.iq.dataverse.DatasetFieldValue; +import edu.harvard.iq.dataverse.DatasetRelPublication; import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DvObject; import edu.harvard.iq.dataverse.GlobalId; @@ -703,7 +705,7 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea endDate = Util.getDateFormat().format(end); } catch (ParseException e) { logger.warning("Could not parse date: " + endDate); - }; + }; } datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); attributes.put("dateType", "Collected"); @@ -853,7 +855,6 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th Map attributes = new HashMap(); if (dvObject instanceof Dataset dataset) { - List relatedPublications = dataset.getLatestVersionForCopy().getRelatedPublications(); if (!relatedPublications.isEmpty()) { for (DatasetRelPublication relatedPub : relatedPublications) { @@ -967,7 +968,6 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th } } - static HashMap relatedIdentifierTypeMap = new HashMap(); private static String getCanonicalPublicationType(String pubIdType) { From f0fd61ad555369ef1af9a1529797cf8d73d6efde Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 31 May 2024 15:05:02 -0400 Subject: [PATCH 116/366] simplify - util checks for null and empty --- .../dataverse/export/ddi/DdiExportUtil.java | 46 +++++-------------- 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java index c0e3057696a..f5efc448090 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/ddi/DdiExportUtil.java @@ -371,7 +371,7 @@ private static void writeDocDescElement (XMLStreamWriter xmlw, DatasetDTO datase private static void writeVersionStatement(XMLStreamWriter xmlw, DatasetVersionDTO datasetVersionDTO) throws XMLStreamException{ xmlw.writeStartElement("verStmt"); - XmlWriterUtil.writeAttribute(xmlw,"source","archive"); + xmlw.writeAttribute("source","archive"); xmlw.writeStartElement("version"); XmlWriterUtil.writeAttribute(xmlw,"date", datasetVersionDTO.getReleaseTime().substring(0, 10)); XmlWriterUtil.writeAttribute(xmlw,"type", datasetVersionDTO.getVersionState().toString()); @@ -842,9 +842,7 @@ private static void writeAuthorsElement(XMLStreamWriter xmlw, DatasetVersionDTO } if (!authorName.isEmpty()){ xmlw.writeStartElement("AuthEnty"); - if(!authorAffiliation.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"affiliation",authorAffiliation); - } + XmlWriterUtil.writeAttribute(xmlw,"affiliation",authorAffiliation); xmlw.writeCharacters(authorName); xmlw.writeEndElement(); //AuthEnty } @@ -865,9 +863,7 @@ private static void writeAuthorsElement(XMLStreamWriter xmlw, DatasetVersionDTO } if (!contributorName.isEmpty()){ xmlw.writeStartElement("othId"); - if(!contributorType.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"role", contributorType); - } + XmlWriterUtil.writeAttribute(xmlw,"role", contributorType); xmlw.writeCharacters(contributorName); xmlw.writeEndElement(); //othId } @@ -907,12 +903,8 @@ private static void writeContactsElement(XMLStreamWriter xmlw, DatasetVersionDTO // TODO: Since datasetContactEmail is a required field but datasetContactName is not consider not checking if datasetContactName is empty so we can write out datasetContactEmail. if (!datasetContactName.isEmpty()){ xmlw.writeStartElement("contact"); - if(!datasetContactAffiliation.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"affiliation",datasetContactAffiliation); - } - if(!datasetContactEmail.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"email",datasetContactEmail); - } + XmlWriterUtil.writeAttribute(xmlw,"affiliation",datasetContactAffiliation); + XmlWriterUtil.writeAttribute(xmlw,"email",datasetContactEmail); xmlw.writeCharacters(datasetContactName); xmlw.writeEndElement(); //AuthEnty } @@ -957,9 +949,7 @@ private static void writeProducersElement(XMLStreamWriter xmlw, DatasetVersionDT xmlw.writeStartElement("producer"); XmlWriterUtil.writeAttribute(xmlw, "affiliation", producerAffiliation); XmlWriterUtil.writeAttribute(xmlw, "abbr", producerAbbreviation); - /*if (!producerLogo.isEmpty()) { - XmlWriterUtil.writeAttribute(xmlw, "role", producerLogo); - }*/ + //XmlWriterUtil.writeAttribute(xmlw, "role", producerLogo); xmlw.writeCharacters(producerName); xmlw.writeEndElement(); //AuthEnty } @@ -1139,9 +1129,7 @@ private static void writeAbstractElement(XMLStreamWriter xmlw, DatasetVersionDTO } if (!descriptionText.isEmpty()){ xmlw.writeStartElement("abstract"); - if(!descriptionDate.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"date",descriptionDate); - } + XmlWriterUtil.writeAttribute(xmlw,"date",descriptionDate); if(DvObjectContainer.isMetadataLanguageSet(lang)) { xmlw.writeAttribute("xml:lang", lang); } @@ -1176,9 +1164,7 @@ private static void writeGrantElement(XMLStreamWriter xmlw, DatasetVersionDTO da } if (!grantNumber.isEmpty()){ xmlw.writeStartElement("grantNo"); - if(!grantAgency.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"agency",grantAgency); - } + XmlWriterUtil.writeAttribute(xmlw,"agency",grantAgency); xmlw.writeCharacters(grantNumber); xmlw.writeEndElement(); //grantno } @@ -1210,9 +1196,7 @@ private static void writeOtherIdElement(XMLStreamWriter xmlw, DatasetVersionDTO } if (!otherId.isEmpty()){ xmlw.writeStartElement("IDNo"); - if(!otherIdAgency.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"agency",otherIdAgency); - } + XmlWriterUtil.writeAttribute(xmlw,"agency",otherIdAgency); xmlw.writeCharacters(otherId); xmlw.writeEndElement(); //IDNo } @@ -1244,9 +1228,7 @@ private static void writeSoftwareElement(XMLStreamWriter xmlw, DatasetVersionDTO } if (!softwareName.isEmpty()){ xmlw.writeStartElement("software"); - if(!softwareVersion.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"version",softwareVersion); - } + XmlWriterUtil.writeAttribute(xmlw,"version",softwareVersion); xmlw.writeCharacters(softwareName); xmlw.writeEndElement(); //software } @@ -1359,12 +1341,8 @@ private static void writeNotesElement(XMLStreamWriter xmlw, DatasetVersionDTO da } if (!notesText.isEmpty()) { xmlw.writeStartElement("notes"); - if(!notesType.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"type",notesType); - } - if(!notesSubject.isEmpty()){ - XmlWriterUtil.writeAttribute(xmlw,"subject",notesSubject); - } + XmlWriterUtil.writeAttribute(xmlw,"type",notesType); + XmlWriterUtil.writeAttribute(xmlw,"subject",notesSubject); xmlw.writeCharacters(notesText); xmlw.writeEndElement(); } From ead153f502ef77258d20f6faf4a0fc8282a74687 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 10 Jun 2024 12:18:45 -0400 Subject: [PATCH 117/366] typo in DOI parsing logic --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index f5bd009e8d7..e6c1a1ae6b4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -882,7 +882,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th if (pubIdType != null) { switch (pubIdType) { case "DOI": - if (!relatedIdentifier.startsWith("doi:") || !relatedIdentifier.startsWith("http")) { + if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) { relatedIdentifier = "doi:" + relatedIdentifier; } logger.info("Intermediate Related identifier: " + relatedIdentifier); From ea75216025ca358f1c9d7d3c11d324b6dbe4f0f2 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 10 Jun 2024 12:58:46 -0400 Subject: [PATCH 118/366] only files in latestversionforcopy --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index e6c1a1ae6b4..ae7c21b3308 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -43,6 +43,7 @@ import edu.harvard.iq.dataverse.DatasetRelPublication; import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DvObject; +import edu.harvard.iq.dataverse.FileMetadata; import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.TermsOfUseAndAccess; import edu.harvard.iq.dataverse.api.Util; @@ -934,10 +935,12 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th } } } - if (!dataset.getFiles().isEmpty() && !(dataset.getFiles().get(0).getIdentifier() == null)) { + List fmds = dataset.getLatestVersionForCopy().getFileMetadatas(); + if (!(fmds==null) && fmds.isEmpty()) { attributes.clear(); attributes.put("relationType", "HasPart"); - for (DataFile dataFile : dataset.getFiles()) { + for (FileMetadata fmd : fmds) { + DataFile dataFile = fmd.getDataFile(); GlobalId pid = dataFile.getGlobalId(); if (pid != null) { String pubIdType = getCanonicalPublicationType(pid.getProtocol()); From b6bd530db70dfbc78017445e4e2af79233b6e899 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 11 Jun 2024 16:40:58 -0400 Subject: [PATCH 119/366] fix date parsing, clear bad values --- .../dataverse/pidproviders/doi/XmlMetadataTemplate.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index ae7c21b3308..9ba1e4e3116 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -692,22 +692,27 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } } if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { + //Minimal clean-up - useful? Parse/format would remove unused chars, and an exception would clear the date so we don't send nonsense if(StringUtils.isNotBlank(startDate)) { try { - Date start = Util.getDateTimeFormat().parse(startDate); + Date start = Util.getDateFormat().parse(startDate); startDate = Util.getDateFormat().format(start); } catch (ParseException e) { logger.warning("Could not parse date: " + startDate); + startDate = null; } } if(StringUtils.isNotBlank(endDate)) { try { - Date end = Util.getDateTimeFormat().parse(endDate); + Date end = Util.getDateFormat().parse(endDate); endDate = Util.getDateFormat().format(end); } catch (ParseException e) { logger.warning("Could not parse date: " + endDate); + endDate = null; }; } + } + if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); attributes.put("dateType", "Collected"); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, (startDate + "/" + endDate).trim()); From e1383d77d3304418ebf3decfd257ca0610994ce1 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Jun 2024 13:10:04 -0400 Subject: [PATCH 120/366] relationType entry in citation block --- conf/solr/9.3.0/schema.xml | 2 + ...dataset-create-new-all-default-fields.json | 2935 ++++++++--------- scripts/api/data/metadatablocks/citation.tsv | 105 +- .../iq/dataverse/DatasetFieldConstant.java | 1 + .../dublincore/DublinCoreExportUtil.java | 35 +- .../export/openaire/OpenAireExportUtil.java | 9 +- .../java/propertyFiles/citation.properties | 2 + .../export/OpenAireExportUtilTest.java | 2 +- 8 files changed, 1502 insertions(+), 1589 deletions(-) diff --git a/conf/solr/9.3.0/schema.xml b/conf/solr/9.3.0/schema.xml index 5dde750573d..32f10d0a621 100644 --- a/conf/solr/9.3.0/schema.xml +++ b/conf/solr/9.3.0/schema.xml @@ -349,6 +349,7 @@ + @@ -589,6 +590,7 @@ + diff --git a/scripts/api/data/dataset-create-new-all-default-fields.json b/scripts/api/data/dataset-create-new-all-default-fields.json index cc856c6372f..e522ab32b1d 100644 --- a/scripts/api/data/dataset-create-new-all-default-fields.json +++ b/scripts/api/data/dataset-create-new-all-default-fields.json @@ -1,1527 +1,1410 @@ { - "datasetVersion": { - "license": { - "name": "CC0 1.0", - "uri": "http://creativecommons.org/publicdomain/zero/1.0" - }, - "metadataBlocks": { - "citation": { - "displayName": "Citation Metadata", - "fields": [ - { - "typeName": "title", - "multiple": false, - "typeClass": "primitive", - "value": "Replication Data for: Title" - }, - { - "typeName": "subtitle", - "multiple": false, - "typeClass": "primitive", - "value": "Subtitle" - }, - { - "typeName": "alternativeTitle", - "multiple": true, - "typeClass": "primitive", - "value": ["Alternative Title"] - }, - { - "typeName": "alternativeURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://AlternativeURL.org" - }, - { - "typeName": "otherId", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "otherIdAgency": { - "typeName": "otherIdAgency", - "multiple": false, - "typeClass": "primitive", - "value": "OtherIDAgency1" - }, - "otherIdValue": { - "typeName": "otherIdValue", - "multiple": false, - "typeClass": "primitive", - "value": "OtherIDIdentifier1" - } - }, - { - "otherIdAgency": { - "typeName": "otherIdAgency", - "multiple": false, - "typeClass": "primitive", - "value": "OtherIDAgency2" - }, - "otherIdValue": { - "typeName": "otherIdValue", - "multiple": false, - "typeClass": "primitive", - "value": "OtherIDIdentifier2" - } - } - ] - }, - { - "typeName": "author", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "authorName": { - "typeName": "authorName", - "multiple": false, - "typeClass": "primitive", - "value": "LastAuthor1, FirstAuthor1" - }, - "authorAffiliation": { - "typeName": "authorAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "AuthorAffiliation1" - }, - "authorIdentifierScheme": { - "typeName": "authorIdentifierScheme", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "ORCID" - }, - "authorIdentifier": { - "typeName": "authorIdentifier", - "multiple": false, - "typeClass": "primitive", - "value": "AuthorIdentifier1" - } - }, - { - "authorName": { - "typeName": "authorName", - "multiple": false, - "typeClass": "primitive", - "value": "LastAuthor2, FirstAuthor2" - }, - "authorAffiliation": { - "typeName": "authorAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "AuthorAffiliation2" - }, - "authorIdentifierScheme": { - "typeName": "authorIdentifierScheme", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "ISNI" - }, - "authorIdentifier": { - "typeName": "authorIdentifier", - "multiple": false, - "typeClass": "primitive", - "value": "AuthorIdentifier2" - } - } - ] - }, - { - "typeName": "datasetContact", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "datasetContactName": { - "typeName": "datasetContactName", - "multiple": false, - "typeClass": "primitive", - "value": "LastContact1, FirstContact1" - }, - "datasetContactAffiliation": { - "typeName": "datasetContactAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "ContactAffiliation1" - }, - "datasetContactEmail": { - "typeName": "datasetContactEmail", - "multiple": false, - "typeClass": "primitive", - "value": "ContactEmail1@mailinator.com" - } - }, - { - "datasetContactName": { - "typeName": "datasetContactName", - "multiple": false, - "typeClass": "primitive", - "value": "LastContact2, FirstContact2" - }, - "datasetContactAffiliation": { - "typeName": "datasetContactAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "ContactAffiliation2" - }, - "datasetContactEmail": { - "typeName": "datasetContactEmail", - "multiple": false, - "typeClass": "primitive", - "value": "ContactEmail2@mailinator.com" - } - } - ] - }, - { - "typeName": "dsDescription", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "dsDescriptionValue": { - "typeName": "dsDescriptionValue", - "multiple": false, - "typeClass": "primitive", - "value": "DescriptionText1" - }, - "dsDescriptionDate": { - "typeName": "dsDescriptionDate", - "multiple": false, - "typeClass": "primitive", - "value": "1000-01-01" - } - }, - { - "dsDescriptionValue": { - "typeName": "dsDescriptionValue", - "multiple": false, - "typeClass": "primitive", - "value": "DescriptionText2" - }, - "dsDescriptionDate": { - "typeName": "dsDescriptionDate", - "multiple": false, - "typeClass": "primitive", - "value": "1000-02-02" - } - } - ] - }, - { - "typeName": "subject", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "Agricultural Sciences", - "Business and Management", - "Engineering", - "Law" - ] - }, - { - "typeName": "keyword", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "keywordValue": { - "typeName": "keywordValue", - "multiple": false, - "typeClass": "primitive", - "value": "KeywordTerm1" - }, - "keywordTermURI": { - "typeName": "keywordTermURI", - "multiple": false, - "typeClass": "primitive", - "value": "http://keywordTermURI1.org" - }, - "keywordVocabulary": { - "typeName": "keywordVocabulary", - "multiple": false, - "typeClass": "primitive", - "value": "KeywordVocabulary1" - }, - "keywordVocabularyURI": { - "typeName": "keywordVocabularyURI", - "multiple": false, - "typeClass": "primitive", - "value": "http://KeywordVocabularyURL1.org" - } - }, - { - "keywordValue": { - "typeName": "keywordValue", - "multiple": false, - "typeClass": "primitive", - "value": "KeywordTerm2" - }, - "keywordTermURI": { - "typeName": "keywordTermURI", - "multiple": false, - "typeClass": "primitive", - "value": "http://keywordTermURI2.org" - }, - "keywordVocabulary": { - "typeName": "keywordVocabulary", - "multiple": false, - "typeClass": "primitive", - "value": "KeywordVocabulary2" - }, - "keywordVocabularyURI": { - "typeName": "keywordVocabularyURI", - "multiple": false, - "typeClass": "primitive", - "value": "http://KeywordVocabularyURL2.org" - } - } - ] - }, - { - "typeName": "topicClassification", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "topicClassValue": { - "typeName": "topicClassValue", - "multiple": false, - "typeClass": "primitive", - "value": "Topic Classification Term1" - }, - "topicClassVocab": { - "typeName": "topicClassVocab", - "multiple": false, - "typeClass": "primitive", - "value": "Topic Classification Vocab1" - }, - "topicClassVocabURI": { - "typeName": "topicClassVocabURI", - "multiple": false, - "typeClass": "primitive", - "value": "https://TopicClassificationURL1.com" - } - }, - { - "topicClassValue": { - "typeName": "topicClassValue", - "multiple": false, - "typeClass": "primitive", - "value": "Topic Classification Term2" - }, - "topicClassVocab": { - "typeName": "topicClassVocab", - "multiple": false, - "typeClass": "primitive", - "value": "Topic Classification Vocab2" - }, - "topicClassVocabURI": { - "typeName": "topicClassVocabURI", - "multiple": false, - "typeClass": "primitive", - "value": "https://TopicClassificationURL2.com" - } - } - ] - }, - { - "typeName": "publication", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "publicationCitation": { - "typeName": "publicationCitation", - "multiple": false, - "typeClass": "primitive", - "value": "RelatedPublicationCitation1" - }, - "publicationIDType": { - "typeName": "publicationIDType", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "ark" - }, - "publicationIDNumber": { - "typeName": "publicationIDNumber", - "multiple": false, - "typeClass": "primitive", - "value": "RelatedPublicationIDNumber1" - }, - "publicationURL": { - "typeName": "publicationURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://RelatedPublicationURL1.org" - } - }, - { - "publicationCitation": { - "typeName": "publicationCitation", - "multiple": false, - "typeClass": "primitive", - "value": "RelatedPublicationCitation2" - }, - "publicationIDType": { - "typeName": "publicationIDType", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "arXiv" - }, - "publicationIDNumber": { - "typeName": "publicationIDNumber", - "multiple": false, - "typeClass": "primitive", - "value": "RelatedPublicationIDNumber2" - }, - "publicationURL": { - "typeName": "publicationURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://RelatedPublicationURL2.org" - } - } - ] - }, - { - "typeName": "notesText", - "multiple": false, - "typeClass": "primitive", - "value": "Notes1" - }, - { - "typeName": "language", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "Abkhaz", - "Afar" - ] - }, - { - "typeName": "producer", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "producerName": { - "typeName": "producerName", - "multiple": false, - "typeClass": "primitive", - "value": "LastProducer1, FirstProducer1" - }, - "producerAffiliation": { - "typeName": "producerAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "ProducerAffiliation1" - }, - "producerAbbreviation": { - "typeName": "producerAbbreviation", - "multiple": false, - "typeClass": "primitive", - "value": "ProducerAbbreviation1" - }, - "producerURL": { - "typeName": "producerURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://ProducerURL1.org" - }, - "producerLogoURL": { - "typeName": "producerLogoURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://ProducerLogoURL1.org" - } - }, - { - "producerName": { - "typeName": "producerName", - "multiple": false, - "typeClass": "primitive", - "value": "LastProducer2, FirstProducer2" - }, - "producerAffiliation": { - "typeName": "producerAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "ProducerAffiliation2" - }, - "producerAbbreviation": { - "typeName": "producerAbbreviation", - "multiple": false, - "typeClass": "primitive", - "value": "ProducerAbbreviation2" - }, - "producerURL": { - "typeName": "producerURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://ProducerURL2.org" - }, - "producerLogoURL": { - "typeName": "producerLogoURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://ProducerLogoURL2.org" - } - } - ] - }, - { - "typeName": "productionDate", - "multiple": false, - "typeClass": "primitive", - "value": "1003-01-01" - }, - { - "typeName": "productionPlace", - "multiple": true, - "typeClass": "primitive", - "value": ["ProductionPlace"] - }, - { - "typeName": "contributor", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "contributorType": { - "typeName": "contributorType", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "Data Collector" - }, - "contributorName": { - "typeName": "contributorName", - "multiple": false, - "typeClass": "primitive", - "value": "LastContributor1, FirstContributor1" - } - }, - { - "contributorType": { - "typeName": "contributorType", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "Data Curator" - }, - "contributorName": { - "typeName": "contributorName", - "multiple": false, - "typeClass": "primitive", - "value": "LastContributor2, FirstContributor2" - } - } - ] - }, - { - "typeName": "grantNumber", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "grantNumberAgency": { - "typeName": "grantNumberAgency", - "multiple": false, - "typeClass": "primitive", - "value": "GrantInformationGrantAgency1" - }, - "grantNumberValue": { - "typeName": "grantNumberValue", - "multiple": false, - "typeClass": "primitive", - "value": "GrantInformationGrantNumber1" - } - }, - { - "grantNumberAgency": { - "typeName": "grantNumberAgency", - "multiple": false, - "typeClass": "primitive", - "value": "GrantInformationGrantAgency2" - }, - "grantNumberValue": { - "typeName": "grantNumberValue", - "multiple": false, - "typeClass": "primitive", - "value": "GrantInformationGrantNumber2" - } - } - ] - }, - { - "typeName": "distributor", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "distributorName": { - "typeName": "distributorName", - "multiple": false, - "typeClass": "primitive", - "value": "LastDistributor1, FirstDistributor1" - }, - "distributorAffiliation": { - "typeName": "distributorAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "DistributorAffiliation1" - }, - "distributorAbbreviation": { - "typeName": "distributorAbbreviation", - "multiple": false, - "typeClass": "primitive", - "value": "DistributorAbbreviation1" - }, - "distributorURL": { - "typeName": "distributorURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://DistributorURL1.org" - }, - "distributorLogoURL": { - "typeName": "distributorLogoURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://DistributorLogoURL1.org" - } - }, - { - "distributorName": { - "typeName": "distributorName", - "multiple": false, - "typeClass": "primitive", - "value": "LastDistributor2, FirstDistributor2" - }, - "distributorAffiliation": { - "typeName": "distributorAffiliation", - "multiple": false, - "typeClass": "primitive", - "value": "DistributorAffiliation2" - }, - "distributorAbbreviation": { - "typeName": "distributorAbbreviation", - "multiple": false, - "typeClass": "primitive", - "value": "DistributorAbbreviation2" - }, - "distributorURL": { - "typeName": "distributorURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://DistributorURL2.org" - }, - "distributorLogoURL": { - "typeName": "distributorLogoURL", - "multiple": false, - "typeClass": "primitive", - "value": "http://DistributorLogoURL2.org" - } - } - ] - }, - { - "typeName": "distributionDate", - "multiple": false, - "typeClass": "primitive", - "value": "1004-01-01" - }, - { - "typeName": "depositor", - "multiple": false, - "typeClass": "primitive", - "value": "LastDepositor, FirstDepositor" - }, - { - "typeName": "dateOfDeposit", - "multiple": false, - "typeClass": "primitive", - "value": "1002-01-01" - }, - { - "typeName": "timePeriodCovered", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "timePeriodCoveredStart": { - "typeName": "timePeriodCoveredStart", - "multiple": false, - "typeClass": "primitive", - "value": "1005-01-01" - }, - "timePeriodCoveredEnd": { - "typeName": "timePeriodCoveredEnd", - "multiple": false, - "typeClass": "primitive", - "value": "1005-01-02" - } - }, - { - "timePeriodCoveredStart": { - "typeName": "timePeriodCoveredStart", - "multiple": false, - "typeClass": "primitive", - "value": "1005-02-01" - }, - "timePeriodCoveredEnd": { - "typeName": "timePeriodCoveredEnd", - "multiple": false, - "typeClass": "primitive", - "value": "1005-02-02" - } - } - ] - }, - { - "typeName": "dateOfCollection", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "dateOfCollectionStart": { - "typeName": "dateOfCollectionStart", - "multiple": false, - "typeClass": "primitive", - "value": "1006-01-01" - }, - "dateOfCollectionEnd": { - "typeName": "dateOfCollectionEnd", - "multiple": false, - "typeClass": "primitive", - "value": "1006-01-01" - } - }, - { - "dateOfCollectionStart": { - "typeName": "dateOfCollectionStart", - "multiple": false, - "typeClass": "primitive", - "value": "1006-02-01" - }, - "dateOfCollectionEnd": { - "typeName": "dateOfCollectionEnd", - "multiple": false, - "typeClass": "primitive", - "value": "1006-02-02" - } - } - ] - }, - { - "typeName": "kindOfData", - "multiple": true, - "typeClass": "primitive", - "value": [ - "KindOfData1", - "KindOfData2" - ] - }, - { - "typeName": "series", - "multiple": true, - "typeClass": "compound", - "value": [{ - "seriesName": { - "typeName": "seriesName", - "multiple": false, - "typeClass": "primitive", - "value": "SeriesName" - }, - "seriesInformation": { - "typeName": "seriesInformation", - "multiple": false, - "typeClass": "primitive", - "value": "SeriesInformation" - } - }] - }, - { - "typeName": "software", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "softwareName": { - "typeName": "softwareName", - "multiple": false, - "typeClass": "primitive", - "value": "SoftwareName1" - }, - "softwareVersion": { - "typeName": "softwareVersion", - "multiple": false, - "typeClass": "primitive", - "value": "SoftwareVersion1" - } - }, - { - "softwareName": { - "typeName": "softwareName", - "multiple": false, - "typeClass": "primitive", - "value": "SoftwareName2" - }, - "softwareVersion": { - "typeName": "softwareVersion", - "multiple": false, - "typeClass": "primitive", - "value": "SoftwareVersion2" - } - } - ] - }, - { - "typeName": "relatedMaterial", - "multiple": true, - "typeClass": "primitive", - "value": [ - "RelatedMaterial1", - "RelatedMaterial2" - ] - }, - { - "typeName": "relatedDatasets", - "multiple": true, - "typeClass": "primitive", - "value": [ - "RelatedDatasets1", - "RelatedDatasets2" - ] - }, - { - "typeName": "otherReferences", - "multiple": true, - "typeClass": "primitive", - "value": [ - "OtherReferences1", - "OtherReferences2" - ] - }, - { - "typeName": "dataSources", - "multiple": true, - "typeClass": "primitive", - "value": [ - "DataSources1", - "DataSources2" - ] - }, - { - "typeName": "originOfSources", - "multiple": false, - "typeClass": "primitive", - "value": "OriginOfSources" - }, - { - "typeName": "characteristicOfSources", - "multiple": false, - "typeClass": "primitive", - "value": "CharacteristicOfSourcesNoted" - }, - { - "typeName": "accessToSources", - "multiple": false, - "typeClass": "primitive", - "value": "DocumentationAndAccessToSources" - } - ] - }, - "geospatial": { - "displayName": "Geospatial Metadata", - "fields": [ - { - "typeName": "geographicCoverage", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "country": { - "typeName": "country", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "Afghanistan" - }, - "state": { - "typeName": "state", - "multiple": false, - "typeClass": "primitive", - "value": "GeographicCoverageStateProvince1" - }, - "city": { - "typeName": "city", - "multiple": false, - "typeClass": "primitive", - "value": "GeographicCoverageCity1" - }, - "otherGeographicCoverage": { - "typeName": "otherGeographicCoverage", - "multiple": false, - "typeClass": "primitive", - "value": "GeographicCoverageOther1" - } - }, - { - "country": { - "typeName": "country", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "Albania" - }, - "state": { - "typeName": "state", - "multiple": false, - "typeClass": "primitive", - "value": "GeographicCoverageStateProvince2" - }, - "city": { - "typeName": "city", - "multiple": false, - "typeClass": "primitive", - "value": "GeographicCoverageCity2" - }, - "otherGeographicCoverage": { - "typeName": "otherGeographicCoverage", - "multiple": false, - "typeClass": "primitive", - "value": "GeographicCoverageOther2" - } - } - ] - }, - { - "typeName": "geographicUnit", - "multiple": true, - "typeClass": "primitive", - "value": [ - "GeographicUnit1", - "GeographicUnit2" - ] - }, - { - "typeName": "geographicBoundingBox", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "westLongitude": { - "typeName": "westLongitude", - "multiple": false, - "typeClass": "primitive", - "value": "-72" - }, - "eastLongitude": { - "typeName": "eastLongitude", - "multiple": false, - "typeClass": "primitive", - "value": "-70" - }, - "northLatitude": { - "typeName": "northLatitude", - "multiple": false, - "typeClass": "primitive", - "value": "43" - }, - "southLatitude": { - "typeName": "southLatitude", - "multiple": false, - "typeClass": "primitive", - "value": "42" - } - }, - { - "westLongitude": { - "typeName": "westLongitude", - "multiple": false, - "typeClass": "primitive", - "value": "-18" - }, - "eastLongitude": { - "typeName": "eastLongitude", - "multiple": false, - "typeClass": "primitive", - "value": "-13" - }, - "northLatitude": { - "typeName": "northLatitude", - "multiple": false, - "typeClass": "primitive", - "value": "29" - }, - "southLatitude": { - "typeName": "southLatitude", - "multiple": false, - "typeClass": "primitive", - "value": "28" - } - } - ] - } - ] - }, - "socialscience": { - "displayName": "Social Science and Humanities Metadata", - "fields": [ - { - "typeName": "unitOfAnalysis", - "multiple": true, - "typeClass": "primitive", - "value": [ - "UnitOfAnalysis1", - "UnitOfAnalysis2" - ] - }, - { - "typeName": "universe", - "multiple": true, - "typeClass": "primitive", - "value": [ - "Universe1", - "Universe2" - ] - }, - { - "typeName": "timeMethod", - "multiple": false, - "typeClass": "primitive", - "value": "TimeMethod" - }, - { - "typeName": "dataCollector", - "multiple": false, - "typeClass": "primitive", - "value": "LastDataCollector1, FirstDataCollector1" - }, - { - "typeName": "collectorTraining", - "multiple": false, - "typeClass": "primitive", - "value": "CollectorTraining" - }, - { - "typeName": "frequencyOfDataCollection", - "multiple": false, - "typeClass": "primitive", - "value": "Frequency" - }, - { - "typeName": "samplingProcedure", - "multiple": false, - "typeClass": "primitive", - "value": "SamplingProcedure" - }, - { - "typeName": "targetSampleSize", - "multiple": false, - "typeClass": "compound", - "value": { - "targetSampleActualSize": { - "typeName": "targetSampleActualSize", - "multiple": false, - "typeClass": "primitive", - "value": "100" - }, - "targetSampleSizeFormula": { - "typeName": "targetSampleSizeFormula", - "multiple": false, - "typeClass": "primitive", - "value": "TargetSampleSizeFormula" - } - } - }, - { - "typeName": "deviationsFromSampleDesign", - "multiple": false, - "typeClass": "primitive", - "value": "MajorDeviationsForSampleDesign" - }, - { - "typeName": "collectionMode", - "multiple": true, - "typeClass": "primitive", - "value": ["CollectionMode"] - }, - { - "typeName": "researchInstrument", - "multiple": false, - "typeClass": "primitive", - "value": "TypeOfResearchInstrument" - }, - { - "typeName": "dataCollectionSituation", - "multiple": false, - "typeClass": "primitive", - "value": "CharacteristicsOfDataCollectionSituation" - }, - { - "typeName": "actionsToMinimizeLoss", - "multiple": false, - "typeClass": "primitive", - "value": "ActionsToMinimizeLosses" - }, - { - "typeName": "controlOperations", - "multiple": false, - "typeClass": "primitive", - "value": "ControlOperations" - }, - { - "typeName": "weighting", - "multiple": false, - "typeClass": "primitive", - "value": "Weighting" - }, - { - "typeName": "cleaningOperations", - "multiple": false, - "typeClass": "primitive", - "value": "CleaningOperations" - }, - { - "typeName": "datasetLevelErrorNotes", - "multiple": false, - "typeClass": "primitive", - "value": "StudyLevelErrorNotes" - }, - { - "typeName": "responseRate", - "multiple": false, - "typeClass": "primitive", - "value": "ResponseRate" - }, - { - "typeName": "samplingErrorEstimates", - "multiple": false, - "typeClass": "primitive", - "value": "EstimatesOfSamplingError" - }, - { - "typeName": "otherDataAppraisal", - "multiple": false, - "typeClass": "primitive", - "value": "OtherFormsOfDataAppraisal" - }, - { - "typeName": "socialScienceNotes", - "multiple": false, - "typeClass": "compound", - "value": { - "socialScienceNotesType": { - "typeName": "socialScienceNotesType", - "multiple": false, - "typeClass": "primitive", - "value": "NotesType" - }, - "socialScienceNotesSubject": { - "typeName": "socialScienceNotesSubject", - "multiple": false, - "typeClass": "primitive", - "value": "NotesSubject" - }, - "socialScienceNotesText": { - "typeName": "socialScienceNotesText", - "multiple": false, - "typeClass": "primitive", - "value": "NotesText" - } - } - } - ] - }, - "astrophysics": { - "displayName": "Astronomy and Astrophysics Metadata", - "fields": [ - { - "typeName": "astroType", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "Image", - "Mosaic", - "EventList", - "Cube" - ] - }, - { - "typeName": "astroFacility", - "multiple": true, - "typeClass": "primitive", - "value": [ - "Facility1", - "Facility2" - ] - }, - { - "typeName": "astroInstrument", - "multiple": true, - "typeClass": "primitive", - "value": [ - "Instrument1", - "Instrument2" - ] - }, - { - "typeName": "astroObject", - "multiple": true, - "typeClass": "primitive", - "value": [ - "Object1", - "Object2" - ] - }, - { - "typeName": "resolution.Spatial", - "multiple": false, - "typeClass": "primitive", - "value": "SpatialResolution" - }, - { - "typeName": "resolution.Spectral", - "multiple": false, - "typeClass": "primitive", - "value": "SpectralResolution" - }, - { - "typeName": "resolution.Temporal", - "multiple": false, - "typeClass": "primitive", - "value": "TimeResolution" - }, - { - "typeName": "coverage.Spectral.Bandpass", - "multiple": true, - "typeClass": "primitive", - "value": [ - "Bandpass1", - "Bandpass2" - ] - }, - { - "typeName": "coverage.Spectral.CentralWavelength", - "multiple": true, - "typeClass": "primitive", - "value": [ - "3001", - "3002" - ] - }, - { - "typeName": "coverage.Spectral.Wavelength", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "coverage.Spectral.MinimumWavelength": { - "typeName": "coverage.Spectral.MinimumWavelength", - "multiple": false, - "typeClass": "primitive", - "value": "4001" - }, - "coverage.Spectral.MaximumWavelength": { - "typeName": "coverage.Spectral.MaximumWavelength", - "multiple": false, - "typeClass": "primitive", - "value": "4002" - } - }, - { - "coverage.Spectral.MinimumWavelength": { - "typeName": "coverage.Spectral.MinimumWavelength", - "multiple": false, - "typeClass": "primitive", - "value": "4003" - }, - "coverage.Spectral.MaximumWavelength": { - "typeName": "coverage.Spectral.MaximumWavelength", - "multiple": false, - "typeClass": "primitive", - "value": "4004" - } - } - ] - }, - { - "typeName": "coverage.Temporal", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "coverage.Temporal.StartTime": { - "typeName": "coverage.Temporal.StartTime", - "multiple": false, - "typeClass": "primitive", - "value": "1007-01-01" - }, - "coverage.Temporal.StopTime": { - "typeName": "coverage.Temporal.StopTime", - "multiple": false, - "typeClass": "primitive", - "value": "1007-01-02" - } - }, - { - "coverage.Temporal.StartTime": { - "typeName": "coverage.Temporal.StartTime", - "multiple": false, - "typeClass": "primitive", - "value": "1007-02-01" - }, - "coverage.Temporal.StopTime": { - "typeName": "coverage.Temporal.StopTime", - "multiple": false, - "typeClass": "primitive", - "value": "1007-02-02" - } - } - ] - }, - { - "typeName": "coverage.Spatial", - "multiple": true, - "typeClass": "primitive", - "value": [ - "SkyCoverage1", - "SkyCoverage2" - ] - }, - { - "typeName": "coverage.Depth", - "multiple": false, - "typeClass": "primitive", - "value": "200" - }, - { - "typeName": "coverage.ObjectDensity", - "multiple": false, - "typeClass": "primitive", - "value": "300" - }, - { - "typeName": "coverage.ObjectCount", - "multiple": false, - "typeClass": "primitive", - "value": "400" - }, - { - "typeName": "coverage.SkyFraction", - "multiple": false, - "typeClass": "primitive", - "value": "500" - }, - { - "typeName": "coverage.Polarization", - "multiple": false, - "typeClass": "primitive", - "value": "Polarization" - }, - { - "typeName": "redshiftType", - "multiple": false, - "typeClass": "primitive", - "value": "RedshiftType" - }, - { - "typeName": "resolution.Redshift", - "multiple": false, - "typeClass": "primitive", - "value": "600" - }, - { - "typeName": "coverage.RedshiftValue", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "coverage.Redshift.MinimumValue": { - "typeName": "coverage.Redshift.MinimumValue", - "multiple": false, - "typeClass": "primitive", - "value": "701" - }, - "coverage.Redshift.MaximumValue": { - "typeName": "coverage.Redshift.MaximumValue", - "multiple": false, - "typeClass": "primitive", - "value": "702" - } - }, - { - "coverage.Redshift.MinimumValue": { - "typeName": "coverage.Redshift.MinimumValue", - "multiple": false, - "typeClass": "primitive", - "value": "703" - }, - "coverage.Redshift.MaximumValue": { - "typeName": "coverage.Redshift.MaximumValue", - "multiple": false, - "typeClass": "primitive", - "value": "704" - } - } - ] - } - ] - }, - "biomedical": { - "displayName": "Life Sciences Metadata", - "fields": [ - { - "typeName": "studyDesignType", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "Case Control", - "Cross Sectional", - "Cohort Study", - "Not Specified" - ] - }, - { - "typeName": "studyFactorType", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "Age", - "Biomarkers", - "Cell Surface Markers", - "Developmental Stage" - ] - }, - { - "typeName": "studyAssayOrganism", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "Arabidopsis thaliana", - "Bos taurus", - "Caenorhabditis elegans", - "Danio rerio (zebrafish)" - ] - }, - { - "typeName": "studyAssayOtherOrganism", - "multiple": true, - "typeClass": "primitive", - "value": [ - "OtherOrganism1", - "OtherOrganism2" - ] - }, - { - "typeName": "studyAssayMeasurementType", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "genome sequencing", - "cell sorting", - "clinical chemistry analysis", - "DNA methylation profiling" - ] - }, - { - "typeName": "studyAssayOtherMeasurmentType", - "multiple": true, - "typeClass": "primitive", - "value": [ - "OtherMeasurementType1", - "OtherMeasurementType2" - ] - }, - { - "typeName": "studyAssayTechnologyType", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "culture based drug susceptibility testing, single concentration", - "culture based drug susceptibility testing, two concentrations", - "culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)", - "flow cytometry" - ] - }, - { - "typeName": "studyAssayPlatform", - "multiple": true, - "typeClass": "controlledVocabulary", - "value": [ - "210-MS GC Ion Trap (Varian)", - "220-MS GC Ion Trap (Varian)", - "225-MS GC Ion Trap (Varian)", - "300-MS quadrupole GC/MS (Varian)" - ] - }, - { - "typeName": "studyAssayCellType", - "multiple": true, - "typeClass": "primitive", - "value": [ - "CellType1", - "CellType2" - ] - } - ] - }, - "journal": { - "displayName": "Journal Metadata", - "fields": [ - { - "typeName": "journalVolumeIssue", - "multiple": true, - "typeClass": "compound", - "value": [ - { - "journalVolume": { - "typeName": "journalVolume", - "multiple": false, - "typeClass": "primitive", - "value": "JournalVolume1" - }, - "journalIssue": { - "typeName": "journalIssue", - "multiple": false, - "typeClass": "primitive", - "value": "JournalIssue1" - }, - "journalPubDate": { - "typeName": "journalPubDate", - "multiple": false, - "typeClass": "primitive", - "value": "1008-01-01" - } - }, - { - "journalVolume": { - "typeName": "journalVolume", - "multiple": false, - "typeClass": "primitive", - "value": "JournalVolume2" - }, - "journalIssue": { - "typeName": "journalIssue", - "multiple": false, - "typeClass": "primitive", - "value": "JournalIssue2" - }, - "journalPubDate": { - "typeName": "journalPubDate", - "multiple": false, - "typeClass": "primitive", - "value": "1008-02-01" - } - } - ] - }, - { - "typeName": "journalArticleType", - "multiple": false, - "typeClass": "controlledVocabulary", - "value": "abstract" - } - ] - } - } - } -} + "datasetVersion" : { + "license" : { + "name" : "CC0 1.0", + "uri" : "http://creativecommons.org/publicdomain/zero/1.0" + }, + "metadataBlocks" : { + "citation" : { + "displayName" : "Citation Metadata", + "fields" : [{ + "typeName" : "title", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Replication Data for: Title" + }, { + "typeName" : "subtitle", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Subtitle" + }, { + "typeName" : "alternativeTitle", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Alternative Title" + ] + }, { + "typeName" : "alternativeURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://AlternativeURL.org" + }, { + "typeName" : "otherId", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "otherIdAgency" : { + "typeName" : "otherIdAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDAgency1" + }, + "otherIdValue" : { + "typeName" : "otherIdValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDIdentifier1" + } + }, { + "otherIdAgency" : { + "typeName" : "otherIdAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDAgency2" + }, + "otherIdValue" : { + "typeName" : "otherIdValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDIdentifier2" + } + } + ] + }, { + "typeName" : "author", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "authorName" : { + "typeName" : "authorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastAuthor1, FirstAuthor1" + }, + "authorAffiliation" : { + "typeName" : "authorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorAffiliation1" + }, + "authorIdentifierScheme" : { + "typeName" : "authorIdentifierScheme", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "ORCID" + }, + "authorIdentifier" : { + "typeName" : "authorIdentifier", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorIdentifier1" + } + }, { + "authorName" : { + "typeName" : "authorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastAuthor2, FirstAuthor2" + }, + "authorAffiliation" : { + "typeName" : "authorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorAffiliation2" + }, + "authorIdentifierScheme" : { + "typeName" : "authorIdentifierScheme", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "ISNI" + }, + "authorIdentifier" : { + "typeName" : "authorIdentifier", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorIdentifier2" + } + } + ] + }, { + "typeName" : "datasetContact", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "datasetContactName" : { + "typeName" : "datasetContactName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContact1, FirstContact1" + }, + "datasetContactAffiliation" : { + "typeName" : "datasetContactAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactAffiliation1" + }, + "datasetContactEmail" : { + "typeName" : "datasetContactEmail", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactEmail1@mailinator.com" + } + }, { + "datasetContactName" : { + "typeName" : "datasetContactName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContact2, FirstContact2" + }, + "datasetContactAffiliation" : { + "typeName" : "datasetContactAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactAffiliation2" + }, + "datasetContactEmail" : { + "typeName" : "datasetContactEmail", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactEmail2@mailinator.com" + } + } + ] + }, { + "typeName" : "dsDescription", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "dsDescriptionValue" : { + "typeName" : "dsDescriptionValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DescriptionText1" + }, + "dsDescriptionDate" : { + "typeName" : "dsDescriptionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1000-01-01" + } + }, { + "dsDescriptionValue" : { + "typeName" : "dsDescriptionValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DescriptionText2" + }, + "dsDescriptionDate" : { + "typeName" : "dsDescriptionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1000-02-02" + } + } + ] + }, { + "typeName" : "subject", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Agricultural Sciences", + "Business and Management", + "Engineering", + "Law" + ] + }, { + "typeName" : "keyword", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "keywordValue" : { + "typeName" : "keywordValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordTerm1" + }, + "keywordTermURI" : { + "typeName" : "keywordTermURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://keywordTermURI1.org" + }, + "keywordVocabulary" : { + "typeName" : "keywordVocabulary", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordVocabulary1" + }, + "keywordVocabularyURI" : { + "typeName" : "keywordVocabularyURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://KeywordVocabularyURL1.org" + } + }, { + "keywordValue" : { + "typeName" : "keywordValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordTerm2" + }, + "keywordTermURI" : { + "typeName" : "keywordTermURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://keywordTermURI2.org" + }, + "keywordVocabulary" : { + "typeName" : "keywordVocabulary", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordVocabulary2" + }, + "keywordVocabularyURI" : { + "typeName" : "keywordVocabularyURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://KeywordVocabularyURL2.org" + } + } + ] + }, { + "typeName" : "topicClassification", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "topicClassValue" : { + "typeName" : "topicClassValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Term1" + }, + "topicClassVocab" : { + "typeName" : "topicClassVocab", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Vocab1" + }, + "topicClassVocabURI" : { + "typeName" : "topicClassVocabURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "https://TopicClassificationURL1.com" + } + }, { + "topicClassValue" : { + "typeName" : "topicClassValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Term2" + }, + "topicClassVocab" : { + "typeName" : "topicClassVocab", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Vocab2" + }, + "topicClassVocabURI" : { + "typeName" : "topicClassVocabURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "https://TopicClassificationURL2.com" + } + } + ] + }, { + "typeName" : "publication", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "publicationRelationType" : { + "typeName" : "publicationRelationType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "IsSupplementTo" + }, + "publicationCitation" : { + "typeName" : "publicationCitation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationCitation1" + }, + "publicationIDType" : { + "typeName" : "publicationIDType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "ark" + }, + "publicationIDNumber" : { + "typeName" : "publicationIDNumber", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationIDNumber1" + }, + "publicationURL" : { + "typeName" : "publicationURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://RelatedPublicationURL1.org" + } + }, { + "publicationCitation" : { + "typeName" : "publicationCitation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationCitation2" + }, + "publicationIDType" : { + "typeName" : "publicationIDType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "arXiv" + }, + "publicationIDNumber" : { + "typeName" : "publicationIDNumber", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationIDNumber2" + }, + "publicationURL" : { + "typeName" : "publicationURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://RelatedPublicationURL2.org" + } + } + ] + }, { + "typeName" : "notesText", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Notes1" + }, { + "typeName" : "language", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Abkhaz", + "Afar" + ] + }, { + "typeName" : "producer", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "producerName" : { + "typeName" : "producerName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastProducer1, FirstProducer1" + }, + "producerAffiliation" : { + "typeName" : "producerAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAffiliation1" + }, + "producerAbbreviation" : { + "typeName" : "producerAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAbbreviation1" + }, + "producerURL" : { + "typeName" : "producerURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerURL1.org" + }, + "producerLogoURL" : { + "typeName" : "producerLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerLogoURL1.org" + } + }, { + "producerName" : { + "typeName" : "producerName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastProducer2, FirstProducer2" + }, + "producerAffiliation" : { + "typeName" : "producerAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAffiliation2" + }, + "producerAbbreviation" : { + "typeName" : "producerAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAbbreviation2" + }, + "producerURL" : { + "typeName" : "producerURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerURL2.org" + }, + "producerLogoURL" : { + "typeName" : "producerLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerLogoURL2.org" + } + } + ] + }, { + "typeName" : "productionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1003-01-01" + }, { + "typeName" : "productionPlace", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "ProductionPlace" + ] + }, { + "typeName" : "contributor", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "contributorType" : { + "typeName" : "contributorType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Data Collector" + }, + "contributorName" : { + "typeName" : "contributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContributor1, FirstContributor1" + } + }, { + "contributorType" : { + "typeName" : "contributorType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Data Curator" + }, + "contributorName" : { + "typeName" : "contributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContributor2, FirstContributor2" + } + } + ] + }, { + "typeName" : "grantNumber", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "grantNumberAgency" : { + "typeName" : "grantNumberAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantAgency1" + }, + "grantNumberValue" : { + "typeName" : "grantNumberValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantNumber1" + } + }, { + "grantNumberAgency" : { + "typeName" : "grantNumberAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantAgency2" + }, + "grantNumberValue" : { + "typeName" : "grantNumberValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantNumber2" + } + } + ] + }, { + "typeName" : "distributor", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "distributorName" : { + "typeName" : "distributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDistributor1, FirstDistributor1" + }, + "distributorAffiliation" : { + "typeName" : "distributorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAffiliation1" + }, + "distributorAbbreviation" : { + "typeName" : "distributorAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAbbreviation1" + }, + "distributorURL" : { + "typeName" : "distributorURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorURL1.org" + }, + "distributorLogoURL" : { + "typeName" : "distributorLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorLogoURL1.org" + } + }, { + "distributorName" : { + "typeName" : "distributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDistributor2, FirstDistributor2" + }, + "distributorAffiliation" : { + "typeName" : "distributorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAffiliation2" + }, + "distributorAbbreviation" : { + "typeName" : "distributorAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAbbreviation2" + }, + "distributorURL" : { + "typeName" : "distributorURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorURL2.org" + }, + "distributorLogoURL" : { + "typeName" : "distributorLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorLogoURL2.org" + } + } + ] + }, { + "typeName" : "distributionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1004-01-01" + }, { + "typeName" : "depositor", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDepositor, FirstDepositor" + }, { + "typeName" : "dateOfDeposit", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1002-01-01" + }, { + "typeName" : "timePeriodCovered", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "timePeriodCoveredStart" : { + "typeName" : "timePeriodCoveredStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-01-01" + }, + "timePeriodCoveredEnd" : { + "typeName" : "timePeriodCoveredEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-01-02" + } + }, { + "timePeriodCoveredStart" : { + "typeName" : "timePeriodCoveredStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-02-01" + }, + "timePeriodCoveredEnd" : { + "typeName" : "timePeriodCoveredEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-02-02" + } + } + ] + }, { + "typeName" : "dateOfCollection", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "dateOfCollectionStart" : { + "typeName" : "dateOfCollectionStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-01-01" + }, + "dateOfCollectionEnd" : { + "typeName" : "dateOfCollectionEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-01-01" + } + }, { + "dateOfCollectionStart" : { + "typeName" : "dateOfCollectionStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-02-01" + }, + "dateOfCollectionEnd" : { + "typeName" : "dateOfCollectionEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-02-02" + } + } + ] + }, { + "typeName" : "kindOfData", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "KindOfData1", + "KindOfData2" + ] + }, { + "typeName" : "series", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "seriesName" : { + "typeName" : "seriesName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SeriesName" + }, + "seriesInformation" : { + "typeName" : "seriesInformation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SeriesInformation" + } + } + ] + }, { + "typeName" : "software", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "softwareName" : { + "typeName" : "softwareName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareName1" + }, + "softwareVersion" : { + "typeName" : "softwareVersion", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareVersion1" + } + }, { + "softwareName" : { + "typeName" : "softwareName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareName2" + }, + "softwareVersion" : { + "typeName" : "softwareVersion", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareVersion2" + } + } + ] + }, { + "typeName" : "relatedMaterial", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "RelatedMaterial1", + "RelatedMaterial2" + ] + }, { + "typeName" : "relatedDatasets", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "RelatedDatasets1", + "RelatedDatasets2" + ] + }, { + "typeName" : "otherReferences", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "OtherReferences1", + "OtherReferences2" + ] + }, { + "typeName" : "dataSources", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "DataSources1", + "DataSources2" + ] + }, { + "typeName" : "originOfSources", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OriginOfSources" + }, { + "typeName" : "characteristicOfSources", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CharacteristicOfSourcesNoted" + }, { + "typeName" : "accessToSources", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DocumentationAndAccessToSources" + } + ] + }, + "geospatial" : { + "displayName" : "Geospatial Metadata", + "fields" : [{ + "typeName" : "geographicCoverage", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "country" : { + "typeName" : "country", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Afghanistan" + }, + "state" : { + "typeName" : "state", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageStateProvince1" + }, + "city" : { + "typeName" : "city", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageCity1" + }, + "otherGeographicCoverage" : { + "typeName" : "otherGeographicCoverage", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageOther1" + } + }, { + "country" : { + "typeName" : "country", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Albania" + }, + "state" : { + "typeName" : "state", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageStateProvince2" + }, + "city" : { + "typeName" : "city", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageCity2" + }, + "otherGeographicCoverage" : { + "typeName" : "otherGeographicCoverage", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageOther2" + } + } + ] + }, { + "typeName" : "geographicUnit", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "GeographicUnit1", + "GeographicUnit2" + ] + }, { + "typeName" : "geographicBoundingBox", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "westLongitude" : { + "typeName" : "westLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-72" + }, + "eastLongitude" : { + "typeName" : "eastLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-70" + }, + "northLatitude" : { + "typeName" : "northLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "43" + }, + "southLatitude" : { + "typeName" : "southLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "42" + } + }, { + "westLongitude" : { + "typeName" : "westLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-18" + }, + "eastLongitude" : { + "typeName" : "eastLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-13" + }, + "northLatitude" : { + "typeName" : "northLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "29" + }, + "southLatitude" : { + "typeName" : "southLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "28" + } + } + ] + } + ] + }, + "socialscience" : { + "displayName" : "Social Science and Humanities Metadata", + "fields" : [{ + "typeName" : "unitOfAnalysis", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "UnitOfAnalysis1", + "UnitOfAnalysis2" + ] + }, { + "typeName" : "universe", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Universe1", + "Universe2" + ] + }, { + "typeName" : "timeMethod", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TimeMethod" + }, { + "typeName" : "dataCollector", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDataCollector1, FirstDataCollector1" + }, { + "typeName" : "collectorTraining", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CollectorTraining" + }, { + "typeName" : "frequencyOfDataCollection", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Frequency" + }, { + "typeName" : "samplingProcedure", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SamplingProcedure" + }, { + "typeName" : "targetSampleSize", + "multiple" : false, + "typeClass" : "compound", + "value" : { + "targetSampleActualSize" : { + "typeName" : "targetSampleActualSize", + "multiple" : false, + "typeClass" : "primitive", + "value" : "100" + }, + "targetSampleSizeFormula" : { + "typeName" : "targetSampleSizeFormula", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TargetSampleSizeFormula" + } + } + }, { + "typeName" : "deviationsFromSampleDesign", + "multiple" : false, + "typeClass" : "primitive", + "value" : "MajorDeviationsForSampleDesign" + }, { + "typeName" : "collectionMode", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "CollectionMode" + ] + }, { + "typeName" : "researchInstrument", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TypeOfResearchInstrument" + }, { + "typeName" : "dataCollectionSituation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CharacteristicsOfDataCollectionSituation" + }, { + "typeName" : "actionsToMinimizeLoss", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ActionsToMinimizeLosses" + }, { + "typeName" : "controlOperations", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ControlOperations" + }, { + "typeName" : "weighting", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Weighting" + }, { + "typeName" : "cleaningOperations", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CleaningOperations" + }, { + "typeName" : "datasetLevelErrorNotes", + "multiple" : false, + "typeClass" : "primitive", + "value" : "StudyLevelErrorNotes" + }, { + "typeName" : "responseRate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ResponseRate" + }, { + "typeName" : "samplingErrorEstimates", + "multiple" : false, + "typeClass" : "primitive", + "value" : "EstimatesOfSamplingError" + }, { + "typeName" : "otherDataAppraisal", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherFormsOfDataAppraisal" + }, { + "typeName" : "socialScienceNotes", + "multiple" : false, + "typeClass" : "compound", + "value" : { + "socialScienceNotesType" : { + "typeName" : "socialScienceNotesType", + "multiple" : false, + "typeClass" : "primitive", + "value" : "NotesType" + }, + "socialScienceNotesSubject" : { + "typeName" : "socialScienceNotesSubject", + "multiple" : false, + "typeClass" : "primitive", + "value" : "NotesSubject" + }, + "socialScienceNotesText" : { + "typeName" : "socialScienceNotesText", + "multiple" : false, + "typeClass" : "primitive", + "value" : "NotesText" + } + } + } + ] + }, + "astrophysics" : { + "displayName" : "Astronomy and Astrophysics Metadata", + "fields" : [{ + "typeName" : "astroType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Image", + "Mosaic", + "EventList", + "Cube" + ] + }, { + "typeName" : "astroFacility", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Facility1", + "Facility2" + ] + }, { + "typeName" : "astroInstrument", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Instrument1", + "Instrument2" + ] + }, { + "typeName" : "astroObject", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Object1", + "Object2" + ] + }, { + "typeName" : "resolution.Spatial", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SpatialResolution" + }, { + "typeName" : "resolution.Spectral", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SpectralResolution" + }, { + "typeName" : "resolution.Temporal", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TimeResolution" + }, { + "typeName" : "coverage.Spectral.Bandpass", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Bandpass1", + "Bandpass2" + ] + }, { + "typeName" : "coverage.Spectral.CentralWavelength", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "3001", + "3002" + ] + }, { + "typeName" : "coverage.Spectral.Wavelength", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "coverage.Spectral.MinimumWavelength" : { + "typeName" : "coverage.Spectral.MinimumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4001" + }, + "coverage.Spectral.MaximumWavelength" : { + "typeName" : "coverage.Spectral.MaximumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4002" + } + }, { + "coverage.Spectral.MinimumWavelength" : { + "typeName" : "coverage.Spectral.MinimumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4003" + }, + "coverage.Spectral.MaximumWavelength" : { + "typeName" : "coverage.Spectral.MaximumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4004" + } + } + ] + }, { + "typeName" : "coverage.Temporal", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "coverage.Temporal.StartTime" : { + "typeName" : "coverage.Temporal.StartTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-01-01" + }, + "coverage.Temporal.StopTime" : { + "typeName" : "coverage.Temporal.StopTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-01-02" + } + }, { + "coverage.Temporal.StartTime" : { + "typeName" : "coverage.Temporal.StartTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-02-01" + }, + "coverage.Temporal.StopTime" : { + "typeName" : "coverage.Temporal.StopTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-02-02" + } + } + ] + }, { + "typeName" : "coverage.Spatial", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "SkyCoverage1", + "SkyCoverage2" + ] + }, { + "typeName" : "coverage.Depth", + "multiple" : false, + "typeClass" : "primitive", + "value" : "200" + }, { + "typeName" : "coverage.ObjectDensity", + "multiple" : false, + "typeClass" : "primitive", + "value" : "300" + }, { + "typeName" : "coverage.ObjectCount", + "multiple" : false, + "typeClass" : "primitive", + "value" : "400" + }, { + "typeName" : "coverage.SkyFraction", + "multiple" : false, + "typeClass" : "primitive", + "value" : "500" + }, { + "typeName" : "coverage.Polarization", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Polarization" + }, { + "typeName" : "redshiftType", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RedshiftType" + }, { + "typeName" : "resolution.Redshift", + "multiple" : false, + "typeClass" : "primitive", + "value" : "600" + }, { + "typeName" : "coverage.RedshiftValue", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "coverage.Redshift.MinimumValue" : { + "typeName" : "coverage.Redshift.MinimumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "701" + }, + "coverage.Redshift.MaximumValue" : { + "typeName" : "coverage.Redshift.MaximumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "702" + } + }, { + "coverage.Redshift.MinimumValue" : { + "typeName" : "coverage.Redshift.MinimumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "703" + }, + "coverage.Redshift.MaximumValue" : { + "typeName" : "coverage.Redshift.MaximumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "704" + } + } + ] + } + ] + }, + "biomedical" : { + "displayName" : "Life Sciences Metadata", + "fields" : [{ + "typeName" : "studyDesignType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Case Control", + "Cross Sectional", + "Cohort Study", + "Not Specified" + ] + }, { + "typeName" : "studyFactorType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Age", + "Biomarkers", + "Cell Surface Markers", + "Developmental Stage" + ] + }, { + "typeName" : "studyAssayOrganism", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Arabidopsis thaliana", + "Bos taurus", + "Caenorhabditis elegans", + "Danio rerio (zebrafish)" + ] + }, { + "typeName" : "studyAssayOtherOrganism", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "OtherOrganism1", + "OtherOrganism2" + ] + }, { + "typeName" : "studyAssayMeasurementType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "genome sequencing", + "cell sorting", + "clinical chemistry analysis", + "DNA methylation profiling" + ] + }, { + "typeName" : "studyAssayOtherMeasurmentType", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "OtherMeasurementType1", + "OtherMeasurementType2" + ] + }, { + "typeName" : "studyAssayTechnologyType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "culture based drug susceptibility testing, single concentration", + "culture based drug susceptibility testing, two concentrations", + "culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)", + "flow cytometry" + ] + }, { + "typeName" : "studyAssayPlatform", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "210-MS GC Ion Trap (Varian)", + "220-MS GC Ion Trap (Varian)", + "225-MS GC Ion Trap (Varian)", + "300-MS quadrupole GC/MS (Varian)" + ] + }, { + "typeName" : "studyAssayCellType", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "CellType1", + "CellType2" + ] + } + ] + }, + "journal" : { + "displayName" : "Journal Metadata", + "fields" : [{ + "typeName" : "journalVolumeIssue", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "journalVolume" : { + "typeName" : "journalVolume", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalVolume1" + }, + "journalIssue" : { + "typeName" : "journalIssue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalIssue1" + }, + "journalPubDate" : { + "typeName" : "journalPubDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1008-01-01" + } + }, { + "journalVolume" : { + "typeName" : "journalVolume", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalVolume2" + }, + "journalIssue" : { + "typeName" : "journalIssue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalIssue2" + }, + "journalPubDate" : { + "typeName" : "journalPubDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1008-02-01" + } + } + ] + }, { + "typeName" : "journalArticleType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "abstract" + } + ] + } + } + } +} \ No newline at end of file diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index 18354f2b1f7..db4f1c9f30c 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -31,55 +31,56 @@ topicClassVocab Controlled Vocabulary Name The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH) text 27 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE topicClassification citation topicClassVocabURI Controlled Vocabulary URL The URL where one can access information about the term's controlled vocabulary https:// url 28 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE topicClassification citation publication Related Publication The article or report that uses the data in the Dataset. The full list of related publications will be displayed on the metadata tab none 29 FALSE FALSE TRUE FALSE TRUE FALSE citation http://purl.org/dc/terms/isReferencedBy - publicationCitation Citation The full bibliographic citation for the related publication textbox 30 #VALUE TRUE FALSE FALSE FALSE TRUE FALSE publication citation http://purl.org/dc/terms/bibliographicCitation - publicationIDType Identifier Type The type of identifier that uniquely identifies a related publication text 31 #VALUE: TRUE TRUE FALSE FALSE TRUE FALSE publication citation http://purl.org/spar/datacite/ResourceIdentifierScheme - publicationIDNumber Identifier The identifier for a related publication text 32 #VALUE TRUE FALSE FALSE FALSE TRUE FALSE publication citation http://purl.org/spar/datacite/ResourceIdentifier - publicationURL URL The URL form of the identifier entered in the Identifier field, e.g. the DOI URL if a DOI was entered in the Identifier field. Used to display what was entered in the ID Type and ID Number fields as a link. If what was entered in the Identifier field has no URL form, the URL of the publication webpage is used, e.g. a journal article webpage https:// url 33 #VALUE FALSE FALSE FALSE FALSE TRUE FALSE publication citation https://schema.org/distribution - notesText Notes Additional information about the Dataset textbox 34 FALSE FALSE FALSE FALSE TRUE FALSE citation - language Language A language that the Dataset's files is written in text 35 TRUE TRUE TRUE TRUE FALSE FALSE citation http://purl.org/dc/terms/language - producer Producer The entity, such a person or organization, managing the finances or other administrative processes involved in the creation of the Dataset none 36 FALSE FALSE TRUE FALSE FALSE FALSE citation - producerName Name The name of the entity, e.g. the person's name or the name of an organization 1) FamilyName, GivenName or 2) Organization text 37 #VALUE TRUE FALSE FALSE TRUE FALSE TRUE producer citation - producerAffiliation Affiliation The name of the entity affiliated with the producer, e.g. an organization's name Organization XYZ text 38 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE producer citation - producerAbbreviation Abbreviated Name The producer's abbreviated name (e.g. IQSS, ICPSR) text 39 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE producer citation - producerURL URL The URL of the producer's website https:// url 40 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE producer citation - producerLogoURL Logo URL The URL of the producer's logo https:// url 41
FALSE FALSE FALSE FALSE FALSE FALSE producer citation - productionDate Production Date The date when the data were produced (not distributed, published, or archived) YYYY-MM-DD date 42 TRUE FALSE FALSE TRUE FALSE FALSE citation - productionPlace Production Location The location where the data and any related materials were produced or collected text 43 TRUE FALSE TRUE TRUE FALSE FALSE citation - contributor Contributor The entity, such as a person or organization, responsible for collecting, managing, or otherwise contributing to the development of the Dataset none 44 : FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/contributor - contributorType Type Indicates the type of contribution made to the dataset text 45 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE contributor citation - contributorName Name The name of the contributor, e.g. the person's name or the name of an organization 1) FamilyName, GivenName or 2) Organization text 46 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE contributor citation - grantNumber Funding Information Information about the Dataset's financial support none 47 : FALSE FALSE TRUE FALSE FALSE FALSE citation https://schema.org/sponsor - grantNumberAgency Agency The agency that provided financial support for the Dataset Organization XYZ text 48 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE grantNumber citation - grantNumberValue Identifier The grant identifier or contract identifier of the agency that provided financial support for the Dataset text 49 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE grantNumber citation - distributor Distributor The entity, such as a person or organization, designated to generate copies of the Dataset, including any editions or revisions none 50 FALSE FALSE TRUE FALSE FALSE FALSE citation - distributorName Name The name of the entity, e.g. the person's name or the name of an organization 1) FamilyName, GivenName or 2) Organization text 51 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE distributor citation - distributorAffiliation Affiliation The name of the entity affiliated with the distributor, e.g. an organization's name Organization XYZ text 52 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE distributor citation - distributorAbbreviation Abbreviated Name The distributor's abbreviated name (e.g. IQSS, ICPSR) text 53 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE distributor citation - distributorURL URL The URL of the distributor's webpage https:// url 54 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE distributor citation - distributorLogoURL Logo URL The URL of the distributor's logo image, used to show the image on the Dataset's page https:// url 55
FALSE FALSE FALSE FALSE FALSE FALSE distributor citation - distributionDate Distribution Date The date when the Dataset was made available for distribution/presentation YYYY-MM-DD date 56 TRUE FALSE FALSE TRUE FALSE FALSE citation - depositor Depositor The entity, such as a person or organization, that deposited the Dataset in the repository 1) FamilyName, GivenName or 2) Organization text 57 FALSE FALSE FALSE FALSE FALSE FALSE citation - dateOfDeposit Deposit Date The date when the Dataset was deposited into the repository YYYY-MM-DD date 58 FALSE FALSE FALSE TRUE FALSE FALSE citation http://purl.org/dc/terms/dateSubmitted - timePeriodCovered Time Period The time period that the data refer to. Also known as span. This is the time period covered by the data, not the dates of coding, collecting data, or making documents machine-readable none 59 ; FALSE FALSE TRUE FALSE FALSE FALSE citation https://schema.org/temporalCoverage - timePeriodCoveredStart Start Date The start date of the time period that the data refer to YYYY-MM-DD date 60 #NAME: #VALUE TRUE FALSE FALSE TRUE FALSE FALSE timePeriodCovered citation - timePeriodCoveredEnd End Date The end date of the time period that the data refer to YYYY-MM-DD date 61 #NAME: #VALUE TRUE FALSE FALSE TRUE FALSE FALSE timePeriodCovered citation - dateOfCollection Date of Collection The dates when the data were collected or generated none 62 ; FALSE FALSE TRUE FALSE FALSE FALSE citation - dateOfCollectionStart Start Date The date when the data collection started YYYY-MM-DD date 63 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation - dateOfCollectionEnd End Date The date when the data collection ended YYYY-MM-DD date 64 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation - kindOfData Data Type The type of data included in the files (e.g. survey data, clinical data, or machine-readable text) text 65 TRUE FALSE TRUE TRUE FALSE FALSE citation http://rdf-vocabulary.ddialliance.org/discovery#kindOfData - series Series Information about the dataset series to which the Dataset belong none 66 : FALSE FALSE TRUE FALSE FALSE FALSE citation - seriesName Name The name of the dataset series text 67 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE series citation - seriesInformation Information Can include 1) a history of the series and 2) a summary of features that apply to the series textbox 68 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE series citation - software Software Information about the software used to generate the Dataset none 69 , FALSE FALSE TRUE FALSE FALSE FALSE citation https://www.w3.org/TR/prov-o/#wasGeneratedBy - softwareName Name The name of software used to generate the Dataset text 70 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE software citation - softwareVersion Version The version of the software used to generate the Dataset, e.g. 4.11 text 71 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE software citation - relatedMaterial Related Material Information, such as a persistent ID or citation, about the material related to the Dataset, such as appendices or sampling information available outside of the Dataset textbox 72 FALSE FALSE TRUE FALSE FALSE FALSE citation - relatedDatasets Related Dataset Information, such as a persistent ID or citation, about a related dataset, such as previous research on the Dataset's subject textbox 73 FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/relation - otherReferences Other Reference Information, such as a persistent ID or citation, about another type of resource that provides background or supporting material to the Dataset text 74 FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/references - dataSources Data Source Information, such as a persistent ID or citation, about sources of the Dataset (e.g. a book, article, serial, or machine-readable data file) textbox 75 FALSE FALSE TRUE FALSE FALSE FALSE citation https://www.w3.org/TR/prov-o/#wasDerivedFrom - originOfSources Origin of Historical Sources For historical sources, the origin and any rules followed in establishing them as sources textbox 76 FALSE FALSE FALSE FALSE FALSE FALSE citation - characteristicOfSources Characteristic of Sources Characteristics not already noted elsewhere textbox 77 FALSE FALSE FALSE FALSE FALSE FALSE citation - accessToSources Documentation and Access to Sources 1) Methods or procedures for accessing data sources and 2) any special permissions needed for access textbox 78 FALSE FALSE FALSE FALSE FALSE FALSE citation + publicationRelationType Relation Type The nature of the relationship between this Dataset and the related publication text 30 #VALUE: TRUE TRUE FALSE FALSE TRUE FALSE publication citation http://datacite.org/schema/kernel-4/simpleTypes#relationType + publicationCitation Citation The full bibliographic citation for the related publication textbox 31 #VALUE TRUE FALSE FALSE FALSE TRUE FALSE publication citation http://purl.org/dc/terms/bibliographicCitation + publicationIDType Identifier Type The type of identifier that uniquely identifies a related publication text 32 #VALUE: TRUE TRUE FALSE FALSE TRUE FALSE publication citation http://purl.org/spar/datacite/ResourceIdentifierScheme + publicationIDNumber Identifier The identifier for a related publication text 33 #VALUE TRUE FALSE FALSE FALSE TRUE FALSE publication citation http://purl.org/spar/datacite/ResourceIdentifier + publicationURL URL The URL form of the identifier entered in the Identifier field, e.g. the DOI URL if a DOI was entered in the Identifier field. Used to display what was entered in the ID Type and ID Number fields as a link. If what was entered in the Identifier field has no URL form, the URL of the publication webpage is used, e.g. a journal article webpage https:// url 34 #VALUE FALSE FALSE FALSE FALSE TRUE FALSE publication citation https://schema.org/distribution + notesText Notes Additional information about the Dataset textbox 35 FALSE FALSE FALSE FALSE TRUE FALSE citation + language Language A language that the Dataset's files is written in text 36 TRUE TRUE TRUE TRUE FALSE FALSE citation http://purl.org/dc/terms/language + producer Producer The entity, such a person or organization, managing the finances or other administrative processes involved in the creation of the Dataset none 37 FALSE FALSE TRUE FALSE FALSE FALSE citation + producerName Name The name of the entity, e.g. the person's name or the name of an organization 1) FamilyName, GivenName or 2) Organization text 38 #VALUE TRUE FALSE FALSE TRUE FALSE TRUE producer citation + producerAffiliation Affiliation The name of the entity affiliated with the producer, e.g. an organization's name Organization XYZ text 39 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE producer citation + producerAbbreviation Abbreviated Name The producer's abbreviated name (e.g. IQSS, ICPSR) text 40 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE producer citation + producerURL URL The URL of the producer's website https:// url 41 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE producer citation + producerLogoURL Logo URL The URL of the producer's logo https:// url 42
FALSE FALSE FALSE FALSE FALSE FALSE producer citation + productionDate Production Date The date when the data were produced (not distributed, published, or archived) YYYY-MM-DD date 43 TRUE FALSE FALSE TRUE FALSE FALSE citation + productionPlace Production Location The location where the data and any related materials were produced or collected text 44 TRUE FALSE TRUE TRUE FALSE FALSE citation + contributor Contributor The entity, such as a person or organization, responsible for collecting, managing, or otherwise contributing to the development of the Dataset none 45 : FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/contributor + contributorType Type Indicates the type of contribution made to the dataset text 46 #VALUE TRUE TRUE FALSE TRUE FALSE FALSE contributor citation + contributorName Name The name of the contributor, e.g. the person's name or the name of an organization 1) FamilyName, GivenName or 2) Organization text 47 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE contributor citation + grantNumber Funding Information Information about the Dataset's financial support none 48 : FALSE FALSE TRUE FALSE FALSE FALSE citation https://schema.org/sponsor + grantNumberAgency Agency The agency that provided financial support for the Dataset Organization XYZ text 49 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE grantNumber citation + grantNumberValue Identifier The grant identifier or contract identifier of the agency that provided financial support for the Dataset text 50 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE grantNumber citation + distributor Distributor The entity, such as a person or organization, designated to generate copies of the Dataset, including any editions or revisions none 51 FALSE FALSE TRUE FALSE FALSE FALSE citation + distributorName Name The name of the entity, e.g. the person's name or the name of an organization 1) FamilyName, GivenName or 2) Organization text 52 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE distributor citation + distributorAffiliation Affiliation The name of the entity affiliated with the distributor, e.g. an organization's name Organization XYZ text 53 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE distributor citation + distributorAbbreviation Abbreviated Name The distributor's abbreviated name (e.g. IQSS, ICPSR) text 54 (#VALUE) FALSE FALSE FALSE FALSE FALSE FALSE distributor citation + distributorURL URL The URL of the distributor's webpage https:// url 55 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE distributor citation + distributorLogoURL Logo URL The URL of the distributor's logo image, used to show the image on the Dataset's page https:// url 56
FALSE FALSE FALSE FALSE FALSE FALSE distributor citation + distributionDate Distribution Date The date when the Dataset was made available for distribution/presentation YYYY-MM-DD date 57 TRUE FALSE FALSE TRUE FALSE FALSE citation + depositor Depositor The entity, such as a person or organization, that deposited the Dataset in the repository 1) FamilyName, GivenName or 2) Organization text 58 FALSE FALSE FALSE FALSE FALSE FALSE citation + dateOfDeposit Deposit Date The date when the Dataset was deposited into the repository YYYY-MM-DD date 59 FALSE FALSE FALSE TRUE FALSE FALSE citation http://purl.org/dc/terms/dateSubmitted + timePeriodCovered Time Period The time period that the data refer to. Also known as span. This is the time period covered by the data, not the dates of coding, collecting data, or making documents machine-readable none 60 ; FALSE FALSE TRUE FALSE FALSE FALSE citation https://schema.org/temporalCoverage + timePeriodCoveredStart Start Date The start date of the time period that the data refer to YYYY-MM-DD date 61 #NAME: #VALUE TRUE FALSE FALSE TRUE FALSE FALSE timePeriodCovered citation + timePeriodCoveredEnd End Date The end date of the time period that the data refer to YYYY-MM-DD date 62 #NAME: #VALUE TRUE FALSE FALSE TRUE FALSE FALSE timePeriodCovered citation + dateOfCollection Date of Collection The dates when the data were collected or generated none 63 ; FALSE FALSE TRUE FALSE FALSE FALSE citation + dateOfCollectionStart Start Date The date when the data collection started YYYY-MM-DD date 64 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation + dateOfCollectionEnd End Date The date when the data collection ended YYYY-MM-DD date 65 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE dateOfCollection citation + kindOfData Data Type The type of data included in the files (e.g. survey data, clinical data, or machine-readable text) text 66 TRUE FALSE TRUE TRUE FALSE FALSE citation http://rdf-vocabulary.ddialliance.org/discovery#kindOfData + series Series Information about the dataset series to which the Dataset belong none 67 : FALSE FALSE TRUE FALSE FALSE FALSE citation + seriesName Name The name of the dataset series text 68 #VALUE TRUE FALSE FALSE TRUE FALSE FALSE series citation + seriesInformation Information Can include 1) a history of the series and 2) a summary of features that apply to the series textbox 69 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE series citation + software Software Information about the software used to generate the Dataset none 70 , FALSE FALSE TRUE FALSE FALSE FALSE citation https://www.w3.org/TR/prov-o/#wasGeneratedBy + softwareName Name The name of software used to generate the Dataset text 71 #VALUE FALSE FALSE FALSE FALSE FALSE FALSE software citation + softwareVersion Version The version of the software used to generate the Dataset, e.g. 4.11 text 72 #NAME: #VALUE FALSE FALSE FALSE FALSE FALSE FALSE software citation + relatedMaterial Related Material Information, such as a persistent ID or citation, about the material related to the Dataset, such as appendices or sampling information available outside of the Dataset textbox 73 FALSE FALSE TRUE FALSE FALSE FALSE citation + relatedDatasets Related Dataset Information, such as a persistent ID or citation, about a related dataset, such as previous research on the Dataset's subject textbox 74 FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/relation + otherReferences Other Reference Information, such as a persistent ID or citation, about another type of resource that provides background or supporting material to the Dataset text 75 FALSE FALSE TRUE FALSE FALSE FALSE citation http://purl.org/dc/terms/references + dataSources Data Source Information, such as a persistent ID or citation, about sources of the Dataset (e.g. a book, article, serial, or machine-readable data file) textbox 76 FALSE FALSE TRUE FALSE FALSE FALSE citation https://www.w3.org/TR/prov-o/#wasDerivedFrom + originOfSources Origin of Historical Sources For historical sources, the origin and any rules followed in establishing them as sources textbox 77 FALSE FALSE FALSE FALSE FALSE FALSE citation + characteristicOfSources Characteristic of Sources Characteristics not already noted elsewhere textbox 78 FALSE FALSE FALSE FALSE FALSE FALSE citation + accessToSources Documentation and Access to Sources 1) Methods or procedures for accessing data sources and 2) any special permissions needed for access textbox 79 FALSE FALSE FALSE FALSE FALSE FALSE citation #controlledVocabulary DatasetField Value identifier displayOrder subject Agricultural Sciences D01 0 subject Arts and Humanities D0 1 @@ -325,3 +326,9 @@ language Zhuang, Chuang zha 183 zha za Zhuang Chuang language Zulu zul 184 zul zu language Not applicable 185 + publicationRelationType IsCitedBy RT1 1 + publicationRelationType Cites RT2 2 + publicationRelationType IsSupplementTo RT3 3 + publicationRelationType IsSupplementedBy RT4 4 + publicationRelationType IsReferencedBy RT5 5 + publicationRelationType References RT6 6 \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java index 1313f3415ab..53ab6c7bef7 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java @@ -40,6 +40,7 @@ public class DatasetFieldConstant implements java.io.Serializable { public final static String note = "note"; + public final static String publicationRelationType = "publicationRelationType"; public final static String publicationCitation = "publicationCitation"; public final static String publicationIDType = "publicationIDType"; public final static String publicationIDNumber = "publicationIDNumber"; diff --git a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java index 6b7cb844f3e..e74a2f26af6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java @@ -28,6 +28,8 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; +import org.apache.commons.lang3.StringUtils; + /** * * @author skraffmi @@ -301,26 +303,35 @@ private static void writeRelPublElement(XMLStreamWriter xmlw, DatasetVersionDTO String IDType = ""; String IDNo = ""; String url = ""; + String relationType = null; for (Iterator iterator = foo.iterator(); iterator.hasNext();) { FieldDTO next = iterator.next(); - if (DatasetFieldConstant.publicationCitation.equals(next.getTypeName())) { - citation = next.getSinglePrimitive(); - } - if (DatasetFieldConstant.publicationIDType.equals(next.getTypeName())) { - IDType = next.getSinglePrimitive(); - } - if (DatasetFieldConstant.publicationIDNumber.equals(next.getTypeName())) { - IDNo = next.getSinglePrimitive(); - } - if (DatasetFieldConstant.publicationURL.equals(next.getTypeName())) { - url = next.getSinglePrimitive(); + switch (next.getTypeName()) { + case DatasetFieldConstant.publicationCitation: + citation = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationIDType: + IDType = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationIDNumber: + IDNo = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationURL: + url = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationRelationType: + relationType = next.getSinglePrimitive(); + break; } } + if(StringUtils.isBlank(relationType)) { + relationType = "isReferencedBy"; + } pubString = appendCommaSeparatedValue(citation, IDType); pubString = appendCommaSeparatedValue(pubString, IDNo); pubString = appendCommaSeparatedValue(pubString, url); if (!pubString.isEmpty()){ - xmlw.writeStartElement(dcFlavor+":"+"isReferencedBy"); + xmlw.writeStartElement(dcFlavor+":" + relationType); xmlw.writeCharacters(pubString); xmlw.writeEndElement(); //relPubl } diff --git a/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java index b4b5e597365..dd01750942d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/openaire/OpenAireExportUtil.java @@ -932,6 +932,7 @@ public static void writeRelatedIdentifierElement(XMLStreamWriter xmlw, DatasetVe String relatedIdentifierType = null; String relatedIdentifier = null; // is used when relatedIdentifierType variable is not URL String relatedURL = null; // is used when relatedIdentifierType variable is URL + String relationType = null; // is used when relatedIdentifierType variable is URL for (Iterator iterator = fieldDTOs.iterator(); iterator.hasNext();) { FieldDTO next = iterator.next(); @@ -944,6 +945,9 @@ public static void writeRelatedIdentifierElement(XMLStreamWriter xmlw, DatasetVe if (DatasetFieldConstant.publicationURL.equals(next.getTypeName())) { relatedURL = next.getSinglePrimitive(); } + if (DatasetFieldConstant.publicationRelationType.equals(next.getTypeName())) { + relationType = next.getSinglePrimitive(); + } } if (StringUtils.isNotBlank(relatedIdentifierType)) { @@ -956,7 +960,10 @@ public static void writeRelatedIdentifierElement(XMLStreamWriter xmlw, DatasetVe } relatedIdentifier_map.put("relatedIdentifierType", relatedIdentifierType); - relatedIdentifier_map.put("relationType", "IsCitedBy"); + if(relationType== null) { + relationType = "IsCitedBy"; + } + relatedIdentifier_map.put("relationType", relationType); if (StringUtils.containsIgnoreCase(relatedIdentifierType, "url")) { writeFullElement(xmlw, null, "relatedIdentifier", relatedIdentifier_map, relatedURL, language); diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index cb864eb78e9..a52a599cff3 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -31,6 +31,7 @@ datasetfieldtype.topicClassValue.title=Term datasetfieldtype.topicClassVocab.title=Controlled Vocabulary Name datasetfieldtype.topicClassVocabURI.title=Controlled Vocabulary URL datasetfieldtype.publication.title=Related Publication +datasetfieldtype.publicationRelationType.title=Relation Type datasetfieldtype.publicationCitation.title=Citation datasetfieldtype.publicationIDType.title=Identifier Type datasetfieldtype.publicationIDNumber.title=Identifier @@ -110,6 +111,7 @@ datasetfieldtype.topicClassValue.description=A topic or subject term datasetfieldtype.topicClassVocab.description=The controlled vocabulary used for the keyword term (e.g. LCSH, MeSH) datasetfieldtype.topicClassVocabURI.description=The URL where one can access information about the term's controlled vocabulary datasetfieldtype.publication.description=The article or report that uses the data in the Dataset. The full list of related publications will be displayed on the metadata tab +datasetfieldtype.publicationRelationType.description=The nature of the relationship between this Dataset and the related publication datasetfieldtype.publicationCitation.description=The full bibliographic citation for the related publication datasetfieldtype.publicationIDType.description=The type of identifier that uniquely identifies a related publication datasetfieldtype.publicationIDNumber.description=The identifier for a related publication diff --git a/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java index 2da15147255..8350c5d9875 100644 --- a/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/export/OpenAireExportUtilTest.java @@ -617,7 +617,7 @@ public void testWriteRelatedIdentifierElement() throws XMLStreamException, IOExc //then assertEquals("" - + "" + + "" + "RelatedPublicationIDNumber1" + "" + "RelatedPublicationIDNumber2" From 93faadeb7aaa8093369d327cc0394c49ee090850 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Jun 2024 13:24:58 -0400 Subject: [PATCH 121/366] missing element for openaireutil test --- .../harvard/iq/dataverse/export/dataset-all-defaults.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt b/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt index 431f069cb03..6b3c7689bbf 100644 --- a/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt +++ b/src/test/java/edu/harvard/iq/dataverse/export/dataset-all-defaults.txt @@ -324,6 +324,12 @@ "typeClass": "compound", "value": [ { + "publicationRelationType": { + "typeName": "publicationRelationType", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "IsSupplementTo" + }, "publicationCitation": { "typeName": "publicationCitation", "multiple": false, From c9084e3058045fb54fd960a203588f371ce59b2c Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Jun 2024 13:57:02 -0400 Subject: [PATCH 122/366] contributor type null fix --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 9ba1e4e3116..92bcf8b481f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -546,7 +546,10 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X contributor = subField.getValue(); break; case DatasetFieldConstant.contributorType: - contributorType = subField.getValue().replace(" ", ""); + contributorType = subField.getValue(); + if(contributorType!=null) { + contributorType = contributorType.replace(" ", ""); + } break; } } From cdd6d6fb4357fe2e63dbf597faf57d59c8625670 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Jun 2024 16:05:40 -0400 Subject: [PATCH 123/366] add relationType to base code and DataCite XML --- .../iq/dataverse/DatasetRelPublication.java | 29 ++++++++++----- .../harvard/iq/dataverse/DatasetVersion.java | 37 +++++++++++++------ .../pidproviders/doi/XmlMetadataTemplate.java | 12 ++++-- 3 files changed, 53 insertions(+), 25 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java b/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java index 7680ebc16db..a0696ab38d9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetRelPublication.java @@ -6,7 +6,6 @@ package edu.harvard.iq.dataverse; - /** * * @author skraffmiller @@ -25,10 +24,12 @@ public class DatasetRelPublication { private String description; private boolean replicationData; private int displayOrder; + private String relationType; public int getDisplayOrder() { return displayOrder; } + public void setDisplayOrder(int displayOrder) { this.displayOrder = displayOrder; } @@ -64,8 +65,7 @@ public String getUrl() { public void setUrl(String url) { this.url = url; } - - + public String getTitle() { return title; } @@ -82,12 +82,21 @@ public void setDescription(String description) { this.description = description; } - public boolean isEmpty() { - return ((text==null || text.trim().equals("")) - && (!replicationData) - && (idType==null || idType.trim().equals("")) - && (idNumber==null || idNumber.trim().equals("")) - && (url==null || url.trim().equals(""))); - } + public void setRelationType(String type) { + relationType = type; + + } + + public String getRelationType() { + return relationType; + } + + public boolean isEmpty() { + return ((text == null || text.trim().equals("")) + && (!replicationData) + && (idType == null || idType.trim().equals("")) + && (idNumber == null || idNumber.trim().equals("")) + && (url == null || url.trim().equals(""))); + } } diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java index 6648419216d..eb6fdd4e923 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java @@ -1356,24 +1356,37 @@ public List getRelatedPublications() { for (DatasetFieldCompoundValue publication : dsf.getDatasetFieldCompoundValues()) { DatasetRelPublication relatedPublication = new DatasetRelPublication(); for (DatasetField subField : publication.getChildDatasetFields()) { - if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationCitation)) { - String citation = subField.getDisplayValue(); - relatedPublication.setText(citation); - } - - - if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationURL)) { - // We have to avoid using subField.getDisplayValue() here - because the DisplayFormatType - // for this url metadata field is likely set up so that the display value is automatically - // turned into a clickable HTML HREF block, which we don't want to end in our Schema.org JSON-LD output. - // So we want to use the raw value of the field instead, with - // minimal HTML sanitation, just in case (this would be done on all URLs in getDisplayValue()). + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.publicationCitation: + relatedPublication.setText(subField.getDisplayValue()); + break; + case DatasetFieldConstant.publicationURL: + // We have to avoid using subField.getDisplayValue() here - because the DisplayFormatType + // for this url metadata field is likely set up so that the display value is automatically + // turned into a clickable HTML HREF block, which we don't want to end in our Schema.org + // JSON-LD output. So we want to use the raw value of the field instead, with minimal HTML + // sanitation, just in case (this would be done on all URLs in getDisplayValue()). String url = subField.getValue(); if (StringUtils.isBlank(url) || DatasetField.NA_VALUE.equals(url)) { relatedPublication.setUrl(""); } else { relatedPublication.setUrl(MarkupChecker.sanitizeBasicHTML(url)); } + break; + case DatasetFieldConstant.publicationIDType: + // QDR idType has a trailing : now (Aug 2021) + // Get sanitized value without any display modifications + subField.getDatasetFieldType().setDisplayFormat("#VALUE"); + relatedPublication.setIdType(subField.getDisplayValue()); + break; + case DatasetFieldConstant.publicationIDNumber: + // Get sanitized value without any display modifications + subField.getDatasetFieldType().setDisplayFormat("#VALUE"); + relatedPublication.setIdNumber(subField.getDisplayValue()); + break; + case DatasetFieldConstant.publicationRelationType: + relatedPublication.setRelationType(subField.getDisplayValue()); + break; } } relatedPublications.add(relatedPublication); diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 92bcf8b481f..03d4de99691 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -4,6 +4,8 @@ import java.io.IOException; import java.io.OutputStream; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.text.ParseException; import java.util.ArrayList; @@ -872,6 +874,10 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th String pubIdType = relatedPub.getIdType(); String identifier = relatedPub.getIdNumber(); String url = relatedPub.getUrl(); + String relationType = relatedPub.getRelationType(); + if(StringUtils.isBlank(relationType)) { + relationType = "IsSupplementTo"; + } /* * Note - with identifier and url fields, it's not clear that there's a single * way those two fields are used for all identifier types. The code here is @@ -921,13 +927,13 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th // For non-URL types, if a URL is given, split the string to get a schemeUri try { - URL relatedUrl = new URL(relatedIdentifier); + URL relatedUrl = new URI(relatedIdentifier).toURL(); String protocol = relatedUrl.getProtocol(); String authority = relatedUrl.getAuthority(); String site = String.format("%s://%s", protocol, authority); relatedIdentifier = relatedIdentifier.substring(site.length()); attributes.put("schemeURI", site); - } catch (MalformedURLException e) { + } catch (URISyntaxException | MalformedURLException e) { // Just an identifier } } @@ -937,7 +943,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th if (pubIdType != null) { attributes.put("relatedIdentifierType", pubIdType); } - attributes.put("relationType", "IsSupplementTo"); + attributes.put("relationType", relationType); relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, relatedIdentifier); } From 360d3fac049239cfc4f41b6be83b8ecc0b16b475 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Jun 2024 16:05:57 -0400 Subject: [PATCH 124/366] add relationType to above fold display --- .../iq/dataverse/DatasetVersionUI.java | 32 +++++++++++++------ src/main/webapp/dataset.xhtml | 6 ++-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java index 55b98c178bb..975de391d8c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java @@ -62,14 +62,14 @@ public void setMetadataBlocksForEdit(TreeMap> public DatasetVersionUI initDatasetVersionUI(DatasetVersion datasetVersion, boolean createBlanks) { /*takes in the values of a dataset version and apportions them into lists for - viewing and editng in the dataset page. + viewing and editing in the dataset page. */ setDatasetVersion(datasetVersion); //this.setDatasetAuthors(new ArrayList()); this.setDatasetRelPublications(new ArrayList<>()); - // loop through vaues to get fields for view mode + // loop through values to get fields for view mode for (DatasetField dsf : datasetVersion.getDatasetFields()) { //Special Handling for various fields displayed above tabs in dataset page view. if (dsf.getDatasetFieldType().getName().equals(DatasetFieldConstant.title)) { @@ -114,17 +114,23 @@ public DatasetVersionUI initDatasetVersionUI(DatasetVersion datasetVersion, boo datasetRelPublication.setTitle(dsf.getDatasetFieldType().getLocaleTitle()); datasetRelPublication.setDescription(dsf.getDatasetFieldType().getLocaleDescription()); for (DatasetField subField : relPubVal.getChildDatasetFields()) { - if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationCitation)) { + String value = subField.getValue(); + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.publicationCitation: datasetRelPublication.setText(subField.getValue()); - } - if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationIDNumber)) { + break; + case DatasetFieldConstant.publicationIDNumber: datasetRelPublication.setIdNumber(subField.getValue()); - } - if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationIDType)) { + break; + case DatasetFieldConstant.publicationIDType: datasetRelPublication.setIdType(subField.getValue()); - } - if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationURL)) { + break; + case DatasetFieldConstant.publicationURL: datasetRelPublication.setUrl(subField.getValue()); + break; + case DatasetFieldConstant.publicationRelationType: + datasetRelPublication.setRelationType(subField.getValue()); + break; } } this.getDatasetRelPublications().add(datasetRelPublication); @@ -263,6 +269,14 @@ public String getRelPublicationUrl() { } } + public String getRelPublicationRelationType() { + if (!this.datasetRelPublications.isEmpty()) { + return this.getDatasetRelPublications().get(0).getRelationType(); + } else { + return ""; + } + } + public String getUNF() { //todo get UNF to calculate and display here. return ""; diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 13faf9d7f20..4fd91f24c36 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -631,6 +631,7 @@ or !empty DatasetPage.datasetVersionUI.keywordDisplay or !empty DatasetPage.datasetVersionUI.subject.value or !empty DatasetPage.datasetVersionUI.relPublicationCitation + or !empty DatasetPage.datasetVersionUI.relPublicationUrl or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}"> @@ -650,8 +651,9 @@ data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}">
- - #{DatasetPage.datasetVersionUI.relPublicationId} + + #{DatasetPage.datasetVersionUI.relPublicationId} + From 53ded9e21d81848fc9749acd2e07140b964d21cb Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Jun 2024 16:24:26 -0400 Subject: [PATCH 125/366] typos --- src/main/webapp/dataset.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 4fd91f24c36..5c9ccde70a6 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -651,9 +651,9 @@ data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}"> - + #{DatasetPage.datasetVersionUI.relPublicationId} - + From 6aade3a7df43647792a6627d41f871f85c69a676 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 14 Jun 2024 16:43:17 -0400 Subject: [PATCH 126/366] handle blank id no and styling in above fold summary --- src/main/webapp/dataset.xhtml | 2 +- src/main/webapp/resources/css/structure.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 5c9ccde70a6..427a8c88f6c 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -652,7 +652,7 @@ - #{DatasetPage.datasetVersionUI.relPublicationId} + #{empty DatasetPage.datasetVersionUI.relPublicationId ? DatasetPage.datasetVersionUI.relPublicationUrl:DatasetPage.datasetVersionUI.relPublicationId} diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css index 64d07038f2f..274755046e2 100644 --- a/src/main/webapp/resources/css/structure.css +++ b/src/main/webapp/resources/css/structure.css @@ -1163,7 +1163,7 @@ a { color:#3174AF; } -.label-warning a, .bg-citation a, .terms .help-block a, #panelCollapseTOU .help-block a { +.label-warning a, .bg-citation a, .terms .help-block a, #panelCollapseTOU .help-block a, #dataset-summary-metadata a { text-decoration: underline; } .pagination>.disabled>a { From 347971fc3619b5c122fca0b345350b5ba2c24de3 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 17 Jun 2024 16:19:57 -0400 Subject: [PATCH 127/366] skip blanks in geo place name entries --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 9ba1e4e3116..f81db1463d6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1246,7 +1246,9 @@ private void writeGeoLocations(XMLStreamWriter xmlw, DvObject dvObject) throws X ArrayList placeList = new ArrayList(); for (String placePart : place) { - placeList.add(placePart); + if (!StringUtils.isBlank(placePart)) { + placeList.add(placePart); + } } XmlWriterUtil.writeFullElement(xmlw, "geoLocationPlace", Strings.join(placeList, ", ")); xmlw.writeEndElement(); // From bc5686bd2ccc376e1f12a9020ebd0adcce1ff87e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 17 Jun 2024 16:22:35 -0400 Subject: [PATCH 128/366] use ; to separate kindOfData / resourceTypes --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index f81db1463d6..0c19ba0a6df 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -755,7 +755,7 @@ private void writeResourceType(XMLStreamWriter xmlw, DvObject dvObject) throws X } } if (!kindOfDataValues.isEmpty()) { - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, String.join(", ", kindOfDataValues)); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "resourceType", attributes, String.join(";", kindOfDataValues)); } else { // Write an attribute only element if there are no kindOfData values. From db934bb9af639b71a971e5df5cf9533b766fb35d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 18 Jun 2024 10:29:02 -0400 Subject: [PATCH 129/366] add Time Period as Other Date --- .../pidproviders/doi/XmlMetadataTemplate.java | 68 +++++++++++++------ 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 0c19ba0a6df..8ee1c261bf2 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -6,6 +6,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -630,6 +631,7 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea String dateOfDeposit = null; Date releaseDate = null; List datesOfCollection = new ArrayList(); + List timePeriods = new ArrayList(); if (dvObject instanceof Dataset d) { DatasetVersion dv = d.getLatestVersionForCopy(); @@ -647,6 +649,10 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea break; case DatasetFieldConstant.dateOfCollection: datesOfCollection = dsf.getDatasetFieldCompoundValues(); + break; + case DatasetFieldConstant.timePeriodCovered: + timePeriods = dsf.getDatasetFieldCompoundValues(); + break; } } } @@ -691,30 +697,40 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea break; } } + // Minimal clean-up - useful? Parse/format would remove unused chars, and an + // exception would clear the date so we don't send nonsense + startDate =cleanUpDate(startDate); + endDate =cleanUpDate(endDate); if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { - //Minimal clean-up - useful? Parse/format would remove unused chars, and an exception would clear the date so we don't send nonsense - if(StringUtils.isNotBlank(startDate)) { - try { - Date start = Util.getDateFormat().parse(startDate); - startDate = Util.getDateFormat().format(start); - } catch (ParseException e) { - logger.warning("Could not parse date: " + startDate); - startDate = null; - } - } - if(StringUtils.isNotBlank(endDate)) { - try { - Date end = Util.getDateFormat().parse(endDate); - endDate = Util.getDateFormat().format(end); - } catch (ParseException e) { - logger.warning("Could not parse date: " + endDate); - endDate = null; - }; + datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); + attributes.put("dateType", "Collected"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, (startDate + "/" + endDate).trim()); + } + } + } + if (timePeriods != null) { + for (DatasetFieldCompoundValue timePeriodFieldValue : timePeriods) { + String startDate = null; + String endDate = null; + + for (DatasetField subField : timePeriodFieldValue.getChildDatasetFields()) { + switch (subField.getDatasetFieldType().getName()) { + case DatasetFieldConstant.timePeriodCoveredStart: + startDate = subField.getValue(); + break; + case DatasetFieldConstant.timePeriodCoveredEnd: + endDate = subField.getValue(); + break; } } + // Minimal clean-up - useful? Parse/format would remove unused chars, and an + // exception would clear the date so we don't send nonsense + startDate = cleanUpDate(startDate); + endDate = cleanUpDate(endDate); if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); - attributes.put("dateType", "Collected"); + attributes.put("dateType", "Other"); + attributes.put("dateInformation", "Time period covered by the data"); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, (startDate + "/" + endDate).trim()); } } @@ -724,6 +740,20 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } } + private String cleanUpDate(String date) { + if(StringUtils.isBlank(date)) { + return null; + } + try { + SimpleDateFormat sdf = Util.getDateFormat(); + Date start = sdf.parse(date); + date = sdf.format(start); + } catch (ParseException e) { + logger.warning("Could not parse date: " + date); + date = null; + } + } + // 9, Language (MA), language private void writeLanguage(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStreamException { // Currently not supported. Spec indicates one 'primary' language. Could send From 9efe5971a62b200ac3de0cca25340dda9ef9eb5e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 18 Jun 2024 15:48:11 -0400 Subject: [PATCH 130/366] support available and updated dates for dataset and file --- .../pidproviders/doi/XmlMetadataTemplate.java | 61 ++++++++++++++----- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 8ee1c261bf2..eab832d50fd 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -630,12 +630,37 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea String dateOfProduction = null; String dateOfDeposit = null; Date releaseDate = null; + String publicationDate = null; + boolean isAnUpdate=false; List datesOfCollection = new ArrayList(); List timePeriods = new ArrayList(); - if (dvObject instanceof Dataset d) { + if (dvObject instanceof DataFile df) { + // Find the first released version the file is in to give a published date + List fmds = df.getFileMetadatas(); + for (FileMetadata fmd : fmds) { + DatasetVersion dv = fmd.getDatasetVersion(); + if (dv.isReleased()) { + publicationDate = Util.getDateFormat().format(dv.getReleaseTime()); + break; + } + } + // And the last update is the most recent + for (int i = fmds.size() - 1; i >= 0; i--) { + DatasetVersion dv = fmds.get(i).getDatasetVersion(); + if (dv.isReleased()) { + releaseDate = dv.getReleaseTime(); + break; + } + } + } else if (dvObject instanceof Dataset d) { DatasetVersion dv = d.getLatestVersionForCopy(); + Long versionNumber = dv.getVersionNumber(); + if (versionNumber != null && !(versionNumber.equals(1) && dv.getMinorVersionNumber().equals(0))) { + isAnUpdate = true; + } releaseDate = dv.getReleaseTime(); + publicationDate = d.getPublicationDateFormattedYYYYMMDD(); for (DatasetField dsf : dv.getDatasetFields()) { switch (dsf.getDatasetFieldType().getName()) { case DatasetFieldConstant.distributionDate: @@ -675,11 +700,17 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, dateOfDeposit); } - if (releaseDate != null) { - String date = Util.getDateFormat().format(releaseDate); + if (publicationDate != null) { datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); attributes.put("dateType", "Available"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, publicationDate); + } + if (isAnUpdate) { + String date = Util.getDateFormat().format(releaseDate); + datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); + + attributes.put("dateType", "Updated"); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "date", attributes, date); } if (datesOfCollection != null) { @@ -699,8 +730,8 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } // Minimal clean-up - useful? Parse/format would remove unused chars, and an // exception would clear the date so we don't send nonsense - startDate =cleanUpDate(startDate); - endDate =cleanUpDate(endDate); + startDate = cleanUpDate(startDate); + endDate = cleanUpDate(endDate); if (StringUtils.isNotBlank(startDate) || StringUtils.isNotBlank(endDate)) { datesWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "dates", datesWritten); attributes.put("dateType", "Collected"); @@ -741,17 +772,17 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea } private String cleanUpDate(String date) { - if(StringUtils.isBlank(date)) { - return null; - } - try { - SimpleDateFormat sdf = Util.getDateFormat(); - Date start = sdf.parse(date); - date = sdf.format(start); - } catch (ParseException e) { - logger.warning("Could not parse date: " + date); - date = null; + String newDate = null; + if (!StringUtils.isBlank(date)) { + try { + SimpleDateFormat sdf = Util.getDateFormat(); + Date start = sdf.parse(date); + newDate = sdf.format(start); + } catch (ParseException e) { + logger.warning("Could not parse date: " + date); + } } + return newDate; } // 9, Language (MA), language From de3731479eb30205867a0b30fdf3b00a552bb359 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 18 Jun 2024 16:24:15 -0400 Subject: [PATCH 131/366] fix file updated logic --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index eab832d50fd..95fd6de309d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -638,9 +638,11 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea if (dvObject instanceof DataFile df) { // Find the first released version the file is in to give a published date List fmds = df.getFileMetadatas(); + DatasetVersion initialVersion = null; for (FileMetadata fmd : fmds) { DatasetVersion dv = fmd.getDatasetVersion(); if (dv.isReleased()) { + initialVersion = dv; publicationDate = Util.getDateFormat().format(dv.getReleaseTime()); break; } @@ -648,8 +650,9 @@ private void writeDates(XMLStreamWriter xmlw, DvObject dvObject) throws XMLStrea // And the last update is the most recent for (int i = fmds.size() - 1; i >= 0; i--) { DatasetVersion dv = fmds.get(i).getDatasetVersion(); - if (dv.isReleased()) { + if (dv.isReleased() && !dv.equals(initialVersion)) { releaseDate = dv.getReleaseTime(); + isAnUpdate=true; break; } } From 6357d92dbf87011898210ef9a0f2ea56535e4dd4 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 18 Jun 2024 16:11:27 -0400 Subject: [PATCH 132/366] fix no relType styling --- .../edu/harvard/iq/dataverse/DatasetVersionUI.java | 10 +++++++--- src/main/webapp/dataset.xhtml | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java index 975de391d8c..225201c1f4c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java @@ -271,10 +271,14 @@ public String getRelPublicationUrl() { public String getRelPublicationRelationType() { if (!this.datasetRelPublications.isEmpty()) { - return this.getDatasetRelPublications().get(0).getRelationType(); - } else { - return ""; + //Add ': ' formatting if relationType exists + String relationType = this.getDatasetRelPublications().get(0).getRelationType(); + if (!relationType.isEmpty()) { + return relationType + ": "; + } } + return ""; + } public String getUNF() { diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 427a8c88f6c..b46688bf27e 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -631,7 +631,6 @@ or !empty DatasetPage.datasetVersionUI.keywordDisplay or !empty DatasetPage.datasetVersionUI.subject.value or !empty DatasetPage.datasetVersionUI.relPublicationCitation - or !empty DatasetPage.datasetVersionUI.relPublicationUrl or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}"> @@ -651,9 +650,10 @@ data-toggle="tooltip" data-placement="auto right" data-original-title="#{DatasetPage.datasetVersionUI.datasetRelPublications.get(0).description}">
- - #{empty DatasetPage.datasetVersionUI.relPublicationId ? DatasetPage.datasetVersionUI.relPublicationUrl:DatasetPage.datasetVersionUI.relPublicationId} - + + + #{empty DatasetPage.datasetVersionUI.relPublicationId ? DatasetPage.datasetVersionUI.relPublicationUrl:DatasetPage.datasetVersionUI.relPublicationId} + From c624c0c92fb555f82a33f69a12103967531a201d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 18 Jun 2024 17:29:38 -0400 Subject: [PATCH 133/366] handle null --- src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java index 225201c1f4c..0a1afe86901 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java @@ -16,6 +16,8 @@ import java.util.List; import java.util.TreeMap; +import org.apache.commons.lang3.StringUtils; + import jakarta.ejb.EJB; import jakarta.faces.view.ViewScoped; import jakarta.inject.Inject; @@ -273,7 +275,7 @@ public String getRelPublicationRelationType() { if (!this.datasetRelPublications.isEmpty()) { //Add ': ' formatting if relationType exists String relationType = this.getDatasetRelPublications().get(0).getRelationType(); - if (!relationType.isEmpty()) { + if (!StringUtils.isBlank(relationType)) { return relationType + ": "; } } From 0c2cff14eff0f94905ec87b799a4496d8dee921b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 24 Jun 2024 12:52:19 -0400 Subject: [PATCH 134/366] add HasPart rels - logic issue --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 95fd6de309d..70a3dadedea 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1005,7 +1005,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th } } List fmds = dataset.getLatestVersionForCopy().getFileMetadatas(); - if (!(fmds==null) && fmds.isEmpty()) { + if (!((fmds==null) && fmds.isEmpty())) { attributes.clear(); attributes.put("relationType", "HasPart"); for (FileMetadata fmd : fmds) { From a177a08eab9d7d3856fc99027153e2d6ceb82870 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 24 Jun 2024 17:00:13 -0400 Subject: [PATCH 135/366] catch additional exception type --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 70a3dadedea..3697eeeab8f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -982,13 +982,13 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th // For non-URL types, if a URL is given, split the string to get a schemeUri try { - URL relatedUrl = new URL(relatedIdentifier); + URL relatedUrl = new URI(relatedIdentifier).toURL(); String protocol = relatedUrl.getProtocol(); String authority = relatedUrl.getAuthority(); String site = String.format("%s://%s", protocol, authority); relatedIdentifier = relatedIdentifier.substring(site.length()); attributes.put("schemeURI", site); - } catch (MalformedURLException e) { + } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { // Just an identifier } } From fed231ff6782ef7b050edb2ed1ee79e75e18d695 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 26 Jun 2024 13:11:49 -0400 Subject: [PATCH 136/366] fix rendering with a span --- src/main/webapp/dataset.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index b46688bf27e..9b4882b8487 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -652,7 +652,7 @@ - #{empty DatasetPage.datasetVersionUI.relPublicationId ? DatasetPage.datasetVersionUI.relPublicationUrl:DatasetPage.datasetVersionUI.relPublicationId} + #{empty DatasetPage.datasetVersionUI.relPublicationId ? DatasetPage.datasetVersionUI.relPublicationUrl:DatasetPage.datasetVersionUI.relPublicationId} From 08843d8beb309ab9980abe0203c08b4f58d9af12 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 26 Jun 2024 13:35:44 -0400 Subject: [PATCH 137/366] missing imports, null check --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 3697eeeab8f..14ffed91c36 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -4,6 +4,8 @@ import java.io.IOException; import java.io.OutputStream; import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -547,7 +549,10 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X contributor = subField.getValue(); break; case DatasetFieldConstant.contributorType: - contributorType = subField.getValue().replace(" ", ""); + contributorType = subField.getValue(); + if(contributorType!=null) { + contributorType = contributorType.replace(" ", ""); + } break; } } From daabdff2c00b9fe44ce74685c0f063d7acfd5049 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 12:29:38 -0400 Subject: [PATCH 138/366] add try/catch --- .../iq/dataverse/search/IndexBatchServiceBean.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java index 0eeb681514c..a9ecae1a994 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java @@ -63,8 +63,12 @@ public Future indexStatus() { response.add("SearchException ", msg); return new AsyncResult<>(response); } - - JsonObject permissionsInDatabaseButStaleInOrMissingFromSolr = getPermissionsInDatabaseButStaleInOrMissingFromSolr().build(); + try { + JsonObject permissionsInDatabaseButStaleInOrMissingFromSolr = getPermissionsInDatabaseButStaleInOrMissingFromSolr().build(); + } catch (Exception e) { + e.printStackTrace(); + logger.warning(e.getLocalizedMessage()); + } JsonObjectBuilder data = Json.createObjectBuilder() .add("contentInDatabaseButStaleInOrMissingFromIndex", contentInDatabaseButStaleInOrMissingFromSolr) From 8bcd26249e6231c0bb9493bba51d934072e0756f Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 12:37:31 -0400 Subject: [PATCH 139/366] refactor for one try/catch --- .../search/IndexBatchServiceBean.java | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java index a9ecae1a994..b8b4baee2bd 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java @@ -50,39 +50,35 @@ public class IndexBatchServiceBean { public Future indexStatus() { JsonObjectBuilder response = Json.createObjectBuilder(); logger.info("Beginning indexStatus()"); - JsonObject contentInDatabaseButStaleInOrMissingFromSolr = getContentInDatabaseButStaleInOrMissingFromSolr().build(); - JsonObject contentInSolrButNotDatabase = null; - JsonObject permissionsInSolrButNotDatabase = null; try { + JsonObject contentInDatabaseButStaleInOrMissingFromSolr = getContentInDatabaseButStaleInOrMissingFromSolr().build(); + JsonObject contentInSolrButNotDatabase = null; + JsonObject permissionsInSolrButNotDatabase = null; + contentInSolrButNotDatabase = getContentInSolrButNotDatabase().build(); permissionsInSolrButNotDatabase = getPermissionsInSolrButNotDatabase().build(); - - } catch (SearchException ex) { + + JsonObject permissionsInDatabaseButStaleInOrMissingFromSolr = getPermissionsInDatabaseButStaleInOrMissingFromSolr().build(); + + response + .add("contentInDatabaseButStaleInOrMissingFromIndex", contentInDatabaseButStaleInOrMissingFromSolr) + .add("contentInIndexButNotDatabase", contentInSolrButNotDatabase) + .add("permissionsInDatabaseButStaleInOrMissingFromIndex", permissionsInDatabaseButStaleInOrMissingFromSolr) + .add("permissionsInIndexButNotDatabase", permissionsInSolrButNotDatabase); + + logger.log(Level.INFO, "contentInDatabaseButStaleInOrMissingFromIndex: {0}", contentInDatabaseButStaleInOrMissingFromSolr); + logger.log(Level.INFO, "contentInIndexButNotDatabase: {0}", contentInSolrButNotDatabase); + logger.log(Level.INFO, "permissionsInDatabaseButStaleInOrMissingFromIndex: {0}", permissionsInDatabaseButStaleInOrMissingFromSolr); + logger.log(Level.INFO, "permissionsInIndexButNotDatabase: {0}", permissionsInSolrButNotDatabase); + } catch (Exception ex) { String msg = "Can not determine index status. " + ex.getLocalizedMessage() + ". Is Solr down? Exception: " + ex.getCause().getLocalizedMessage(); logger.info(msg); + ex.printStackTrace(); response.add("SearchException ", msg); - return new AsyncResult<>(response); } - try { - JsonObject permissionsInDatabaseButStaleInOrMissingFromSolr = getPermissionsInDatabaseButStaleInOrMissingFromSolr().build(); - } catch (Exception e) { - e.printStackTrace(); - logger.warning(e.getLocalizedMessage()); - } - - JsonObjectBuilder data = Json.createObjectBuilder() - .add("contentInDatabaseButStaleInOrMissingFromIndex", contentInDatabaseButStaleInOrMissingFromSolr) - .add("contentInIndexButNotDatabase", contentInSolrButNotDatabase) - .add("permissionsInDatabaseButStaleInOrMissingFromIndex", permissionsInDatabaseButStaleInOrMissingFromSolr) - .add("permissionsInIndexButNotDatabase", permissionsInSolrButNotDatabase); - - logger.log(Level.INFO, "contentInDatabaseButStaleInOrMissingFromIndex: {0}", contentInDatabaseButStaleInOrMissingFromSolr); - logger.log(Level.INFO, "contentInIndexButNotDatabase: {0}", contentInSolrButNotDatabase); - logger.log(Level.INFO, "permissionsInDatabaseButStaleInOrMissingFromIndex: {0}", permissionsInDatabaseButStaleInOrMissingFromSolr); - logger.log(Level.INFO, "permissionsInIndexButNotDatabase: {0}", permissionsInSolrButNotDatabase); - - return new AsyncResult<>(data); + return new AsyncResult<>(response); } + @Asynchronous public Future clearOrphans() { JsonObjectBuilder response = Json.createObjectBuilder(); From 31de2591f5bed4026c7493aa1a80d5b9eca97d55 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 13:02:50 -0400 Subject: [PATCH 140/366] more logging, another catch --- .../edu/harvard/iq/dataverse/search/IndexServiceBean.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index c91eb0bfa7c..451244f0f56 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -2205,6 +2205,7 @@ public List findFilesInSolrOnly() throws SearchException { * @throws SearchException */ public List findPermissionsInSolrOnly() throws SearchException { + logger.info("Checking for solr-only permissions"); List permissionInSolrOnly = new ArrayList<>(); try { int rows = 100; @@ -2215,6 +2216,7 @@ public List findPermissionsInSolrOnly() throws SearchException { q.set(CursorMarkParams.CURSOR_MARK_PARAM, cursorMark); QueryResponse rsp = solrServer.query(q); String nextCursorMark = rsp.getNextCursorMark(); + logger.info("Next cursor mark: " + nextCursorMark); SolrDocumentList list = rsp.getResults(); for (SolrDocument doc: list) { long id = Long.parseLong((String) doc.getFieldValue(SearchFields.DEFINITION_POINT_DVOBJECT_ID)); @@ -2272,6 +2274,9 @@ public List findPermissionsInSolrOnly() throws SearchException { } catch (SolrServerException | IOException ex) { throw new SearchException("Error searching Solr for permissions" , ex); + } catch (Exception e) { + logger.warning(e.getLocalizedMessage()); + e.printStackTrace(); } return permissionInSolrOnly; } From 777671e8d4c4a71c461e5bc2c778bb37141e4aec Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 13:46:08 -0400 Subject: [PATCH 141/366] optimize query --- src/main/java/edu/harvard/iq/dataverse/DataFile.java | 4 +++- .../harvard/iq/dataverse/DataFileServiceBean.java | 12 ++++++++++++ .../iq/dataverse/search/IndexServiceBean.java | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index 29a4a14c021..bb71112647e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -48,7 +48,9 @@ @NamedQuery(name="DataFile.findDataFileByIdProtocolAuth", query="SELECT s FROM DataFile s WHERE s.identifier=:identifier AND s.protocol=:protocol AND s.authority=:authority"), @NamedQuery(name="DataFile.findDataFileThatReplacedId", - query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier") + query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier"), + @NamedQuery(name="DataFile.fileMetadataInReleasedVersion", + query="SELECT fm.id FROM filemetadata fm, dvobject dvo WHERE datasetversion_id=(SELECT max(id) FROM datasetversion WHERE dataset_id=dvo.owner_id and versionstate='RELEASED') AND dvo.id=fm.datafile_id AND datafile_id=:fid") }) @Entity @Table(indexes = {@Index(columnList="ingeststatus") diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java index 21f925f8981..b131c9d2818 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java @@ -1413,4 +1413,16 @@ public UploadSessionQuotaLimit getUploadSessionQuotaLimit(DvObjectContainer pare return new UploadSessionQuotaLimit(quota.getAllocation(), currentSize); } + + public boolean isInReleasedVersion(Long id) { + Query query = em.createNamedQuery("DataFile.fileMetadataInReleasedVersion"); + query.setParameter("fid", id); + + try { + query.getSingleResult(); + return true; + } catch (Exception ex) { + return false; + } + } } diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index 451244f0f56..9f9ed2d7637 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -2256,7 +2256,7 @@ public List findPermissionsInSolrOnly() throws SearchException { if (!states.contains(VersionState.RELEASED)) { permissionInSolrOnly.add(docId); } else { - if(dataFileService.findFileMetadataByDatasetVersionIdAndDataFileId(f.getOwner().getReleasedVersion().getId(), f.getId()) == null) { + if(!dataFileService.isInReleasedVersion(f.getId())) { logger.fine("Adding doc " + docId + " to list of permissions in Solr only"); permissionInSolrOnly.add(docId); } From 42f79259377a02934075e67660b378ad05406b15 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 13:59:52 -0400 Subject: [PATCH 142/366] correct query capitalization --- src/main/java/edu/harvard/iq/dataverse/DataFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index bb71112647e..3119f5c8379 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -50,7 +50,7 @@ @NamedQuery(name="DataFile.findDataFileThatReplacedId", query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier"), @NamedQuery(name="DataFile.fileMetadataInReleasedVersion", - query="SELECT fm.id FROM filemetadata fm, dvobject dvo WHERE datasetversion_id=(SELECT max(id) FROM datasetversion WHERE dataset_id=dvo.owner_id and versionstate='RELEASED') AND dvo.id=fm.datafile_id AND datafile_id=:fid") + query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetversion_id=(SELECT max(id) FROM DatasetVersion WHERE dataset_id=dvo.owner_id and versionstate='RELEASED') AND dvo.id=fm.datafile_id AND datafile_id=:fid") }) @Entity @Table(indexes = {@Index(columnList="ingeststatus") From b8d475e3137a0317ec95fa92e5de25d2e638f169 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 14:10:15 -0400 Subject: [PATCH 143/366] more query fixes --- src/main/java/edu/harvard/iq/dataverse/DataFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index 3119f5c8379..ef957f9330f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -50,7 +50,7 @@ @NamedQuery(name="DataFile.findDataFileThatReplacedId", query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier"), @NamedQuery(name="DataFile.fileMetadataInReleasedVersion", - query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetversion_id=(SELECT max(id) FROM DatasetVersion WHERE dataset_id=dvo.owner_id and versionstate='RELEASED') AND dvo.id=fm.datafile_id AND datafile_id=:fid") + query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetversion_id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset_id=dvo.owner_id and dv.versionstate='RELEASED') AND dvo.id=fm.datafile_id AND fm.datafile_id=:fid") }) @Entity @Table(indexes = {@Index(columnList="ingeststatus") From 313eb6e7d2e37d9a53ca98f12d0f79139e77d836 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 14:23:03 -0400 Subject: [PATCH 144/366] fix ids and versionState --- src/main/java/edu/harvard/iq/dataverse/DataFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index ef957f9330f..9e8ec789299 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -50,7 +50,7 @@ @NamedQuery(name="DataFile.findDataFileThatReplacedId", query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier"), @NamedQuery(name="DataFile.fileMetadataInReleasedVersion", - query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetversion_id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset_id=dvo.owner_id and dv.versionstate='RELEASED') AND dvo.id=fm.datafile_id AND fm.datafile_id=:fid") + query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetversion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState='RELEASED') AND dvo.id=fm.datafile.id AND fm.datafile.id=:fid") }) @Entity @Table(indexes = {@Index(columnList="ingeststatus") From 5e71b0be266f3086fbacc1a62f87aac204b953d7 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 14:31:10 -0400 Subject: [PATCH 145/366] more capitalization --- src/main/java/edu/harvard/iq/dataverse/DataFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index 9e8ec789299..900088b1526 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -50,7 +50,7 @@ @NamedQuery(name="DataFile.findDataFileThatReplacedId", query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier"), @NamedQuery(name="DataFile.fileMetadataInReleasedVersion", - query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetversion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState='RELEASED') AND dvo.id=fm.datafile.id AND fm.datafile.id=:fid") + query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetVersion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState='RELEASED') AND dvo.id=fm.dataFile.id AND fm.dataFile.id=:fid") }) @Entity @Table(indexes = {@Index(columnList="ingeststatus") From ce11aeab59527b620d7e3ff40bfa2af4568da9e6 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 14:45:36 -0400 Subject: [PATCH 146/366] use released enum --- src/main/java/edu/harvard/iq/dataverse/DataFile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index 900088b1526..4f62dd1483a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -50,7 +50,7 @@ @NamedQuery(name="DataFile.findDataFileThatReplacedId", query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier"), @NamedQuery(name="DataFile.fileMetadataInReleasedVersion", - query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetVersion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState='RELEASED') AND dvo.id=fm.dataFile.id AND fm.dataFile.id=:fid") + query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetVersion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState=edu.harvard.iq.dataverse.DatasetVersion.VersionState.RELEASED) AND dvo.id=fm.dataFile.id AND fm.dataFile.id=:fid") }) @Entity @Table(indexes = {@Index(columnList="ingeststatus") From 1c738d2956d20629ae97a87e9500a2f56b9f2d20 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 16:48:35 -0400 Subject: [PATCH 147/366] use native query --- .../java/edu/harvard/iq/dataverse/DvObjectServiceBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java index bd7fbeaff10..44401c45deb 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java @@ -82,8 +82,8 @@ public List findByAuthenticatedUserId(AuthenticatedUser user) { return query.getResultList(); } - public boolean checkExists(Long id) { - Query query = em.createNamedQuery("DvObject.checkExists"); + public String getDtype(Long id) { + Query query = em.createNativeQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=:id"); query.setParameter("id", id); Long result =(Long)query.getSingleResult(); return result > 0; From 2e896bfe543581eb124e0012188aa725fd19233d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 15:45:21 -0400 Subject: [PATCH 148/366] drop redundant db access --- .../iq/dataverse/search/IndexServiceBean.java | 73 +++++++++---------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index 9f9ed2d7637..4a43cedf7bf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -2220,49 +2220,48 @@ public List findPermissionsInSolrOnly() throws SearchException { SolrDocumentList list = rsp.getResults(); for (SolrDocument doc: list) { long id = Long.parseLong((String) doc.getFieldValue(SearchFields.DEFINITION_POINT_DVOBJECT_ID)); - String docId = (String)doc.getFieldValue(SearchFields.ID); - if(!dvObjectService.checkExists(id)) { + String docId = (String) doc.getFieldValue(SearchFields.ID); + DvObject obj = dvObjectService.findDvObject(id); + if (obj == null) { permissionInSolrOnly.add(docId); - } else { - DvObject obj = dvObjectService.findDvObject(id); - if (obj instanceof Dataset d) { - DatasetVersion dv = d.getLatestVersion(); - if (docId.endsWith("draft_permission")) { - if (!dv.isDraft()) { - permissionInSolrOnly.add(docId); - } - } else if (docId.endsWith("deaccessioned_permission")) { - if (!dv.isDeaccessioned()) { - permissionInSolrOnly.add(docId); - } - } else { - if (d.getReleasedVersion() == null) { - permissionInSolrOnly.add(docId); - } + } + if (obj instanceof Dataset d) { + DatasetVersion dv = d.getLatestVersion(); + if (docId.endsWith("draft_permission")) { + if (!dv.isDraft()) { + permissionInSolrOnly.add(docId); } - } else if (obj instanceof DataFile f) { - List states = dataFileService.findVersionStates(f.getId()); - Set strings = states.stream().map(VersionState::toString).collect(Collectors.toSet()); - logger.fine("States for " + docId + ": " + String.join(", ", strings)); - if (docId.endsWith("draft_permission")) { - if (!states.contains(VersionState.DRAFT)) { - permissionInSolrOnly.add(docId); - } - } else if (docId.endsWith("deaccessioned_permission")) { - if (!states.contains(VersionState.DEACCESSIONED) && states.size() == 1) { - permissionInSolrOnly.add(docId); - } + } else if (docId.endsWith("deaccessioned_permission")) { + if (!dv.isDeaccessioned()) { + permissionInSolrOnly.add(docId); + } + } else { + if (d.getReleasedVersion() == null) { + permissionInSolrOnly.add(docId); + } + } + } else if (obj instanceof DataFile f) { + List states = dataFileService.findVersionStates(f.getId()); + Set strings = states.stream().map(VersionState::toString).collect(Collectors.toSet()); + logger.fine("States for " + docId + ": " + String.join(", ", strings)); + if (docId.endsWith("draft_permission")) { + if (!states.contains(VersionState.DRAFT)) { + permissionInSolrOnly.add(docId); + } + } else if (docId.endsWith("deaccessioned_permission")) { + if (!states.contains(VersionState.DEACCESSIONED) && states.size() == 1) { + permissionInSolrOnly.add(docId); + } + } else { + if (!states.contains(VersionState.RELEASED)) { + permissionInSolrOnly.add(docId); } else { - if (!states.contains(VersionState.RELEASED)) { + if (!dataFileService.isInReleasedVersion(f.getId())) { + logger.fine("Adding doc " + docId + " to list of permissions in Solr only"); permissionInSolrOnly.add(docId); - } else { - if(!dataFileService.isInReleasedVersion(f.getId())) { - logger.fine("Adding doc " + docId + " to list of permissions in Solr only"); - permissionInSolrOnly.add(docId); - } } - } + } } } From 756bb98657d5fdb601943a8ff18e61464c9aebf8 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 16:26:50 -0400 Subject: [PATCH 149/366] more optimization --- .../iq/dataverse/DatasetServiceBean.java | 12 ++++++ .../edu/harvard/iq/dataverse/DvObject.java | 2 - .../iq/dataverse/DvObjectServiceBean.java | 11 +++-- .../iq/dataverse/search/IndexServiceBean.java | 42 ++++++++++--------- 4 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java index dab0ff43fcf..5caee817361 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java @@ -1070,4 +1070,16 @@ public void deleteHarvestedDataset(Dataset dataset, DataverseRequest request, Lo } } + public List getVersionStates(long id) { + try { + Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=:id)"); + query.setParameter("id",id); + return (List) query.getResultList(); + + } catch (Exception ex) { + logger.log(Level.WARNING, "exception trying to get versionstate of latest version of dataset " + id + ": {0}", ex); + return null; + } + } + } diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObject.java b/src/main/java/edu/harvard/iq/dataverse/DvObject.java index cc5d7620969..a4882f772d6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DvObject.java +++ b/src/main/java/edu/harvard/iq/dataverse/DvObject.java @@ -24,8 +24,6 @@ query = "SELECT o FROM DvObject o ORDER BY o.id"), @NamedQuery(name = "DvObject.findById", query = "SELECT o FROM DvObject o WHERE o.id=:id"), - @NamedQuery(name = "DvObject.checkExists", - query = "SELECT count(o) from DvObject o WHERE o.id=:id"), @NamedQuery(name = "DvObject.ownedObjectsById", query="SELECT COUNT(obj) FROM DvObject obj WHERE obj.owner.id=:id"), @NamedQuery(name = "DvObject.findByGlobalId", diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java index 44401c45deb..9ef9d244463 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java @@ -83,11 +83,14 @@ public List findByAuthenticatedUserId(AuthenticatedUser user) { } public String getDtype(Long id) { - Query query = em.createNativeQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=:id"); + Query query = em.createQuery("SELECT dtype FROM dvobject WHERE id=:id"); query.setParameter("id", id); - Long result =(Long)query.getSingleResult(); - return result > 0; - } + try { + return (String) query.getSingleResult(); + } catch (NoResultException e) { + return null; + } + } public DvObject findByGlobalId(String globalIdString, DvObject.DType dtype) { try { diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index 4a43cedf7bf..d74159bcafa 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -2,6 +2,7 @@ import edu.harvard.iq.dataverse.*; import edu.harvard.iq.dataverse.DatasetVersion.VersionState; +import edu.harvard.iq.dataverse.DvObject.DType; import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean; import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean; import edu.harvard.iq.dataverse.batch.util.LoggingUtil; @@ -2221,27 +2222,30 @@ public List findPermissionsInSolrOnly() throws SearchException { for (SolrDocument doc: list) { long id = Long.parseLong((String) doc.getFieldValue(SearchFields.DEFINITION_POINT_DVOBJECT_ID)); String docId = (String) doc.getFieldValue(SearchFields.ID); - DvObject obj = dvObjectService.findDvObject(id); - if (obj == null) { + String dtype = dvObjectService.getDtype(id); + if (dtype == null) { permissionInSolrOnly.add(docId); } - if (obj instanceof Dataset d) { - DatasetVersion dv = d.getLatestVersion(); - if (docId.endsWith("draft_permission")) { - if (!dv.isDraft()) { - permissionInSolrOnly.add(docId); - } - } else if (docId.endsWith("deaccessioned_permission")) { - if (!dv.isDeaccessioned()) { - permissionInSolrOnly.add(docId); - } - } else { - if (d.getReleasedVersion() == null) { - permissionInSolrOnly.add(docId); + if (dtype.equals(DType.Dataset.getDType())) { + List states = datasetService.getVersionStates(id); + if (states != null) { + String latestState = states.get(states.size() - 1); + if (docId.endsWith("draft_permission")) { + if (!latestState.equals(VersionState.DRAFT.toString())) { + permissionInSolrOnly.add(docId); + } + } else if (docId.endsWith("deaccessioned_permission")) { + if (!latestState.equals(VersionState.DEACCESSIONED.toString())) { + permissionInSolrOnly.add(docId); + } + } else { + if (!states.contains(VersionState.RELEASED.toString())) { + permissionInSolrOnly.add(docId); + } } } - } else if (obj instanceof DataFile f) { - List states = dataFileService.findVersionStates(f.getId()); + } else if (dtype.equals(DType.DataFile.getDType())) { + List states = dataFileService.findVersionStates(id); Set strings = states.stream().map(VersionState::toString).collect(Collectors.toSet()); logger.fine("States for " + docId + ": " + String.join(", ", strings)); if (docId.endsWith("draft_permission")) { @@ -2256,7 +2260,7 @@ public List findPermissionsInSolrOnly() throws SearchException { if (!states.contains(VersionState.RELEASED)) { permissionInSolrOnly.add(docId); } else { - if (!dataFileService.isInReleasedVersion(f.getId())) { + if (!dataFileService.isInReleasedVersion(id)) { logger.fine("Adding doc " + docId + " to list of permissions in Solr only"); permissionInSolrOnly.add(docId); } @@ -2306,7 +2310,7 @@ private List findDvObjectInSolrOnly(String type) throws SearchException if (idObject != null) { try { long id = (Long) idObject; - if (!dvObjectService.checkExists(id)) { + if (dvObjectService.getDtype(id) == null) { dvObjectInSolrOnly.add((String)doc.getFieldValue(SearchFields.ID)); } } catch (ClassCastException ex) { From dca298e39df4f4a127a12088dfe653eb8cfe690f Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 16:34:53 -0400 Subject: [PATCH 150/366] force ordering, fix --- .../java/edu/harvard/iq/dataverse/DatasetServiceBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java index 5caee817361..de950e87dfd 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java @@ -1072,12 +1072,12 @@ public void deleteHarvestedDataset(Dataset dataset, DataverseRequest request, Lo public List getVersionStates(long id) { try { - Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=:id)"); + Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=:id ORDER BY id)"); query.setParameter("id",id); return (List) query.getResultList(); } catch (Exception ex) { - logger.log(Level.WARNING, "exception trying to get versionstate of latest version of dataset " + id + ": {0}", ex); + logger.log(Level.WARNING, "exception trying to get versionstates of dataset " + id + ": {0}", ex); return null; } } From 57c3cd072d51d63561b7d63c541286b2ae2ae82d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 16:37:07 -0400 Subject: [PATCH 151/366] fix dtype query --- src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java index 9ef9d244463..04cc2297188 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java @@ -83,7 +83,7 @@ public List findByAuthenticatedUserId(AuthenticatedUser user) { } public String getDtype(Long id) { - Query query = em.createQuery("SELECT dtype FROM dvobject WHERE id=:id"); + Query query = em.createQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=:id"); query.setParameter("id", id); try { return (String) query.getSingleResult(); From 2fe440b6656161fc02a394eca752d75aa22d8cd1 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 16:48:35 -0400 Subject: [PATCH 152/366] use native query --- src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java index 04cc2297188..b7dae3245fd 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java @@ -83,7 +83,7 @@ public List findByAuthenticatedUserId(AuthenticatedUser user) { } public String getDtype(Long id) { - Query query = em.createQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=:id"); + Query query = em.createNativeQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=:id"); query.setParameter("id", id); try { return (String) query.getSingleResult(); From 2f60f08da080cfa9a03428b354bd1203e254887d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 16:54:46 -0400 Subject: [PATCH 153/366] increase rows to 1K --- .../java/edu/harvard/iq/dataverse/search/IndexServiceBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index d74159bcafa..c1e853ab492 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -2209,7 +2209,7 @@ public List findPermissionsInSolrOnly() throws SearchException { logger.info("Checking for solr-only permissions"); List permissionInSolrOnly = new ArrayList<>(); try { - int rows = 100; + int rows = 1000; SolrQuery q = (new SolrQuery(SearchFields.DEFINITION_POINT_DVOBJECT_ID+":*")).setRows(rows).setSort(SortClause.asc(SearchFields.ID)); String cursorMark = CursorMarkParams.CURSOR_MARK_START; boolean done = false; From 97cae0237419bdd80b75838c2e8f3a479b55db8d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 17:00:19 -0400 Subject: [PATCH 154/366] use ? in native queries --- .../java/edu/harvard/iq/dataverse/DatasetServiceBean.java | 4 ++-- .../java/edu/harvard/iq/dataverse/DvObjectServiceBean.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java index de950e87dfd..1905103d760 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java @@ -1072,8 +1072,8 @@ public void deleteHarvestedDataset(Dataset dataset, DataverseRequest request, Lo public List getVersionStates(long id) { try { - Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=:id ORDER BY id)"); - query.setParameter("id",id); + Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=? ORDER BY id)"); + query.setParameter(1, id); return (List) query.getResultList(); } catch (Exception ex) { diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java index b7dae3245fd..dc3393d82f5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DvObjectServiceBean.java @@ -83,8 +83,8 @@ public List findByAuthenticatedUserId(AuthenticatedUser user) { } public String getDtype(Long id) { - Query query = em.createNativeQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=:id"); - query.setParameter("id", id); + Query query = em.createNativeQuery("SELECT dvo.dtype FROM dvobject dvo WHERE dvo.id=?"); + query.setParameter(1, id); try { return (String) query.getSingleResult(); } catch (NoResultException e) { From d947ee5407b63d5e6d834aed1c914ffd3ecf37f5 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 17:10:10 -0400 Subject: [PATCH 155/366] typo --- src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java index 1905103d760..bc15813a98e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java @@ -1072,7 +1072,7 @@ public void deleteHarvestedDataset(Dataset dataset, DataverseRequest request, Lo public List getVersionStates(long id) { try { - Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=? ORDER BY id)"); + Query query = em.createNativeQuery("SELECT dv.versionState FROM datasetversion dv WHERE dataset_id=? ORDER BY id"); query.setParameter(1, id); return (List) query.getResultList(); From d0daebd3b67da1686290fad97998c1ea411412e7 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 28 Jun 2024 15:26:07 -0400 Subject: [PATCH 156/366] use native --- src/main/java/edu/harvard/iq/dataverse/DataFile.java | 4 +--- .../java/edu/harvard/iq/dataverse/DataFileServiceBean.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index 4f62dd1483a..29a4a14c021 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -48,9 +48,7 @@ @NamedQuery(name="DataFile.findDataFileByIdProtocolAuth", query="SELECT s FROM DataFile s WHERE s.identifier=:identifier AND s.protocol=:protocol AND s.authority=:authority"), @NamedQuery(name="DataFile.findDataFileThatReplacedId", - query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier"), - @NamedQuery(name="DataFile.fileMetadataInReleasedVersion", - query="SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetVersion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState=edu.harvard.iq.dataverse.DatasetVersion.VersionState.RELEASED) AND dvo.id=fm.dataFile.id AND fm.dataFile.id=:fid") + query="SELECT s.id FROM DataFile s WHERE s.previousDataFileId=:identifier") }) @Entity @Table(indexes = {@Index(columnList="ingeststatus") diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java index b131c9d2818..8d7f8aade1d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java @@ -1415,7 +1415,7 @@ public UploadSessionQuotaLimit getUploadSessionQuotaLimit(DvObjectContainer pare } public boolean isInReleasedVersion(Long id) { - Query query = em.createNamedQuery("DataFile.fileMetadataInReleasedVersion"); + Query query = em.createQuery("SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetVersion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState=edu.harvard.iq.dataverse.DatasetVersion.VersionState.RELEASED) AND dvo.id=fm.dataFile.id AND fm.dataFile.id=:fid"); query.setParameter("fid", id); try { From 7b57505a347e0a3ab4915d9bb83f33157c3dd64b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Sat, 20 Jul 2024 16:27:54 -0400 Subject: [PATCH 157/366] info->fine --- .../java/edu/harvard/iq/dataverse/search/IndexServiceBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index c1e853ab492..1caa1934f15 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -2217,7 +2217,7 @@ public List findPermissionsInSolrOnly() throws SearchException { q.set(CursorMarkParams.CURSOR_MARK_PARAM, cursorMark); QueryResponse rsp = solrServer.query(q); String nextCursorMark = rsp.getNextCursorMark(); - logger.info("Next cursor mark: " + nextCursorMark); + logger.fine("Next cursor mark (1K entries): " + nextCursorMark); SolrDocumentList list = rsp.getResults(); for (SolrDocument doc: list) { long id = Long.parseLong((String) doc.getFieldValue(SearchFields.DEFINITION_POINT_DVOBJECT_ID)); From 6c87b9e1cca70525b7a26a69ae74f5109466314c Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 5 Jul 2024 15:48:43 -0400 Subject: [PATCH 158/366] fix ROR identification --- .../harvard/iq/dataverse/ExternalIdentifier.java | 4 +++- .../pidproviders/doi/XmlMetadataTemplate.java | 15 +++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalIdentifier.java b/src/main/java/edu/harvard/iq/dataverse/ExternalIdentifier.java index 0b7285c017e..8c4fb6b1325 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ExternalIdentifier.java +++ b/src/main/java/edu/harvard/iq/dataverse/ExternalIdentifier.java @@ -12,7 +12,9 @@ public enum ExternalIdentifier { GND("GND", "https://d-nb.info/gnd/%s", "^1[01]?\\d{7}[0-9X]|[47]\\d{6}-\\d|[1-9]\\d{0,7}-[0-9X]|3\\d{7}[0-9X]$"), // note: DAI is missing from this list, because it doesn't have resolvable URL ResearcherID("ResearcherID", "https://publons.com/researcher/%s/", "^[A-Z\\d][A-Z\\d-]+[A-Z\\d]$"), - ScopusID("ScopusID", "https://www.scopus.com/authid/detail.uri?authorId=%s", "^\\d*$"); + ScopusID("ScopusID", "https://www.scopus.com/authid/detail.uri?authorId=%s", "^\\d*$"), + //Requiring ROR to be URL form as we use it where there is no id type field and matching any 9 digit number starting with 0 seems a bit aggressive + ROR("ROR", "https://ror.org/%s", "^(https:\\/\\/ror.org\\/)0[a-hj-km-np-tv-z|0-9]{6}[0-9]{2}$"); private String name; private String template; diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 14ffed91c36..8049ac1fe5f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -46,6 +46,7 @@ import edu.harvard.iq.dataverse.DatasetRelPublication; import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DvObject; +import edu.harvard.iq.dataverse.ExternalIdentifier; import edu.harvard.iq.dataverse.FileMetadata; import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.TermsOfUseAndAccess; @@ -262,10 +263,10 @@ public void writeCreators(XMLStreamWriter xmlw, List authorList, boolean nothingWritten = true; if (authorList != null && !authorList.isEmpty()) { for (DatasetAuthor author : authorList) { - String creatorName = StringEscapeUtils.escapeXml10(author.getName().getDisplayValue()); + String creatorName = author.getName().getDisplayValue(); String affiliation = null; - if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) { - affiliation = StringEscapeUtils.escapeXml10(author.getAffiliation().getDisplayValue()); + if (author.getAffiliation() != null && !author.getAffiliation().getValue().isEmpty()) { + affiliation = author.getAffiliation().getValue(); } String nameIdentifier = null; String nameIdentifierScheme = null; @@ -609,8 +610,14 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin } if (StringUtils.isNotBlank(affiliation)) { + boolean isROR=false; + ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR; + if (externalIdentifier.isValidIdentifier(affiliation)) { + isROR=true; + } + attributeMap.clear(); - if (affiliation.startsWith("https://ror.org/")) { + if (isROR) { attributeMap.put("schemeURI", "https://ror.org"); attributeMap.put("affiliationIdentifierScheme", "ROR"); From 182cfdd7cc93452fdf822c1ad5907271fd9dca4c Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 9 Jul 2024 15:23:38 -0400 Subject: [PATCH 159/366] passthrough for ext cvv/ROR affiliation update --- .../pidproviders/PidProviderFactoryBean.java | 9 ++++++++ .../pidproviders/doi/XmlMetadataTemplate.java | 22 ++++++++++++++++++- .../doi/datacite/DataCiteDOIProvider.java | 6 +++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java index 40044408c63..2e3b96b2dd7 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java @@ -23,9 +23,11 @@ import jakarta.ejb.Singleton; import jakarta.ejb.Startup; import jakarta.inject.Inject; +import jakarta.json.JsonObject; import edu.harvard.iq.dataverse.settings.JvmSettings; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; import edu.harvard.iq.dataverse.util.SystemConfig; +import edu.harvard.iq.dataverse.DatasetFieldServiceBean; import edu.harvard.iq.dataverse.DataverseServiceBean; import edu.harvard.iq.dataverse.DvObjectServiceBean; import edu.harvard.iq.dataverse.GlobalId; @@ -58,6 +60,9 @@ public class PidProviderFactoryBean { protected DvObjectServiceBean dvObjectService; @Inject SystemConfig systemConfig; + //QDR - adding to support use of ExternalVocabularyValues in DataCite provider/ DataCite XML generation + @EJB + DatasetFieldServiceBean datasetFieldServiceBean; private ServiceLoader loader; private Map pidProviderFactoryMap = new HashMap<>(); @@ -247,4 +252,8 @@ public PidProvider getDefaultPidGenerator() { return PidUtil.getPidProvider(protocol, authority, shoulder); } } + + public JsonObject getExternalVocabularyValue(String name) { + return datasetFieldServiceBean.getExternalVocabularyValue(name); + } } \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 8049ac1fe5f..1544dcd1373 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -58,8 +58,10 @@ import edu.harvard.iq.dataverse.export.DDIExporter; import edu.harvard.iq.dataverse.license.License; import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; +import edu.harvard.iq.dataverse.pidproviders.PidProvider; import edu.harvard.iq.dataverse.pidproviders.PidUtil; import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider; import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider; import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider; import edu.harvard.iq.dataverse.util.BundleUtil; @@ -79,6 +81,8 @@ public class XmlMetadataTemplate { public static final String XML_SCHEMA_VERSION = "4.5"; private DoiMetadata doiMetadata; + //QDR - used to get ROR name from ExternalVocabularyValue via pidProvider.get + private PidProvider pidProvider = null; public XmlMetadataTemplate() { } @@ -105,6 +109,14 @@ private void generateXML(DvObject dvObject, OutputStream outputStream) throws XM // Could/should use dataset metadata language for metadata from DvObject itself? String language = null; // machine locale? e.g. for Publisher which is global String metadataLanguage = null; // when set, otherwise = language? + + //QDR - used to get ROR name from ExternalVocabularyValue via pidProvider.get + GlobalId pid = null; + pid = dvObject.getGlobalId(); + if ((pid == null) && (dvObject instanceof DataFile df)) { + pid = df.getOwner().getGlobalId(); + } + pidProvider = PidUtil.getPidProvider(pid.getProviderId()); XMLStreamWriter xmlw = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStream); xmlw.writeStartElement("resource"); boolean deaccessioned=false; @@ -611,9 +623,16 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin if (StringUtils.isNotBlank(affiliation)) { boolean isROR=false; + String orgName = affiliation; ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR; if (externalIdentifier.isValidIdentifier(affiliation)) { isROR=true; + if(pidProvider instanceof DataCiteDOIProvider dcProvider) { + JsonObject jo = dcProvider.getExternalVocabularyValue(affiliation); + if(jo!=null) { + orgName = jo.getString("termName"); + } + } } attributeMap.clear(); @@ -621,8 +640,9 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin attributeMap.put("schemeURI", "https://ror.org"); attributeMap.put("affiliationIdentifierScheme", "ROR"); + attributeMap.put("affiliationIdentifier", affiliation); } - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(affiliation)); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(orgName)); } xmlw.writeEndElement(); } diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java index cd765933796..0250266bbdd 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java @@ -17,6 +17,8 @@ import edu.harvard.iq.dataverse.FileMetadata; import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; +import jakarta.json.JsonObject; + import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpStatus; @@ -339,5 +341,9 @@ public boolean updateIdentifier(DvObject dvObject) { return false; } } + + public JsonObject getExternalVocabularyValue(String name) { + return pidProviderService.getExternalVocabularyValue(name); + } } From e2b88ca58e3f119b745cfea4a80bf8f27a137853 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 5 Jul 2024 15:49:29 -0400 Subject: [PATCH 160/366] Merge branch 'datacite_xml_improvements' into datacite_plus_relPubRelType --- src/main/webapp/dataset.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 4a952aa0412..4ed53e53208 100644 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -631,6 +631,7 @@ or !empty DatasetPage.datasetVersionUI.keywordDisplay or !empty DatasetPage.datasetVersionUI.subject.value or !empty DatasetPage.datasetVersionUI.relPublicationCitation + or !empty DatasetPage.datasetVersionUI.relPublicationUrl or !empty DatasetPage.datasetVersionUI.notes.value) and !empty DatasetPage.datasetSummaryFields}"> From 2124ce685a470a919663141bd763600e99974229 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 5 Jul 2024 16:05:14 -0400 Subject: [PATCH 161/366] add relation type values --- src/main/java/propertyFiles/citation.properties | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index a52a599cff3..69f01769b39 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -273,6 +273,12 @@ controlledvocabulary.publicationIDType.upc=upc controlledvocabulary.publicationIDType.url=url controlledvocabulary.publicationIDType.urn=urn controlledvocabulary.publicationIDType.dash-nrs=DASH-NRS +controlledVocabulary.publicationRelationType.IsCitedBy=Is Cited By +controlledVocabulary.publicationRelationType.Cites=Cites +controlledVocabulary.publicationRelationType.IsSupplementTo=Is Supplement To +controlledVocabulary.publicationRelationType.IsSupplementedBy=Is Supplemented By +controlledVocabulary.publicationRelationType.IsReferencedBy=Is Referenced By +controlledVocabulary.publicationRelationType.References=References controlledvocabulary.contributorType.data_collector=Data Collector controlledvocabulary.contributorType.data_curator=Data Curator controlledvocabulary.contributorType.data_manager=Data Manager From 6e1919aaafe527f8f99c8302d9d0f713d51243fa Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 8 Jul 2024 09:31:10 -0400 Subject: [PATCH 162/366] fix case --- src/main/java/propertyFiles/citation.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 69f01769b39..1b65b5d391e 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -273,12 +273,12 @@ controlledvocabulary.publicationIDType.upc=upc controlledvocabulary.publicationIDType.url=url controlledvocabulary.publicationIDType.urn=urn controlledvocabulary.publicationIDType.dash-nrs=DASH-NRS -controlledVocabulary.publicationRelationType.IsCitedBy=Is Cited By -controlledVocabulary.publicationRelationType.Cites=Cites -controlledVocabulary.publicationRelationType.IsSupplementTo=Is Supplement To -controlledVocabulary.publicationRelationType.IsSupplementedBy=Is Supplemented By -controlledVocabulary.publicationRelationType.IsReferencedBy=Is Referenced By -controlledVocabulary.publicationRelationType.References=References +controlledVocabulary.publicationRelationType.iscitedby=Is Cited By +controlledVocabulary.publicationRelationType.cites=Cites +controlledVocabulary.publicationRelationType.issupplementto=Is Supplement To +controlledVocabulary.publicationRelationType.issupplementedby=Is Supplemented By +controlledVocabulary.publicationRelationType.isreferencedby=Is Referenced By +controlledVocabulary.publicationRelationType.references=References controlledvocabulary.contributorType.data_collector=Data Collector controlledvocabulary.contributorType.data_curator=Data Curator controlledvocabulary.contributorType.data_manager=Data Manager From 65ec69f97c74078e4db5d7194e1a5fd6a99f9b50 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 5 Aug 2024 17:17:31 -0400 Subject: [PATCH 163/366] a quick experimental AddReplaceFileHelper implementation of adding Globus-uploaded files #10623 --- .../iq/dataverse/EditDatafilesPage.java | 8 ++- .../dataverse/globus/GlobusServiceBean.java | 51 ++++++++++++++----- 2 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java index 993cb02b66b..99a44058809 100644 --- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java @@ -2121,8 +2121,12 @@ public void handleFileUpload(FileUploadEvent event) throws IOException { } /** - * Using information from the DropBox choose, ingest the chosen files - * https://www.dropbox.com/developers/dropins/chooser/js + * External, aka "Direct" Upload. + * The file(s) have been uploaded to physical storage (such as S3) directly, + * this call is to create and add the DataFiles to the Dataset on the Dataverse + * side. The method does NOT finalize saving the datafiles in the database - + * that will happen when the user clicks 'Save', similar to how the "normal" + * uploads are handled. * * @param event */ diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index fb50214c259..02bc4667ea6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -61,6 +61,9 @@ import edu.harvard.iq.dataverse.dataaccess.DataAccess; import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore; import edu.harvard.iq.dataverse.dataaccess.StorageIO; +import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper; +import edu.harvard.iq.dataverse.engine.command.DataverseRequest; +import edu.harvard.iq.dataverse.ingest.IngestServiceBean; import edu.harvard.iq.dataverse.privateurl.PrivateUrl; import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean; import edu.harvard.iq.dataverse.settings.JvmSettings; @@ -70,6 +73,7 @@ import edu.harvard.iq.dataverse.util.URLTokenUtil; import edu.harvard.iq.dataverse.util.UrlSignerUtil; import edu.harvard.iq.dataverse.util.json.JsonUtil; +import jakarta.ws.rs.core.Response; @Stateless @Named("GlobusServiceBean") @@ -81,6 +85,8 @@ public class GlobusServiceBean implements java.io.Serializable { protected SettingsServiceBean settingsSvc; @Inject DataverseSession session; + @Inject + DataverseRequestServiceBean dataverseRequestSvc; @EJB protected AuthenticationServiceBean authSvc; @EJB @@ -92,7 +98,13 @@ public class GlobusServiceBean implements java.io.Serializable { @EJB FileDownloadServiceBean fileDownloadService; @EJB - DataFileServiceBean dataFileService; + DataFileServiceBean dataFileSvc; + @EJB + PermissionServiceBean permissionSvc; + @EJB + IngestServiceBean ingestSvc; + @EJB + SystemConfig systemConfig; private static final Logger logger = Logger.getLogger(GlobusServiceBean.class.getCanonicalName()); private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss"); @@ -764,7 +776,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S JsonArray newfilesJsonArray = newfilesJsonObject.getJsonArray("files"); logger.fine("Size: " + newfilesJsonArray.size()); logger.fine("Val: " + JsonUtil.prettyPrint(newfilesJsonArray.getJsonObject(0))); - JsonArrayBuilder jsonDataSecondAPI = Json.createArrayBuilder(); + JsonArrayBuilder addFilesJsonData = Json.createArrayBuilder(); for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) { @@ -790,7 +802,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S path = Json.createPatchBuilder() .add("/mimeType", newfileJsonObject.get(0).getString("mime")).build(); fileJsonObject = path.apply(fileJsonObject); - jsonDataSecondAPI.add(fileJsonObject); + addFilesJsonData.add(fileJsonObject); countSuccess++; // } else { // globusLogger.info(fileName @@ -805,20 +817,32 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S } } - String newjsonData = jsonDataSecondAPI.build().toString(); + String newjsonData = addFilesJsonData.build().toString(); - globusLogger.info("Successfully generated new JsonData for Second API call"); + globusLogger.info("Successfully generated new JsonData for addFiles call"); - String command = "curl -H \"X-Dataverse-key:" + token.getTokenString() + "\" -X POST " + /*String command = "curl -H \"X-Dataverse-key:" + token.getTokenString() + "\" -X POST " + httpRequestUrl + "/api/datasets/:persistentId/addFiles?persistentId=doi:" + datasetIdentifier + " -F jsonData='" + newjsonData + "'"; - System.out.println("*******====command ==== " + command); + System.out.println("*******====command ==== " + command);*/ // ToDo - refactor to call AddReplaceFileHelper.addFiles directly instead of // calling API - - String output = addFilesAsync(command, globusLogger); - if (output.equalsIgnoreCase("ok")) { + + // a quick experimental AddReplaceFileHelper implementation: + AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper( + dataverseRequestSvc.getDataverseRequest(), + this.ingestSvc, + this.datasetSvc, + this.dataFileSvc, + this.permissionSvc, + this.commandEngine, + this.systemConfig + ); + + Response addFilesResponse = addFileHelper.addFiles(newjsonData, dataset, authUser); + + if (Response.Status.OK.equals(addFilesResponse.getStatusInfo())) { // if(!taskSkippedFiles) if (countError == 0) { userNotificationService.sendNotification((AuthenticatedUser) authUser, @@ -830,10 +854,10 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(), countSuccess + " files added out of " + countAll, true); } - globusLogger.info("Successfully completed api/datasets/:persistentId/addFiles call "); + globusLogger.info("Successfully completed addFiles call "); } else { globusLogger.log(Level.SEVERE, - "******* Error while executing api/datasets/:persistentId/add call ", command); + "******* Error while executing addFiles ", newjsonData); } } @@ -848,6 +872,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S e.printStackTrace(); globusLogger.info("Exception from globusUpload call " + e.getMessage()); datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress); + // } } if (ruleId != null) { @@ -1261,7 +1286,7 @@ public void writeGuestbookAndStartTransfer(GuestbookResponse guestbookResponse, Long fileId = Long.parseLong(idAsString); // If we need to create a GuestBookResponse record, we have to // look up the DataFile object for this file: - df = dataFileService.findCheapAndEasy(fileId); + df = dataFileSvc.findCheapAndEasy(fileId); selectedFiles.add(df); if (!doNotSaveGuestbookResponse) { guestbookResponse.setDataFile(df); From 04951609c20f954573eb1d50eebe8ef08d464ed8 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 6 Aug 2024 16:40:59 -0400 Subject: [PATCH 164/366] no need to try to calculate checksums if this globus storage isn't dataverse-accessible. #10623 --- .../dataverse/globus/GlobusServiceBean.java | 41 +++++++++++-------- .../timer/DataverseTimerServiceBean.java | 4 +- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 02bc4667ea6..d6b56b51fa5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -1160,25 +1160,30 @@ private FileDetailsHolder calculateDetails(String id, Logger globusLogger) // ToDo: what if the file does not exist in s3 // ToDo: what if checksum calculation failed - do { - try { - StorageIO dataFileStorageIO = DataAccess.getDirectStorageIO(fullPath); - in = dataFileStorageIO.getInputStream(); - checksumVal = FileUtil.calculateChecksum(in, DataFile.ChecksumType.MD5); - count = 3; - } catch (IOException ioex) { - count = 3; - logger.fine(ioex.getMessage()); - globusLogger.info( - "DataFile (fullPath " + fullPath + ") does not appear to be accessible within Dataverse: "); - } catch (Exception ex) { - count = count + 1; - ex.printStackTrace(); - logger.info(ex.getMessage()); - Thread.sleep(5000); - } + String storageDriverId = DataAccess.getDriverIdAndStorageLocation(fullPath)[0]; - } while (count < 3); + if (StorageIO.isDataverseAccessible(storageDriverId)) { + do { + try { + StorageIO dataFileStorageIO = DataAccess.getDirectStorageIO(fullPath); + in = dataFileStorageIO.getInputStream(); + checksumVal = FileUtil.calculateChecksum(in, DataFile.ChecksumType.MD5); + count = 3; + } catch (IOException ioex) { + count = 3; + logger.fine(ioex.getMessage()); + globusLogger.info( + "DataFile (fullPath " + fullPath + ") does not appear to be accessible within Dataverse: "); + } catch (Exception ex) { + count = count + 1; + ex.printStackTrace(); + logger.info(ex.getMessage()); + Thread.sleep(5000); + } + + + } while (count < 3); + } if (checksumVal.length() == 0) { checksumVal = "Not available in Dataverse"; diff --git a/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java index 6eb3a8df0bc..a783b211b36 100644 --- a/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/timer/DataverseTimerServiceBean.java @@ -120,13 +120,13 @@ public void handleTimeout(jakarta.ejb.Timer timer) { } try { - logger.log(Level.INFO,"Handling timeout on " + InetAddress.getLocalHost().getCanonicalHostName()); + logger.log(Level.FINE,"Handling timeout on " + InetAddress.getLocalHost().getCanonicalHostName()); } catch (UnknownHostException ex) { Logger.getLogger(DataverseTimerServiceBean.class.getName()).log(Level.SEVERE, null, ex); } if (timer.getInfo() instanceof MotherTimerInfo) { - logger.info("Behold! I am the Master Timer, king of all timers! I'm here to create all the lesser timers!"); + logger.fine("Behold! I am the Master Timer, king of all timers! I'm here to create all the lesser timers!"); removeHarvestTimers(); for (HarvestingClient client : harvestingClientService.getAllHarvestingClients()) { createHarvestTimer(client); From ba661387bba24e770ae5c0f9cade3b64db7614f3 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 12 Aug 2024 10:43:45 -0400 Subject: [PATCH 165/366] more globus mods (work in progress). #10623 --- .../harvard/iq/dataverse/api/Datasets.java | 7 +- .../dataverse/globus/GlobusServiceBean.java | 485 +++++++++++------- .../{GlobusTask.java => GlobusTaskState.java} | 6 +- .../iq/dataverse/globus/GlobusUtil.java | 33 ++ .../dataverse/ingest/IngestServiceBean.java | 5 +- .../iq/dataverse/settings/FeatureFlags.java | 5 + .../iq/dataverse/util/SystemConfig.java | 9 + 7 files changed, 363 insertions(+), 187 deletions(-) rename src/main/java/edu/harvard/iq/dataverse/globus/{GlobusTask.java => GlobusTaskState.java} (93%) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index 4b919c5ed82..b93257bc0c3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -4009,6 +4009,7 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, logger.info(" ==== (api addGlobusFilesToDataset) jsonData ====== " + jsonData); if (!systemConfig.isHTTPUpload()) { + // @todo why isHTTPUpload()? - shouldn't it be checking isGlobusUpload() here? return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled")); } @@ -4075,7 +4076,11 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, String requestUrl = SystemConfig.getDataverseSiteUrlStatic(); // Async Call - globusService.globusUpload(jsonObject, token, dataset, requestUrl, authUser); + try { + globusService.globusUpload(jsonObject, token, dataset, requestUrl, authUser); + } catch (IllegalArgumentException ex) { + return badRequest("Invalid parameters: "+ex.getMessage()); + } return ok("Async call to Globus Upload started "); diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index d6b56b51fa5..eb1eb47611a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -22,7 +22,6 @@ import jakarta.json.JsonString; import jakarta.json.JsonValue.ValueType; import jakarta.json.stream.JsonParsingException; -import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.HttpMethod; import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json; @@ -33,7 +32,6 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLEncoder; import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.time.Duration; @@ -62,10 +60,10 @@ import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore; import edu.harvard.iq.dataverse.dataaccess.StorageIO; import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper; -import edu.harvard.iq.dataverse.engine.command.DataverseRequest; import edu.harvard.iq.dataverse.ingest.IngestServiceBean; import edu.harvard.iq.dataverse.privateurl.PrivateUrl; import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean; +import edu.harvard.iq.dataverse.settings.FeatureFlags; import edu.harvard.iq.dataverse.settings.JvmSettings; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; import edu.harvard.iq.dataverse.util.FileUtil; @@ -73,6 +71,8 @@ import edu.harvard.iq.dataverse.util.URLTokenUtil; import edu.harvard.iq.dataverse.util.UrlSignerUtil; import edu.harvard.iq.dataverse.util.json.JsonUtil; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import jakarta.ws.rs.core.Response; @Stateless @@ -105,6 +105,8 @@ public class GlobusServiceBean implements java.io.Serializable { IngestServiceBean ingestSvc; @EJB SystemConfig systemConfig; + @PersistenceContext(unitName = "VDCNet-ejbPU") + private EntityManager em; private static final Logger logger = Logger.getLogger(GlobusServiceBean.class.getCanonicalName()); private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss"); @@ -391,19 +393,33 @@ private void monitorTemporaryPermissions(String ruleId, long datasetId) { * @return * @throws MalformedURLException */ - public GlobusTask getTask(String accessToken, String taskId, Logger globusLogger) throws MalformedURLException { + public GlobusTaskState getTask(String accessToken, String taskId, Logger globusLogger) { - URL url = new URL("https://transfer.api.globusonline.org/v0.10/endpoint_manager/task/" + taskId); + Logger myLogger = globusLogger != null ? globusLogger : logger; + + URL url; + try { + url = new URL("https://transfer.api.globusonline.org/v0.10/endpoint_manager/task/" + taskId); + } catch (MalformedURLException mue) { + myLogger.warning("Malformed URL exception when trying to contact Globus. Globus API url: " + + "https://transfer.api.globusonline.org/v0.10/endpoint_manager/task/" + + taskId); + return null; + } MakeRequestResponse result = makeRequest(url, "Bearer", accessToken, "GET", null); - GlobusTask task = null; + GlobusTaskState task = null; if (result.status == 200) { - task = parseJson(result.jsonResponse, GlobusTask.class, false); + task = parseJson(result.jsonResponse, GlobusTaskState.class, false); } if (result.status != 200) { - globusLogger.warning("Cannot find information for the task " + taskId + " : Reason : " + // @todo It should probably retry it 2-3 times before giving up; + // similarly, it should probably differentiate between a "no such task" + // response and something intermittent like a server/network error or + // an expired token... i.e. something that's recoverable (?) + myLogger.warning("Cannot find information for the task " + taskId + " : Reason : " + result.jsonResponse.toString()); } @@ -646,11 +662,17 @@ private String getGlobusDownloadScript(Dataset dataset, ApiToken apiToken, List< @Asynchronous @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, String httpRequestUrl, - AuthenticatedUser authUser) throws ExecutionException, InterruptedException, MalformedURLException { + AuthenticatedUser authUser) throws IllegalArgumentException, ExecutionException, InterruptedException, MalformedURLException { - Integer countAll = 0; - Integer countSuccess = 0; - Integer countError = 0; + // Before we do anything else, let's do some basic validation of what + // we've been passed: + + JsonArray filesJsonArray = jsonData.getJsonArray("files"); + + if (filesJsonArray == null || filesJsonArray.size() < 1) { + throw new IllegalArgumentException("No valid json entries supplied for the files being uploaded"); + } + String logTimestamp = logFormatter.format(new Date()); Logger globusLogger = Logger.getLogger( "edu.harvard.iq.dataverse.upload.client.DatasetServiceBean." + "GlobusUpload" + logTimestamp); @@ -674,11 +696,13 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S } logger.fine("json: " + JsonUtil.prettyPrint(jsonData)); + + globusLogger.info("Globus upload initiated"); String taskIdentifier = jsonData.getString("taskIdentifier"); GlobusEndpoint endpoint = getGlobusEndpoint(dataset); - GlobusTask task = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger); + GlobusTaskState task = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger); String ruleId = getRuleId(endpoint, task.getOwner_id(), "rw"); logger.fine("Found rule: " + ruleId); if (ruleId != null) { @@ -688,15 +712,43 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S rulesCache.invalidate(ruleId); } } - + // Wait before first check Thread.sleep(5000); + + if (FeatureFlags.GLOBUS_USE_EXPERIMENTAL_ASYNC_FRAMEWORK.enabled()) { + + // Save the task information in the database so that the Globus monitoring + // service can continue checking on its progress. + + GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token, new Timestamp(new Date().getTime())); + em.persist(taskInProgress); + + // Save the metadata entries that define the files that are being uploaded + // in the database. These entries will be used once/if the uploads + // completes successfully to add the files to the dataset. + + for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) { + ExternalFileUploadInProgress fileUploadRecord = new ExternalFileUploadInProgress(taskIdentifier, fileJsonObject.toString()); + + em.persist(fileUploadRecord); + } + + return; + } + + + // the old implementation that relies on looping continuosly, + // sleeping-then-checking the task status repeatedly: + // globus task status check + // (the method below performs continuous looped checks of the remote + // Globus API, monitoring it for as long as it takes for the task to + // finish one way or another!) task = globusStatusCheck(endpoint, taskIdentifier, globusLogger); + // @todo null check, or make sure it's never null String taskStatus = getTaskStatus(task); - globusLogger.info("Starting a globusUpload "); - if (ruleId != null) { // Transfer is complete, so delete rule deletePermission(ruleId, dataset, globusLogger); @@ -739,138 +791,11 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S } else { try { - // - - List inputList = new ArrayList(); - JsonArray filesJsonArray = jsonData.getJsonArray("files"); - - if (filesJsonArray != null) { - String datasetIdentifier = dataset.getAuthorityForFileStorage() + "/" - + dataset.getIdentifierForFileStorage(); - - for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) { - - // storageIdentifier s3://gcs5-bucket1:1781cfeb8a7-748c270a227c from - // externalTool - String storageIdentifier = fileJsonObject.getString("storageIdentifier"); - String[] parts = DataAccess.getDriverIdAndStorageLocation(storageIdentifier); - String storeId = parts[0]; - // If this is an S3 store, we need to split out the bucket name - String[] bits = parts[1].split(":"); - String bucketName = ""; - if (bits.length > 1) { - bucketName = bits[0]; - } - String fileId = bits[bits.length - 1]; - - // fullpath s3://gcs5-bucket1/10.5072/FK2/3S6G2E/1781cfeb8a7-4ad9418a5873 - // or globus:///10.5072/FK2/3S6G2E/1781cfeb8a7-4ad9418a5873 - String fullPath = storeId + "://" + bucketName + "/" + datasetIdentifier + "/" + fileId; - String fileName = fileJsonObject.getString("fileName"); - - inputList.add(fileId + "IDsplit" + fullPath + "IDsplit" + fileName); - } - - // calculateMissingMetadataFields: checksum, mimetype - JsonObject newfilesJsonObject = calculateMissingMetadataFields(inputList, globusLogger); - JsonArray newfilesJsonArray = newfilesJsonObject.getJsonArray("files"); - logger.fine("Size: " + newfilesJsonArray.size()); - logger.fine("Val: " + JsonUtil.prettyPrint(newfilesJsonArray.getJsonObject(0))); - JsonArrayBuilder addFilesJsonData = Json.createArrayBuilder(); - - for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) { - - countAll++; - String storageIdentifier = fileJsonObject.getString("storageIdentifier"); - String fileName = fileJsonObject.getString("fileName"); - String[] parts = DataAccess.getDriverIdAndStorageLocation(storageIdentifier); - // If this is an S3 store, we need to split out the bucket name - String[] bits = parts[1].split(":"); - if (bits.length > 1) { - } - String fileId = bits[bits.length - 1]; - - List newfileJsonObject = IntStream.range(0, newfilesJsonArray.size()) - .mapToObj(index -> ((JsonObject) newfilesJsonArray.get(index)).getJsonObject(fileId)) - .filter(Objects::nonNull).collect(Collectors.toList()); - if (newfileJsonObject != null) { - logger.fine("List Size: " + newfileJsonObject.size()); - // if (!newfileJsonObject.get(0).getString("hash").equalsIgnoreCase("null")) { - JsonPatch path = Json.createPatchBuilder() - .add("/md5Hash", newfileJsonObject.get(0).getString("hash")).build(); - fileJsonObject = path.apply(fileJsonObject); - path = Json.createPatchBuilder() - .add("/mimeType", newfileJsonObject.get(0).getString("mime")).build(); - fileJsonObject = path.apply(fileJsonObject); - addFilesJsonData.add(fileJsonObject); - countSuccess++; - // } else { - // globusLogger.info(fileName - // + " will be skipped from adding to dataset by second API due to missing - // values "); - // countError++; - // } - } else { - globusLogger.info(fileName - + " will be skipped from adding to dataset by second API due to missing values "); - countError++; - } - } - - String newjsonData = addFilesJsonData.build().toString(); - - globusLogger.info("Successfully generated new JsonData for addFiles call"); - - /*String command = "curl -H \"X-Dataverse-key:" + token.getTokenString() + "\" -X POST " - + httpRequestUrl + "/api/datasets/:persistentId/addFiles?persistentId=doi:" - + datasetIdentifier + " -F jsonData='" + newjsonData + "'"; - System.out.println("*******====command ==== " + command);*/ - - // ToDo - refactor to call AddReplaceFileHelper.addFiles directly instead of - // calling API - - // a quick experimental AddReplaceFileHelper implementation: - AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper( - dataverseRequestSvc.getDataverseRequest(), - this.ingestSvc, - this.datasetSvc, - this.dataFileSvc, - this.permissionSvc, - this.commandEngine, - this.systemConfig - ); - - Response addFilesResponse = addFileHelper.addFiles(newjsonData, dataset, authUser); - - if (Response.Status.OK.equals(addFilesResponse.getStatusInfo())) { - // if(!taskSkippedFiles) - if (countError == 0) { - userNotificationService.sendNotification((AuthenticatedUser) authUser, - new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADCOMPLETED, - dataset.getId(), countSuccess + " files added out of " + countAll, true); - } else { - userNotificationService.sendNotification((AuthenticatedUser) authUser, - new Timestamp(new Date().getTime()), - UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(), - countSuccess + " files added out of " + countAll, true); - } - globusLogger.info("Successfully completed addFiles call "); - } else { - globusLogger.log(Level.SEVERE, - "******* Error while executing addFiles ", newjsonData); - } - - } - - globusLogger.info("Files processed: " + countAll.toString()); - globusLogger.info("Files added successfully: " + countSuccess.toString()); - globusLogger.info("Files failures: " + countError.toString()); - globusLogger.info("Finished upload via Globus job."); - + processUploadedFiles(filesJsonArray, dataset, authUser, globusLogger); } catch (Exception e) { - logger.info("Exception from globusUpload call "); + logger.info("Exception from processUploadedFiles call "); e.printStackTrace(); - globusLogger.info("Exception from globusUpload call " + e.getMessage()); + globusLogger.info("Exception from processUploadedFiles call " + e.getMessage()); datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress); // } @@ -883,7 +808,164 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S fileHandler.close(); } } + /** + * The code in this method is copy-and-pasted from the previous Borealis + * implemenation + * @todo see if it can be refactored and simplified a bit, the json manipulation + * specifically (?) + * @param filesJsonArray JsonArray containing files metadata entries as passed to /addGlobusFiles + * @param dataset the dataset + * @param authUser the user that should be be performing the addFiles call + * finalizing adding the files to the Dataset. Note that this + * user will need to be obtained from the saved api token, when this + * method is called via the TaskMonitoringService + * @param myLogger the Logger; if null, the main logger of the service bean will be used + * @throws IOException, InterruptedException, ExecutionException @todo may need to throw more exceptions (?) + */ + private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, AuthenticatedUser authUser, Logger myLogger) throws IOException, InterruptedException, ExecutionException { + myLogger = myLogger != null ? myLogger : logger; + + Integer countAll = 0; + Integer countSuccess = 0; + Integer countError = 0; + + List inputList = new ArrayList(); + + String datasetIdentifier = dataset.getAuthorityForFileStorage() + "/" + + dataset.getIdentifierForFileStorage(); + + for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) { + + // storageIdentifier s3://gcs5-bucket1:1781cfeb8a7-748c270a227c from + // externalTool + String storageIdentifier = fileJsonObject.getString("storageIdentifier"); + String[] parts = DataAccess.getDriverIdAndStorageLocation(storageIdentifier); + String storeId = parts[0]; + // If this is an S3 store, we need to split out the bucket name + String[] bits = parts[1].split(":"); + String bucketName = ""; + if (bits.length > 1) { + bucketName = bits[0]; + } + String fileId = bits[bits.length - 1]; + + // fullpath s3://gcs5-bucket1/10.5072/FK2/3S6G2E/1781cfeb8a7-4ad9418a5873 + // or globus:///10.5072/FK2/3S6G2E/1781cfeb8a7-4ad9418a5873 + String fullPath = storeId + "://" + bucketName + "/" + datasetIdentifier + "/" + fileId; + String fileName = fileJsonObject.getString("fileName"); + + inputList.add(fileId + "IDsplit" + fullPath + "IDsplit" + fileName); + } + + // calculateMissingMetadataFields: checksum, mimetype + JsonObject newfilesJsonObject = calculateMissingMetadataFields(inputList, myLogger); + JsonArray newfilesJsonArray = newfilesJsonObject.getJsonArray("files"); + logger.fine("Size: " + newfilesJsonArray.size()); + logger.fine("Val: " + JsonUtil.prettyPrint(newfilesJsonArray.getJsonObject(0))); + JsonArrayBuilder addFilesJsonData = Json.createArrayBuilder(); + + for (JsonObject fileJsonObject : filesJsonArray.getValuesAs(JsonObject.class)) { + + countAll++; + String storageIdentifier = fileJsonObject.getString("storageIdentifier"); + String fileName = fileJsonObject.getString("fileName"); + String[] parts = DataAccess.getDriverIdAndStorageLocation(storageIdentifier); + // If this is an S3 store, we need to split out the bucket name + String[] bits = parts[1].split(":"); + if (bits.length > 1) { + } + String fileId = bits[bits.length - 1]; + + List newfileJsonObject = IntStream.range(0, newfilesJsonArray.size()) + .mapToObj(index -> ((JsonObject) newfilesJsonArray.get(index)).getJsonObject(fileId)) + .filter(Objects::nonNull).collect(Collectors.toList()); + if (newfileJsonObject != null) { + logger.fine("List Size: " + newfileJsonObject.size()); + // if (!newfileJsonObject.get(0).getString("hash").equalsIgnoreCase("null")) { + JsonPatch path = Json.createPatchBuilder() + .add("/md5Hash", newfileJsonObject.get(0).getString("hash")).build(); + fileJsonObject = path.apply(fileJsonObject); + path = Json.createPatchBuilder() + .add("/mimeType", newfileJsonObject.get(0).getString("mime")).build(); + fileJsonObject = path.apply(fileJsonObject); + addFilesJsonData.add(fileJsonObject); + countSuccess++; + // } else { + // globusLogger.info(fileName + // + " will be skipped from adding to dataset by second API due to missing + // values "); + // countError++; + // } + } else { + myLogger.info(fileName + + " will be skipped from adding to dataset in the final AddReplaceFileHelper.addFiles() call. "); + countError++; + } + } + + String newjsonData = addFilesJsonData.build().toString(); + + myLogger.info("Successfully generated new JsonData for addFiles call"); + + /*String command = "curl -H \"X-Dataverse-key:" + token.getTokenString() + "\" -X POST " + + httpRequestUrl + "/api/datasets/:persistentId/addFiles?persistentId=doi:" + + datasetIdentifier + " -F jsonData='" + newjsonData + "'"; + System.out.println("*******====command ==== " + command);*/ + // ToDo - refactor to call AddReplaceFileHelper.addFiles directly instead of + // calling API + // a quick experimental AddReplaceFileHelper implementation: + AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper( + dataverseRequestSvc.getDataverseRequest(), + this.ingestSvc, + this.datasetSvc, + this.dataFileSvc, + this.permissionSvc, + this.commandEngine, + this.systemConfig + ); + + Response addFilesResponse = addFileHelper.addFiles(newjsonData, dataset, authUser); + + if (Response.Status.OK.equals(addFilesResponse.getStatusInfo())) { + // if(!taskSkippedFiles) + if (countError == 0) { + userNotificationService.sendNotification((AuthenticatedUser) authUser, + new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADCOMPLETED, + dataset.getId(), countSuccess + " files added out of " + countAll, true); + } else { + userNotificationService.sendNotification((AuthenticatedUser) authUser, + new Timestamp(new Date().getTime()), + UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(), + countSuccess + " files added out of " + countAll, true); + } + myLogger.info("Successfully completed addFiles call "); + } else { + myLogger.log(Level.SEVERE, + "******* Error while executing addFiles ", newjsonData); + } + myLogger.info("Files processed: " + countAll); + myLogger.info("Files added successfully: " + countSuccess); + myLogger.info("Files failures: " + countError); + myLogger.info("Finished upload via Globus job."); + + } + + /** + * I don't think this method is needed at all. (I suspect that it's a remnant + * from the times when *multiple* individual /add calls needed to be performed + * for each file being added. So this was part of a framework that attempted + * to run this calls in parallel, potentially speeding things up (similarly to + * how the checksums are being calculated in parallel for multiple files). + * As of now, this method doesn't do anything "asynchronous" - there is one + * /addFiles call, and the method below will wait for it to complete, via the + * CompletableFuture.get(). (L.A.) + * @param curlCommand + * @param globusLogger + * @return + * @throws ExecutionException + * @throws InterruptedException + */ public String addFilesAsync(String curlCommand, Logger globusLogger) throws ExecutionException, InterruptedException { CompletableFuture addFilesFuture = CompletableFuture.supplyAsync(() -> { @@ -983,7 +1065,7 @@ public void globusDownload(String jsonData, Dataset dataset, User authUser) thro // If the rules_cache times out, the permission will be deleted. Presumably that // doesn't affect a // globus task status check - GlobusTask task = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger); + GlobusTaskState task = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger); String ruleId = getRuleId(endpoint, task.getOwner_id(), "r"); if (ruleId != null) { logger.fine("Found rule: " + ruleId); @@ -999,6 +1081,7 @@ public void globusDownload(String jsonData, Dataset dataset, User authUser) thro logger.warning("ruleId not found for taskId: " + taskIdentifier); } task = globusStatusCheck(endpoint, taskIdentifier, globusLogger); + // @todo null check String taskStatus = getTaskStatus(task); // Transfer is done (success or failure) so delete the rule @@ -1033,61 +1116,38 @@ public void globusDownload(String jsonData, Dataset dataset, User authUser) thro Executor executor = Executors.newFixedThreadPool(10); - private GlobusTask globusStatusCheck(GlobusEndpoint endpoint, String taskId, Logger globusLogger) + private GlobusTaskState globusStatusCheck(GlobusEndpoint endpoint, String taskId, Logger globusLogger) throws MalformedURLException { - boolean taskCompletion = false; - String status = ""; - GlobusTask task = null; + boolean taskCompleted = false; + GlobusTaskState task = null; int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault( settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 50); do { try { globusLogger.info("checking globus transfer task " + taskId); Thread.sleep(pollingInterval * 1000); + // Call the (centralized) Globus API to check on the task state/status: task = getTask(endpoint.getClientToken(), taskId, globusLogger); - if (task != null) { - status = task.getStatus(); - if (status != null) { - // The task is in progress. - if (status.equalsIgnoreCase("ACTIVE")) { - if (task.getNice_status().equalsIgnoreCase("ok") - || task.getNice_status().equalsIgnoreCase("queued")) { - taskCompletion = false; - } else { - taskCompletion = true; - // status = "FAILED" + "#" + task.getNice_status() + "#" + - // task.getNice_status_short_description(); - } - } else { - // The task is either succeeded, failed or inactive. - taskCompletion = true; - // status = status + "#" + task.getNice_status() + "#" + - // task.getNice_status_short_description(); - } - } else { - // status = "FAILED"; - taskCompletion = true; - } - } else { - // status = "FAILED"; - taskCompletion = true; - } + taskCompleted = GlobusUtil.isTaskCompleted(task); } catch (Exception ex) { ex.printStackTrace(); } - } while (!taskCompletion); + } while (!taskCompleted); globusLogger.info("globus transfer task completed successfully"); return task; } - - private String getTaskStatus(GlobusTask task) { + + private String getTaskStatus(GlobusTaskState task) { String status = null; if (task != null) { status = task.getStatus(); if (status != null) { // The task is in progress but is not ok or queued + // (L.A.) I think the assumption here is that this method is called + // exclusively on tasks that have already completed. So that's why + // it is safe to assume that "ACTIVE" means "FAILED". if (status.equalsIgnoreCase("ACTIVE")) { status = "FAILED" + "#" + task.getNice_status() + "#" + task.getNice_status_short_description(); } else { @@ -1158,7 +1218,16 @@ private FileDetailsHolder calculateDetails(String id, Logger globusLogger) String fileName = id.split("IDsplit")[2]; // ToDo: what if the file does not exist in s3 + // (L.A.) - good question. maybe it should call .open and .exists() here? + // otherwise, there doesn't seem to be any diagnostics as to which + // files uploaded successfully and which failed (?) + // ... however, any partially successful upload cases should be + // properly handled later, during the .addFiles() call - only + // the files that actually exists in storage remotely will be + // added to the dataset permanently then. // ToDo: what if checksum calculation failed + // (L.A.) - this appears to have been addressed - by using "Not available in Dataverse" + // in place of a checksum. String storageDriverId = DataAccess.getDriverIdAndStorageLocation(fullPath)[0]; @@ -1180,8 +1249,6 @@ private FileDetailsHolder calculateDetails(String id, Logger globusLogger) logger.info(ex.getMessage()); Thread.sleep(5000); } - - } while (count < 3); } @@ -1311,5 +1378,57 @@ public void writeGuestbookAndStartTransfer(GuestbookResponse guestbookResponse, } } } + + public List findAllOngoingTasks() { + return em.createQuery("select object(o) from GlobusTaskInProgress as o order by o.startTime", GlobusTaskInProgress.class).getResultList(); + } + + public void deleteTask(GlobusTaskInProgress task) { + GlobusTaskInProgress mergedTask = em.merge(task); + em.remove(mergedTask); + } + + public List findExternalUploadsByTaskId(String taskId) { + return em.createNamedQuery("ExternalFileUploadInProgress.findByTaskId").setParameter("taskId", taskId).getResultList(); + } + + // @todo this may or may not need to be async (?) + public void addFilesOnSuccess(GlobusTaskInProgress globusTask) { + List fileUploadsInProgress = findExternalUploadsByTaskId(globusTask.getTaskId()); + + if (fileUploadsInProgress == null || fileUploadsInProgress.size() < 1) { + // @todo log error message; do nothing + return; + } + Dataset dataset = globusTask.getDataset(); + AuthenticatedUser authUser = authSvc.lookupUser(globusTask.getApiToken()); + if (authUser == null) { + // @todo log error message; do nothing + return; + } + + JsonArrayBuilder filesJsonArrayBuilder = Json.createArrayBuilder(); + + for (ExternalFileUploadInProgress pendingFile : fileUploadsInProgress) { + String jsonInfoString = pendingFile.getFileInfo(); + JsonObject fileObject = JsonUtil.getJsonObject(jsonInfoString); + filesJsonArrayBuilder.add(fileObject); + } + + JsonArray filesJsonArray = filesJsonArrayBuilder.build(); + + if (filesJsonArray == null || filesJsonArray.size() < 1) { + // @todo log error message; do nothing + return; + } + + try { + processUploadedFiles(filesJsonArray, dataset, authUser, null); + } catch (Exception ex) { + // @todo log error message; make sure the error notification to the + // has been sent (may or may not have already been sent inside the + // method above). + } + } } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTask.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskState.java similarity index 93% rename from src/main/java/edu/harvard/iq/dataverse/globus/GlobusTask.java rename to src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskState.java index c2b01779f4a..b5db20d46c1 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTask.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskState.java @@ -1,6 +1,10 @@ package edu.harvard.iq.dataverse.globus; -public class GlobusTask { +/** + * This class is used to store the state of an ongoing Globus task (transfer) + * as reported by the Globus task API. + */ +public class GlobusTaskState { private String DATA_TYPE; private String type; diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java index 92cf8ac7704..67594ad1a5e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java @@ -30,4 +30,37 @@ public static JsonObject getFilesMap(List dataFiles, Dataset d) { } return filesBuilder.build(); } + + public static boolean isTaskCompleted(GlobusTaskState task) { + if (task != null) { + String status = task.getStatus(); + if (status != null) { + if (status.equalsIgnoreCase("ACTIVE")) { + if (task.getNice_status().equalsIgnoreCase("ok") + || task.getNice_status().equalsIgnoreCase("queued")) { + return false; + } + } + } + } + return true; + } + + public static boolean isTaskSucceeded(GlobusTaskState task) { + String status = null; + if (task != null) { + status = task.getStatus(); + if (status != null) { + status = status.toUpperCase(); + if (status.equals("ACTIVE") || status.startsWith("FAILED") || status.startsWith("INACTIVE")) { + // There are cases where a failed task may still be showing + // as "ACTIVE". But it is definitely safe to assume that it + // has not completed *successfully*. + return false; + } + return true; + } + } + return false; + } } \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java index 9bacafd173f..3f76a319902 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java @@ -345,12 +345,13 @@ public List saveAndAddFilesToDataset(DatasetVersion version, StorageIO dataAccess = DataAccess.getStorageIO(dataFile); //Populate metadata dataAccess.open(DataAccessOption.READ_ACCESS); - + // (this will make a remote call to check if the file exists + // and obtain its size) confirmedFileSize = dataAccess.getSize(); // For directly-uploaded files, we will perform the file size // limit and quota checks here. Perform them *again*, in - // some cases: a directly uploaded files have already been + // some cases: files directly uploaded via the UI have already been // checked (for the sake of being able to reject the upload // before the user clicks "save"). But in case of direct // uploads via API, these checks haven't been performed yet, diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java b/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java index 021977ff8c6..746e6e3b75d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java @@ -91,6 +91,11 @@ public enum FeatureFlags { * @since Dataverse 6.3 */ DISABLE_RETURN_TO_AUTHOR_REASON("disable-return-to-author-reason"), + /** + * TEMPORARY feature flag for the new Globus upload framework (will only be + * used for testing). + */ + GLOBUS_USE_EXPERIMENTAL_ASYNC_FRAMEWORK("globus-use-experimental-async-framework"), ; final String flag; diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java index f9801419e47..7417a5db4d4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java @@ -82,6 +82,7 @@ public class SystemConfig { private String buildNumber = null; private static final String JVM_TIMER_SERVER_OPTION = "dataverse.timerServer"; + private static final String JVM_GLOBUS_TASK_MONITORING_OPTION = "dataverse.globus.taskMonitoringServer"; private static final long DEFAULT_GUESTBOOK_RESPONSES_DISPLAY_LIMIT = 5000L; private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_IMAGE = 3000000L; // 3 MB @@ -545,6 +546,14 @@ public boolean isTimerServer() { } return false; } + + public boolean isGlobusTaskMonitoringServer() { + String optionValue = System.getProperty(JVM_GLOBUS_TASK_MONITORING_OPTION); + if ("true".equalsIgnoreCase(optionValue)) { + return true; + } + return false; + } public String getFooterCopyrightAndYear() { return BundleUtil.getStringFromBundle("footer.copyright", Arrays.asList(Year.now().getValue() + "")); From dac53023309a17b6761388203a6040ee7199f382 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 12 Aug 2024 13:14:00 -0400 Subject: [PATCH 166/366] new class files that weren't included in the last commit #10623 --- .../ExternalFileUploadInProgress.java | 131 ++++++++++++ .../globus/GlobusTaskInProgress.java | 188 ++++++++++++++++++ .../globus/TaskMonitoringServiceBean.java | 78 ++++++++ 3 files changed, 397 insertions(+) create mode 100644 src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java create mode 100644 src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java create mode 100644 src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java new file mode 100644 index 00000000000..dadde64608c --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java @@ -0,0 +1,131 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package edu.harvard.iq.dataverse; + +import jakarta.persistence.Column; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +/** + * + * @author landreev + * + * The name of the class is provisional. I'm open to better-sounding alternatives, + * if anyone can think of any. + * But I wanted to avoid having the word "Globus" in the entity name. I'm adding + * it specifically for the Globus use case. But I'm guessing there's a chance + * this setup may come in handy for other types of datafile uploads that happen + * externally. (?) + */ +@NamedQueries({ + @NamedQuery( name="ExternalFileUploadInProgress.deleteByTaskId", + query="DELETE FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId"), + @NamedQuery(name = "ExternalFileUploadInProgress.findByTaskId", + query = "SELECT f FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId")}) +@Entity +public class ExternalFileUploadInProgress implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + /** + * Rather than saving various individual fields defining the datafile, + * which would essentially replicate the DataFile table, we are simply + * storing the full json record as passed to the API here. + */ + @Column(columnDefinition = "TEXT", nullable = false) + private String fileInfo; + + /** + * This is Globus-specific task id associated with the upload in progress + */ + @Column(nullable = false) + private String taskId; + + /** + * The Dataset to which the files are being added. + * (@todo may not be necessary? - since the corresponding task is tied to a specific + * dataset already?) + */ + /*@ManyToOne + private Dataset dataset;*/ + + /*public ExternalFileUploadInProgress(String taskId, Dataset dataset, String fileInfo) { + this.taskId = taskId; + this.fileInfo = fileInfo; + this.dataset = dataset; + }*/ + + public ExternalFileUploadInProgress(String taskId, String fileInfo) { + this.taskId = taskId; + this.fileInfo = fileInfo; + } + + public String getFileInfo() { + return fileInfo; + } + + public void setFileInfo(String fileInfo) { + this.fileInfo = fileInfo; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + /*public Dataset getDataset() { + return dataset; + } + + public void setDataset(Dataset dataset) { + this.dataset = dataset; + }*/ + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof ExternalFileUploadInProgress)) { + return false; + } + ExternalFileUploadInProgress other = (ExternalFileUploadInProgress) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "edu.harvard.iq.dataverse.ExternalFileUploadInProgress[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java new file mode 100644 index 00000000000..7b12ec0a3ad --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java @@ -0,0 +1,188 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package edu.harvard.iq.dataverse.globus; + +import edu.harvard.iq.dataverse.Dataset; +import edu.harvard.iq.dataverse.authorization.users.ApiToken; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.ManyToOne; +import java.io.Serializable; +import java.sql.Timestamp; +import java.util.Arrays; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +/** + * + * @author landreev + */ +@Entity +public class GlobusTaskInProgress implements Serializable { + + private static final long serialVersionUID = 1L; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + /** + * Globus-side identifier of the task in progress, upload or download + */ + @Column(nullable = false) + private String taskId; + + GlobusTaskInProgress(String taskIdentifier, TaskType taskType, Dataset dataset, String clientToken, ApiToken token, Timestamp timestamp) { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } + + /** + * I was considering giving this enum type a more specific name "TransferType" + * - but maybe there will be another use case where we need to keep track of + * Globus tasks that are not data transfers (?) + */ + public enum TaskType { + + UPLOAD("UPLOAD"), + DOWNLOAD("DOWNLOAD"); + + private final String text; + + private TaskType(final String text) { + this.text = text; + } + + public static TaskType fromString(String text) { + if (text != null) { + for (TaskType taskType : TaskType.values()) { + if (text.equals(taskType.text)) { + return taskType; + } + } + } + throw new IllegalArgumentException("TaskType must be one of these values: " + Arrays.asList(TaskType.values()) + "."); + } + + @Override + public String toString() { + return text; + } + } + + @Column(nullable = false) + @Enumerated(EnumType.STRING) + private TaskType taskType; + + /** + * Globus API token that should be used to monitor the status of the task + */ + @Column(nullable = false) + private String globusToken; + + /** + * This is the Dataverse API token of the user who initiated the Globus task + */ + private String apiToken; + + @ManyToOne + private Dataset dataset; + + @Column( nullable = false ) + private Timestamp startTime; + + + public GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String clientToken, String apiToken, Timestamp startTime) { + this.taskId = taskId; + this.taskType = taskType; + this.globusToken = clientToken; + this.apiToken = apiToken; + this.dataset = dataset; + this.startTime = startTime; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public TaskType getTaskType() { + return taskType; + } + + public void setTaskType(TaskType taskType) { + this.taskType = taskType; + } + + public String getGlobusToken() { + return globusToken; + } + + public void setGlobusToken(String clientToken) { + this.globusToken = clientToken; + } + + public String getApiToken() { + return apiToken; + } + + public void setApiToken(String apiToken) { + this.apiToken = apiToken; + } + + public Dataset getDataset() { + return dataset; + } + + public void setDataset(Dataset dataset) { + this.dataset = dataset; + } + + public Timestamp getStartTime() { + return startTime; + } + + public void setStartTime(Timestamp startTime) { + this.startTime = startTime; + } + + @Override + public int hashCode() { + int hash = 0; + hash += (id != null ? id.hashCode() : 0); + return hash; + } + + @Override + public boolean equals(Object object) { + // TODO: Warning - this method won't work in the case the id fields are not set + if (!(object instanceof GlobusTaskInProgress)) { + return false; + } + GlobusTaskInProgress other = (GlobusTaskInProgress) object; + if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) { + return false; + } + return true; + } + + @Override + public String toString() { + return "edu.harvard.iq.dataverse.globus.GlobusTaskInProgress[ id=" + id + " ]"; + } + +} diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java new file mode 100644 index 00000000000..da31ded90db --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java @@ -0,0 +1,78 @@ +/* + * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license + * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template + */ +package edu.harvard.iq.dataverse.globus; + +import edu.harvard.iq.dataverse.settings.SettingsServiceBean; +import edu.harvard.iq.dataverse.util.SystemConfig; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.ejb.EJB; +import jakarta.ejb.Singleton; +import jakarta.ejb.Startup; +import jakarta.enterprise.concurrent.ManagedScheduledExecutorService; +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * + * This Singleton monitors ongoing Globus tasks by checking with the centralized + * Globus API on the status of all the registered ongoing tasks. + * When a successful completion of a task is detected, the service triggers + * the execution of the associated tasks (for example, finalizing adding datafiles + * to the dataset on completion of a remote Globus upload). When a task fails or + * terminates abnormally, a message is logged and the task record is deleted + * from the database. + * + * @author landreev + */ +@Singleton +@Startup +public class TaskMonitoringServiceBean { + @Resource + ManagedScheduledExecutorService scheduler; + + @EJB + SystemConfig systemConfig; + @EJB + SettingsServiceBean settingsSvc; + @EJB + GlobusServiceBean globusService; + + @PostConstruct + public void init() { + if (systemConfig.isGlobusTaskMonitoringServer()) { + int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault( + settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 60); + this.scheduler.scheduleAtFixedRate(this::checkOngoingTasks, + 0, pollingInterval, + TimeUnit.SECONDS); + } + } + + /** + * This method will be executed on a timer-like schedule, continuously + * monitoring all the ongoing external Globus tasks (transfers). + * @todo make sure the executions do not overlap/stack up + */ + public void checkOngoingTasks() { + List tasks = globusService.findAllOngoingTasks(); + + tasks.forEach(t -> { + GlobusTaskState retrieved = globusService.getTask(t.getGlobusToken(), t.getTaskId(), null); + if (GlobusUtil.isTaskCompleted(retrieved)) { + if (GlobusUtil.isTaskSucceeded(retrieved)) { + // Do our thing, finalize adding the files to the dataset + globusService.addFilesOnSuccess(t); + } + // Whether it finished successfully, or failed in the process, + // there's no need to keep monitoring this task, so we can + // delete it. + globusService.deleteTask(t); + // @todo double-check that the locks have been properly handled + } + }); + } + +} From 408034125998e5cd40dda2ff27374cab4bdacd21 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 12 Aug 2024 15:21:45 -0400 Subject: [PATCH 167/366] fixing some bad changes that got committed earlier #10623 --- .../ExternalFileUploadInProgress.java | 41 ++++++------------ .../dataverse/globus/GlobusServiceBean.java | 2 +- .../globus/GlobusTaskInProgress.java | 42 ++++++++++--------- 3 files changed, 35 insertions(+), 50 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java index dadde64608c..ab6a1798307 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java +++ b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java @@ -5,14 +5,15 @@ package edu.harvard.iq.dataverse; import jakarta.persistence.Column; -import jakarta.persistence.ManyToOne; +import jakarta.persistence.Index; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * @@ -31,6 +32,7 @@ @NamedQuery(name = "ExternalFileUploadInProgress.findByTaskId", query = "SELECT f FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId")}) @Entity +@Table(indexes = {@Index(columnList="taskid")}) public class ExternalFileUploadInProgress implements Serializable { private static final long serialVersionUID = 1L; @@ -51,29 +53,18 @@ public void setId(Long id) { * which would essentially replicate the DataFile table, we are simply * storing the full json record as passed to the API here. */ - @Column(columnDefinition = "TEXT", nullable = false) + @Column(columnDefinition = "TEXT", nullable=false) private String fileInfo; /** * This is Globus-specific task id associated with the upload in progress */ - @Column(nullable = false) + @Column(nullable=false) private String taskId; - /** - * The Dataset to which the files are being added. - * (@todo may not be necessary? - since the corresponding task is tied to a specific - * dataset already?) - */ - /*@ManyToOne - private Dataset dataset;*/ - - /*public ExternalFileUploadInProgress(String taskId, Dataset dataset, String fileInfo) { - this.taskId = taskId; - this.fileInfo = fileInfo; - this.dataset = dataset; - }*/ - + public ExternalFileUploadInProgress() { + } + public ExternalFileUploadInProgress(String taskId, String fileInfo) { this.taskId = taskId; this.fileInfo = fileInfo; @@ -95,14 +86,6 @@ public void setTaskId(String taskId) { this.taskId = taskId; } - /*public Dataset getDataset() { - return dataset; - } - - public void setDataset(Dataset dataset) { - this.dataset = dataset; - }*/ - @Override public int hashCode() { int hash = 0; diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index eb1eb47611a..6b78925beb0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -721,7 +721,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S // Save the task information in the database so that the Globus monitoring // service can continue checking on its progress. - GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token, new Timestamp(new Date().getTime())); + GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token.getTokenString(), new Timestamp(new Date().getTime())); em.persist(taskInProgress); // Save the metadata entries that define the files that are being uploaded diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java index 7b12ec0a3ad..210f08710dc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java @@ -5,24 +5,26 @@ package edu.harvard.iq.dataverse.globus; import edu.harvard.iq.dataverse.Dataset; -import edu.harvard.iq.dataverse.authorization.users.ApiToken; import jakarta.persistence.Column; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import java.io.Serializable; import java.sql.Timestamp; import java.util.Arrays; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * * @author landreev */ @Entity +@Table(uniqueConstraints = {@UniqueConstraint(columnNames = "taskid")}) public class GlobusTaskInProgress implements Serializable { private static final long serialVersionUID = 1L; @@ -33,13 +35,9 @@ public class GlobusTaskInProgress implements Serializable { /** * Globus-side identifier of the task in progress, upload or download */ - @Column(nullable = false) + @Column(nullable=false, unique = true) private String taskId; - GlobusTaskInProgress(String taskIdentifier, TaskType taskType, Dataset dataset, String clientToken, ApiToken token, Timestamp timestamp) { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody - } - /** * I was considering giving this enum type a more specific name "TransferType" * - but maybe there will be another use case where we need to keep track of @@ -73,14 +71,14 @@ public String toString() { } } - @Column(nullable = false) + @Column @Enumerated(EnumType.STRING) private TaskType taskType; /** * Globus API token that should be used to monitor the status of the task */ - @Column(nullable = false) + @Column private String globusToken; /** @@ -91,19 +89,23 @@ public String toString() { @ManyToOne private Dataset dataset; - @Column( nullable = false ) + @Column private Timestamp startTime; - - public GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String clientToken, String apiToken, Timestamp startTime) { - this.taskId = taskId; - this.taskType = taskType; - this.globusToken = clientToken; - this.apiToken = apiToken; + public GlobusTaskInProgress() { + } + + GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String globusToken, String apiToken, Timestamp startTime) { + this.taskId = taskId; + this.taskType = taskType; this.dataset = dataset; - this.startTime = startTime; + this.globusToken = globusToken; + this.apiToken = apiToken; + this.startTime = startTime; } + + public Long getId() { return id; } From e086a60aad4a758f3c6c1b1d2797985b7ade380a Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 13 Aug 2024 09:25:35 -0400 Subject: [PATCH 168/366] cleanup #10623 --- .../harvard/iq/dataverse/globus/GlobusServiceBean.java | 9 ++++++++- .../iq/dataverse/globus/TaskMonitoringServiceBean.java | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 6b78925beb0..9ab3a2df567 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -966,6 +966,7 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut * @throws ExecutionException * @throws InterruptedException */ + /* public String addFilesAsync(String curlCommand, Logger globusLogger) throws ExecutionException, InterruptedException { CompletableFuture addFilesFuture = CompletableFuture.supplyAsync(() -> { @@ -1018,7 +1019,7 @@ private String addFiles(String curlCommand, Logger globusLogger) { } return status; - } + } */ @Asynchronous public void globusDownload(String jsonData, Dataset dataset, User authUser) throws MalformedURLException { @@ -1431,4 +1432,10 @@ public void addFilesOnSuccess(GlobusTaskInProgress globusTask) { // method above). } } + + public void deleteExternalUploadRecords(String taskId) { + em.createNamedQuery("ExternalFileUploadInProgress.deleteByTaskId") + .setParameter("taskId", taskId) + .executeUpdate(); + } } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java index da31ded90db..bd274d44e38 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java @@ -14,6 +14,7 @@ import jakarta.enterprise.concurrent.ManagedScheduledExecutorService; import java.util.List; import java.util.concurrent.TimeUnit; +import java.util.logging.Logger; /** * @@ -30,6 +31,8 @@ @Singleton @Startup public class TaskMonitoringServiceBean { + private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.globus.TaskMonitoringServiceBean"); + @Resource ManagedScheduledExecutorService scheduler; @@ -43,11 +46,14 @@ public class TaskMonitoringServiceBean { @PostConstruct public void init() { if (systemConfig.isGlobusTaskMonitoringServer()) { + logger.info("Starting Globus task monitoring service"); int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault( settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 60); this.scheduler.scheduleAtFixedRate(this::checkOngoingTasks, 0, pollingInterval, TimeUnit.SECONDS); + } else { + logger.info("Skipping Globus task monitor initialization"); } } @@ -57,6 +63,7 @@ public void init() { * @todo make sure the executions do not overlap/stack up */ public void checkOngoingTasks() { + logger.info("Performing a scheduled external Globus task check"); List tasks = globusService.findAllOngoingTasks(); tasks.forEach(t -> { @@ -69,6 +76,7 @@ public void checkOngoingTasks() { // Whether it finished successfully, or failed in the process, // there's no need to keep monitoring this task, so we can // delete it. + globusService.deleteExternalUploadRecords(t.getTaskId()); globusService.deleteTask(t); // @todo double-check that the locks have been properly handled } From 0ccde224435ba0567b1f09f2e7e169fc47993b65 Mon Sep 17 00:00:00 2001 From: Vera Clemens Date: Wed, 14 Aug 2024 15:50:22 +0200 Subject: [PATCH 169/366] change permalink PID base url handling --- .../iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java | 2 +- .../pidproviders/perma/PermaLinkProviderFactory.java | 2 +- .../edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java index 91c7f527c88..7b55292350f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkPidProvider.java @@ -182,7 +182,7 @@ public GlobalId parsePersistentId(String protocol, String authority, String iden @Override public String getUrlPrefix() { - return getBaseUrl() + "/citation?persistentId=" + PERMA_PROTOCOL + ":"; + return getBaseUrl(); } @Override diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkProviderFactory.java index 32b89223062..ca75fbff3a8 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkProviderFactory.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/perma/PermaLinkProviderFactory.java @@ -28,7 +28,7 @@ public PidProvider createPidProvider(String providerId) { String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse(""); String baseUrl = JvmSettings.PERMALINK_BASE_URL.lookupOptional(providerId) - .orElse(SystemConfig.getDataverseSiteUrlStatic()); + .orElse(SystemConfig.getDataverseSiteUrlStatic() + "/citation?persistentId=" + PermaLinkPidProvider.PERMA_PROTOCOL + ":"); ; String separator = JvmSettings.PERMALINK_SEPARATOR.lookupOptional(providerId).orElse(""); diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java index cffac741c78..e36312edc8a 100644 --- a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java @@ -67,7 +67,7 @@ @JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "QE", varArgs = "perma2") @JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "perma:LINKIT/FK2ABCDEF", varArgs ="perma2") @JvmSetting(key = JvmSettings.PERMALINK_SEPARATOR, value = "/", varArgs = "perma2") -@JvmSetting(key = JvmSettings.PERMALINK_BASE_URL, value = "https://example.org/123", varArgs = "perma2") +@JvmSetting(key = JvmSettings.PERMALINK_BASE_URL, value = "https://example.org/123/citation?persistentId=perma:", varArgs = "perma2") // Datacite 1 @JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "dataCite 1", varArgs = "dc1") @JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = DataCiteDOIProvider.TYPE, varArgs = "dc1") @@ -191,7 +191,7 @@ public void testFactories() throws IOException { assertEquals("-", p.getSeparator()); assertTrue(p.getUrlPrefix().startsWith(SystemConfig.getDataverseSiteUrlStatic())); p = PidUtil.getPidProvider("perma2"); - assertTrue(p.getUrlPrefix().startsWith("https://example.org/123")); + assertTrue(p.getUrlPrefix().startsWith("https://example.org/123/citation?persistentId=")); p = PidUtil.getPidProvider("dc2"); assertEquals("FK3", p.getShoulder()); From 35ce7ef1892baa92b36e2350193eec4a63db6237 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 14 Aug 2024 14:37:38 -0400 Subject: [PATCH 170/366] more testing/debugging #10623 --- .../dataverse/globus/GlobusServiceBean.java | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 9ab3a2df567..3f6d0bf7c68 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -60,6 +60,7 @@ import edu.harvard.iq.dataverse.dataaccess.GlobusAccessibleStore; import edu.harvard.iq.dataverse.dataaccess.StorageIO; import edu.harvard.iq.dataverse.datasetutility.AddReplaceFileHelper; +import edu.harvard.iq.dataverse.engine.command.DataverseRequest; import edu.harvard.iq.dataverse.ingest.IngestServiceBean; import edu.harvard.iq.dataverse.privateurl.PrivateUrl; import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean; @@ -71,9 +72,12 @@ import edu.harvard.iq.dataverse.util.URLTokenUtil; import edu.harvard.iq.dataverse.util.UrlSignerUtil; import edu.harvard.iq.dataverse.util.json.JsonUtil; +import jakarta.json.JsonReader; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; +import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.core.Response; +import org.apache.http.util.EntityUtils; @Stateless @Named("GlobusServiceBean") @@ -810,7 +814,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S } /** * The code in this method is copy-and-pasted from the previous Borealis - * implemenation + * implemenation. * @todo see if it can be refactored and simplified a bit, the json manipulation * specifically (?) * @param filesJsonArray JsonArray containing files metadata entries as passed to /addGlobusFiles @@ -907,6 +911,11 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut myLogger.info("Successfully generated new JsonData for addFiles call"); + myLogger.info("Files processed: " + countAll); + myLogger.info("Files added successfully: " + countSuccess); + myLogger.info("Files failures: " + countError); + myLogger.info("Finished upload via Globus job."); + /*String command = "curl -H \"X-Dataverse-key:" + token.getTokenString() + "\" -X POST " + httpRequestUrl + "/api/datasets/:persistentId/addFiles?persistentId=doi:" + datasetIdentifier + " -F jsonData='" + newjsonData + "'"; @@ -914,8 +923,15 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut // ToDo - refactor to call AddReplaceFileHelper.addFiles directly instead of // calling API // a quick experimental AddReplaceFileHelper implementation: + + // Passing null for the HttpServletRequest to make a new DataverseRequest. + // The parent method is executed asynchronously, so the real request + // that was associated with the original API call that triggered this upload + // cannot be obtained. + DataverseRequest dataverseRequest = new DataverseRequest(authUser, (HttpServletRequest)null); + AddReplaceFileHelper addFileHelper = new AddReplaceFileHelper( - dataverseRequestSvc.getDataverseRequest(), + dataverseRequest, this.ingestSvc, this.datasetSvc, this.dataFileSvc, @@ -923,10 +939,18 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut this.commandEngine, this.systemConfig ); + + // The old code had 2 sec. of sleep, so ... + Thread.sleep(2000); Response addFilesResponse = addFileHelper.addFiles(newjsonData, dataset, authUser); - if (Response.Status.OK.equals(addFilesResponse.getStatusInfo())) { + JsonReader jsonReader = Json.createReader(new StringReader((String) addFilesResponse.getEntity().toString())); + JsonObject jsonObject = jsonReader.readObject(); + String addFilesStatus = jsonObject.getString("status"); + String addFilesMessage = jsonObject.getJsonObject("data").getString("message"); + + if ("OK".equalsIgnoreCase(addFilesStatus)) { // if(!taskSkippedFiles) if (countError == 0) { userNotificationService.sendNotification((AuthenticatedUser) authUser, @@ -942,13 +966,14 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut } else { myLogger.log(Level.SEVERE, "******* Error while executing addFiles ", newjsonData); + // @todo send Failure notification + if (addFilesResponse != null) { + myLogger.info("addFilesResponse status: " + addFilesStatus); + myLogger.info("addFilesResponse message" + addFilesMessage); + } } - myLogger.info("Files processed: " + countAll); - myLogger.info("Files added successfully: " + countSuccess); - myLogger.info("Files failures: " + countError); - myLogger.info("Finished upload via Globus job."); - + } /** From 0e90523b57eb038d6bb979705f20cce991cd86ff Mon Sep 17 00:00:00 2001 From: Vera Clemens Date: Thu, 15 Aug 2024 14:12:08 +0200 Subject: [PATCH 171/366] docs: add warning about special characters in PermaLink authority/shoulder values --- doc/sphinx-guides/source/installation/config.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index ae3b07fecfe..ceec5f1a9b6 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -532,8 +532,12 @@ dataverse.pid.*.permalink.separator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PermaLinks are a simple PID option intended for intranet and catalog use cases. They can be used without an external service or -be configured with the ``base-url`` of a resolution service. PermaLinks also allow a custom ``separator`` to be used. (Note: when using multiple -PermaLink providers, you should avoid ambiguous authority/separator/shoulder combinations that would result in the same overall prefix.) +be configured with the ``base-url`` of a resolution service. PermaLinks also allow a custom ``separator`` to be used. + +Note: + +- When using multiple PermaLink providers, you should avoid ambiguous authority/separator/shoulder combinations that would result in the same overall prefix. +- In general, PermaLink authority/shoulder values should be alphanumeric. For other cases, admins may need to consider the potential impact of special characters in S3 storage identifiers, resolver URLs, exports, etc. .. _dataverse.pid.*.handlenet: From 3e33e68d3e32285398f41f3abecf24ac2b0852b1 Mon Sep 17 00:00:00 2001 From: Vera Clemens Date: Thu, 15 Aug 2024 14:13:00 +0200 Subject: [PATCH 172/366] docs: add release note for changed permalink PID base url handling --- doc/release-notes/permalink-base-urls.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/release-notes/permalink-base-urls.md diff --git a/doc/release-notes/permalink-base-urls.md b/doc/release-notes/permalink-base-urls.md new file mode 100644 index 00000000000..1dd74057351 --- /dev/null +++ b/doc/release-notes/permalink-base-urls.md @@ -0,0 +1,10 @@ +The configuration setting `dataverse.pid.*.permalink.base-url`, which is used for PermaLinks, has been updated to +support greater flexibility. Previously, the string "/citation?persistentId=" was automatically appended to the +configured base URL. With this update, the base URL will now be used exactly as configured, without any automatic +additions. + +**Upgrade instructions:** + +- If you currently use a PermaLink provider with a configured `base-url`: You must manually append + "/citation?persistentId=" to the existing base URL to maintain functionality. +- If you use a PermaLink provider without a configured `base-url`: No changes are required. \ No newline at end of file From d4b9bac8366a2b909c5c32cf5e3f4361d6abc7d5 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Fri, 16 Aug 2024 20:21:44 -0400 Subject: [PATCH 173/366] this is a working, but still work-in-progress state of things - needs some cleanup and refinements. #10623 --- .../iq/dataverse/DatasetServiceBean.java | 11 +- .../harvard/iq/dataverse/api/Datasets.java | 2 + .../datasetutility/AddReplaceFileHelper.java | 4 +- .../impl/UpdateDatasetVersionCommand.java | 26 +- .../dataverse/globus/GlobusServiceBean.java | 232 ++++++++++-------- .../globus/GlobusTaskInProgress.java | 13 +- .../globus/TaskMonitoringServiceBean.java | 14 +- 7 files changed, 182 insertions(+), 120 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java index dab0ff43fcf..832d7192965 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java @@ -412,12 +412,20 @@ public boolean checkDatasetLock(Long datasetId) { List lock = lockCounter.getResultList(); return lock.size()>0; } - + + public List getLocksByDatasetId(Long datasetId) { + TypedQuery locksQuery = em.createNamedQuery("DatasetLock.getLocksByDatasetId", DatasetLock.class); + locksQuery.setParameter("datasetId", datasetId); + return locksQuery.getResultList(); + } + public List getDatasetLocksByUser( AuthenticatedUser user) { return listLocks(null, user); } + // @todo: we'll be better off getting rid of this method and using the other + // version of addDatasetLock() (that uses datasetId instead of Dataset). @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public DatasetLock addDatasetLock(Dataset dataset, DatasetLock lock) { lock.setDataset(dataset); @@ -467,6 +475,7 @@ public DatasetLock addDatasetLock(Long datasetId, DatasetLock.Reason reason, Lon * is {@code aReason}. * @param dataset the dataset whose locks (for {@code aReason}) will be removed. * @param aReason The reason of the locks that will be removed. + * @todo this should probably take dataset_id, not a dataset */ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void removeDatasetLocks(Dataset dataset, DatasetLock.Reason aReason) { diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index b93257bc0c3..4c547f5295f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -4035,6 +4035,8 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, return wr.getResponse(); } + // @todo check if the dataset is already locked! + JsonObject jsonObject = null; try { jsonObject = JsonUtil.getJsonObject(jsonData); diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java index 0143fced87c..2b35a4cc783 100644 --- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java @@ -2139,9 +2139,9 @@ public Response addFiles(String jsonData, Dataset dataset, User authUser) { logger.log(Level.WARNING, "Dataset not locked for EditInProgress "); } else { datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress); - logger.log(Level.INFO, "Removed EditInProgress lock "); + logger.log(Level.INFO, "Removed EditInProgress lock "+eipLock.getId()); } - + try { Command cmd = new UpdateDatasetVersionCommand(dataset, dvRequest, clone); ((UpdateDatasetVersionCommand) cmd).setValidateLenient(true); diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java index 994f4c7dfb6..faf8884b08d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java @@ -14,6 +14,7 @@ import edu.harvard.iq.dataverse.engine.command.RequiredPermissions; import edu.harvard.iq.dataverse.engine.command.exception.CommandException; import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException; +import edu.harvard.iq.dataverse.util.BundleUtil; import edu.harvard.iq.dataverse.util.DatasetFieldUtil; import edu.harvard.iq.dataverse.util.FileMetadataUtil; @@ -102,7 +103,10 @@ public Dataset execute(CommandContext ctxt) throws CommandException { } Dataset theDataset = getDataset(); - ctxt.permissions().checkUpdateDatasetVersionLock(theDataset, getRequest(), this); + //ctxt.permissions().checkUpdateDatasetVersionLock(theDataset, getRequest(), this); + // this is an experiment (probably temporary) + checkUpdateDatasetVersionLock(ctxt); + Dataset savedDataset = null; DatasetVersion persistedVersion = clone; @@ -297,5 +301,23 @@ public boolean onSuccess(CommandContext ctxt, Object r) { ctxt.index().asyncIndexDataset((Dataset) r, true); return true; } - + + private void checkUpdateDatasetVersionLock(CommandContext ctxt) throws IllegalCommandException { + List locks = ctxt.datasets().getLocksByDatasetId(getDataset().getId()); + //locks.forEach(lock -> { + for (DatasetLock lock : locks) { + // Ingest lock is ok: + if (DatasetLock.Reason.Ingest != lock.getReason()) { + // with Workflow lock *some* users can edit; + // any other kind of lock - nope + if (DatasetLock.Reason.Workflow != lock.getReason() + || !ctxt.permissions().isMatchingWorkflowLock(getDataset(), + getUser().getIdentifier(), + getRequest().getWFInvocationId())) { + throw new IllegalCommandException( + BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), this); + } + } + } + } } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 3f6d0bf7c68..03134d811a7 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -51,6 +51,7 @@ import org.primefaces.PrimeFaces; import com.google.gson.Gson; +import edu.harvard.iq.dataverse.api.ApiConstants; import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean; import edu.harvard.iq.dataverse.authorization.users.ApiToken; import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser; @@ -68,6 +69,7 @@ import edu.harvard.iq.dataverse.settings.JvmSettings; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; import edu.harvard.iq.dataverse.util.FileUtil; +import edu.harvard.iq.dataverse.util.StringUtil; import edu.harvard.iq.dataverse.util.SystemConfig; import edu.harvard.iq.dataverse.util.URLTokenUtil; import edu.harvard.iq.dataverse.util.UrlSignerUtil; @@ -148,7 +150,7 @@ private String getRuleId(GlobusEndpoint endpoint, String principal, String permi * @param ruleId - Globus rule id - assumed to be associated with the * dataset's file path (should not be called with a user * specified rule id w/o further checking) - * @param datasetId - the id of the dataset associated with the rule + * @param dataset - the dataset associated with the rule * @param globusLogger - a separate logger instance, may be null */ public void deletePermission(String ruleId, Dataset dataset, Logger globusLogger) { @@ -690,7 +692,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S fileHandlerSuceeded = true; } catch (IOException | SecurityException ex) { Logger.getLogger(DatasetServiceBean.class.getName()).log(Level.SEVERE, null, ex); - return; + return; // @todo ? } if (fileHandlerSuceeded) { @@ -706,8 +708,8 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S String taskIdentifier = jsonData.getString("taskIdentifier"); GlobusEndpoint endpoint = getGlobusEndpoint(dataset); - GlobusTaskState task = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger); - String ruleId = getRuleId(endpoint, task.getOwner_id(), "rw"); + GlobusTaskState taskState = getTask(endpoint.getClientToken(), taskIdentifier, globusLogger); + String ruleId = getRuleId(endpoint, taskState.getOwner_id(), "rw"); logger.fine("Found rule: " + ruleId); if (ruleId != null) { Long datasetId = rulesCache.getIfPresent(ruleId); @@ -725,7 +727,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S // Save the task information in the database so that the Globus monitoring // service can continue checking on its progress. - GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token.getTokenString(), new Timestamp(new Date().getTime())); + GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token.getTokenString(), ruleId, new Timestamp(new Date().getTime())); em.persist(taskInProgress); // Save the metadata entries that define the files that are being uploaded @@ -746,17 +748,16 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S // sleeping-then-checking the task status repeatedly: // globus task status check - // (the method below performs continuous looped checks of the remote + // (the following method performs continuous looped checks of the remote // Globus API, monitoring it for as long as it takes for the task to // finish one way or another!) - task = globusStatusCheck(endpoint, taskIdentifier, globusLogger); + taskState = globusStatusCheck(endpoint, taskIdentifier, globusLogger); // @todo null check, or make sure it's never null - String taskStatus = getTaskStatus(task); + String taskStatus = getTaskStatus(taskState); if (ruleId != null) { // Transfer is complete, so delete rule deletePermission(ruleId, dataset, globusLogger); - } // If success, switch to an EditInProgress lock - do this before removing the @@ -764,8 +765,17 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S // Keeping a lock through the add datafiles API call avoids a conflicting edit // and keeps any open dataset page refreshing until the datafile appears if (!(taskStatus.startsWith("FAILED") || taskStatus.startsWith("INACTIVE"))) { - datasetSvc.addDatasetLock(dataset, - new DatasetLock(DatasetLock.Reason.EditInProgress, authUser, "Completing Globus Upload")); + globusLogger.info("Finished upload via Globus job."); + + DatasetLock editLock = datasetSvc.addDatasetLock(dataset.getId(), + DatasetLock.Reason.EditInProgress, + (authUser).getId(), + "Completing Globus Upload"); + if (editLock != null) { + dataset.addLock(editLock); + } else { + globusLogger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId()); + } } DatasetLock gLock = dataset.getLockFor(DatasetLock.Reason.GlobusUpload); @@ -785,7 +795,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S */ datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.GlobusUpload); } - + if (taskStatus.startsWith("FAILED") || taskStatus.startsWith("INACTIVE")) { String comment = "Reason : " + taskStatus.split("#")[1] + "
Short Description : " + taskStatus.split("#")[2]; @@ -911,10 +921,9 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut myLogger.info("Successfully generated new JsonData for addFiles call"); - myLogger.info("Files processed: " + countAll); - myLogger.info("Files added successfully: " + countSuccess); - myLogger.info("Files failures: " + countError); - myLogger.info("Finished upload via Globus job."); + myLogger.info("Files passed to /addGlobusFiles: " + countAll); + myLogger.info("Files processed successfully: " + countSuccess); + myLogger.info("Files failures to process: " + countError); /*String command = "curl -H \"X-Dataverse-key:" + token.getTokenString() + "\" -X POST " + httpRequestUrl + "/api/datasets/:persistentId/addFiles?persistentId=doi:" @@ -925,7 +934,7 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut // a quick experimental AddReplaceFileHelper implementation: // Passing null for the HttpServletRequest to make a new DataverseRequest. - // The parent method is executed asynchronously, so the real request + // The parent method is always executed asynchronously, so the real request // that was associated with the original API call that triggered this upload // cannot be obtained. DataverseRequest dataverseRequest = new DataverseRequest(authUser, (HttpServletRequest)null); @@ -945,12 +954,38 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut Response addFilesResponse = addFileHelper.addFiles(newjsonData, dataset, authUser); - JsonReader jsonReader = Json.createReader(new StringReader((String) addFilesResponse.getEntity().toString())); - JsonObject jsonObject = jsonReader.readObject(); - String addFilesStatus = jsonObject.getString("status"); - String addFilesMessage = jsonObject.getJsonObject("data").getString("message"); + if (addFilesResponse == null) { + logger.info("null response from addFiles call"); + //@todo add this case to the user notification in case of error + return; + } + + JsonObject addFilesJsonObject = JsonUtil.getJsonObject(addFilesResponse.getEntity().toString()); - if ("OK".equalsIgnoreCase(addFilesStatus)) { + // @todo null checks etc. + String addFilesStatus = addFilesJsonObject.getString("status", null); + myLogger.info("addFilesResponse status: " + addFilesStatus); + + + if (ApiConstants.STATUS_OK.equalsIgnoreCase(addFilesStatus)) { + if (addFilesJsonObject.containsKey("data")) { + JsonObject responseFilesData = addFilesJsonObject.getJsonObject("data"); + if (responseFilesData.containsKey("Result")) { + JsonObject addFilesResult = responseFilesData.getJsonObject("Result"); + + Integer addFilesTotal = addFilesResult.getInt("Total number of files", -1); + Integer addFilesSuccess = addFilesResult.getInt("Number of files successfully added", -1); + // @todo handle -1 (missing values) above + // @todo log all this stuff in a task-specific log (??) + myLogger.info("Files processed by addFiles: " + addFilesTotal + ", successfully added: " + addFilesSuccess); + // @todo incorporate this into the user notification + } else { + logger.warning("Malformed addFiles data section: "+ responseFilesData.toString()); + } + } else { + logger.warning("Malformed addFiles response json: " + addFilesJsonObject.toString()); + } + // if(!taskSkippedFiles) if (countError == 0) { userNotificationService.sendNotification((AuthenticatedUser) authUser, @@ -963,89 +998,21 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut countSuccess + " files added out of " + countAll, true); } myLogger.info("Successfully completed addFiles call "); + } else if (ApiConstants.STATUS_ERROR.equalsIgnoreCase(addFilesStatus)) { + String addFilesMessage = addFilesJsonObject.getString("message", null); + + myLogger.log(Level.SEVERE, + "******* Error while executing addFiles ", newjsonData); + myLogger.log(Level.SEVERE, "****** Output from addFiles: ", addFilesMessage); + // @todo send Failure notification + } else { myLogger.log(Level.SEVERE, "******* Error while executing addFiles ", newjsonData); // @todo send Failure notification - if (addFilesResponse != null) { - myLogger.info("addFilesResponse status: " + addFilesStatus); - myLogger.info("addFilesResponse message" + addFilesMessage); - } } - - } - /** - * I don't think this method is needed at all. (I suspect that it's a remnant - * from the times when *multiple* individual /add calls needed to be performed - * for each file being added. So this was part of a framework that attempted - * to run this calls in parallel, potentially speeding things up (similarly to - * how the checksums are being calculated in parallel for multiple files). - * As of now, this method doesn't do anything "asynchronous" - there is one - * /addFiles call, and the method below will wait for it to complete, via the - * CompletableFuture.get(). (L.A.) - * @param curlCommand - * @param globusLogger - * @return - * @throws ExecutionException - * @throws InterruptedException - */ - /* - public String addFilesAsync(String curlCommand, Logger globusLogger) - throws ExecutionException, InterruptedException { - CompletableFuture addFilesFuture = CompletableFuture.supplyAsync(() -> { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - return (addFiles(curlCommand, globusLogger)); - }, executor).exceptionally(ex -> { - globusLogger.fine("Something went wrong : " + ex.getLocalizedMessage()); - ex.printStackTrace(); - return null; - }); - - String result = addFilesFuture.get(); - - return result; - } - - private String addFiles(String curlCommand, Logger globusLogger) { - ProcessBuilder processBuilder = new ProcessBuilder(); - Process process = null; - String line; - String status = ""; - - try { - globusLogger.info("Call to : " + curlCommand); - processBuilder.command("bash", "-c", curlCommand); - process = processBuilder.start(); - process.waitFor(); - - BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); - - StringBuilder sb = new StringBuilder(); - while ((line = br.readLine()) != null) - sb.append(line); - globusLogger.info(" API Output : " + sb.toString()); - JsonObject jsonObject = null; - jsonObject = JsonUtil.getJsonObject(sb.toString()); - - status = jsonObject.getString("status"); - } catch (Exception ex) { - if (ex instanceof JsonParsingException) { - globusLogger.log(Level.SEVERE, "Error parsing dataset json."); - } else { - globusLogger.log(Level.SEVERE, - "******* Unexpected Exception while executing api/datasets/:persistentId/add call ", ex); - } - } - - return status; - } */ - @Asynchronous public void globusDownload(String jsonData, Dataset dataset, User authUser) throws MalformedURLException { @@ -1418,22 +1385,75 @@ public List findExternalUploadsByTaskId(String tas return em.createNamedQuery("ExternalFileUploadInProgress.findByTaskId").setParameter("taskId", taskId).getResultList(); } - // @todo this may or may not need to be async (?) - public void addFilesOnSuccess(GlobusTaskInProgress globusTask) { - List fileUploadsInProgress = findExternalUploadsByTaskId(globusTask.getTaskId()); - - if (fileUploadsInProgress == null || fileUploadsInProgress.size() < 1) { - // @todo log error message; do nothing - return; - } + // @todo duplicated code, merge with the code handling the "classic" upload workflow + public void processCompletedTask(GlobusTaskInProgress globusTask, boolean taskSuccess) { + String ruleId = globusTask.getRuleId(); Dataset dataset = globusTask.getDataset(); + if (ruleId != null) { + // Transfer is complete, so delete rule + deletePermission(ruleId, dataset, logger); + } + AuthenticatedUser authUser = authSvc.lookupUser(globusTask.getApiToken()); if (authUser == null) { // @todo log error message; do nothing return; } + + // Switch the locks on the dataset: + // @todo is it necessary? what is wrong exactly with keeping the Globus + // lock on for the duration of the process? + if (taskSuccess) { + DatasetLock editLock = datasetSvc.addDatasetLock(dataset.getId(), + DatasetLock.Reason.EditInProgress, + (authUser).getId(), + "Completing Globus Upload"); + if (editLock != null) { + dataset.addLock(editLock); + } else { + logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId()); + } + } + + // Remove the Globus lock, regardless of whether this is a success or failure + DatasetLock globusUploadLock = dataset.getLockFor(DatasetLock.Reason.GlobusUpload); + if (globusUploadLock == null) { + logger.log(Level.WARNING, "No GlobusUpload lock found for dataset"); + } else { + logger.log(Level.FINE, "Removing GlobusUpload lock " + globusUploadLock.getId()); + /* + * Note: This call to remove a lock only works immediately because it is in + * another service bean. Despite the removeDatasetLocks method having the + * REQUIRES_NEW transaction annotation, when the globusUpload method and that + * method were in the same bean (globusUpload was in the DatasetServiceBean to + * start), the globus lock was still seen in the API call initiated in the + * addFilesAsync method called within the globusUpload method. I.e. it appeared + * that the lock removal was not committed/visible outside this method until + * globusUpload itself ended. + */ + datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.GlobusUpload); + } + + if (taskSuccess && GlobusTaskInProgress.TaskType.UPLOAD.equals(globusTask.getTaskType())) { + List fileUploadsInProgress = findExternalUploadsByTaskId(globusTask.getTaskId()); + + if (fileUploadsInProgress == null || fileUploadsInProgress.size() < 1) { + // @todo log error message; do nothing + return; + } + addFilesOnSuccess(dataset, authUser, fileUploadsInProgress); + } + // Handle locks/rules/etc. (?) + if (ruleId != null) { + deletePermission(ruleId, dataset, logger); + logger.info("Removed upload permission: " + ruleId); + } + } + + public void addFilesOnSuccess(Dataset dataset, AuthenticatedUser authUser, List fileUploadsInProgress) { + JsonArrayBuilder filesJsonArrayBuilder = Json.createArrayBuilder(); for (ExternalFileUploadInProgress pendingFile : fileUploadsInProgress) { diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java index 210f08710dc..d3d06d38151 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java @@ -86,6 +86,9 @@ public String toString() { */ private String apiToken; + @Column + private String ruleId; + @ManyToOne private Dataset dataset; @@ -95,12 +98,13 @@ public String toString() { public GlobusTaskInProgress() { } - GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String globusToken, String apiToken, Timestamp startTime) { + GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String globusToken, String apiToken, String ruleId, Timestamp startTime) { this.taskId = taskId; this.taskType = taskType; this.dataset = dataset; this.globusToken = globusToken; this.apiToken = apiToken; + this.ruleId = ruleId; this.startTime = startTime; } @@ -146,6 +150,13 @@ public void setApiToken(String apiToken) { this.apiToken = apiToken; } + public String getRuleId() { + return ruleId; + } + + public void setRuleId(String ruleId) { + this.ruleId = ruleId; + } public Dataset getDataset() { return dataset; } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java index bd274d44e38..4db25072b6b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java @@ -49,6 +49,7 @@ public void init() { logger.info("Starting Globus task monitoring service"); int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault( settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 60); + // @todo scheduleAtFixedDelay() this.scheduler.scheduleAtFixedRate(this::checkOngoingTasks, 0, pollingInterval, TimeUnit.SECONDS); @@ -65,20 +66,17 @@ public void init() { public void checkOngoingTasks() { logger.info("Performing a scheduled external Globus task check"); List tasks = globusService.findAllOngoingTasks(); - + tasks.forEach(t -> { GlobusTaskState retrieved = globusService.getTask(t.getGlobusToken(), t.getTaskId(), null); if (GlobusUtil.isTaskCompleted(retrieved)) { - if (GlobusUtil.isTaskSucceeded(retrieved)) { - // Do our thing, finalize adding the files to the dataset - globusService.addFilesOnSuccess(t); - } + // Do our thing, finalize adding the files to the dataset + globusService.processCompletedTask(t, GlobusUtil.isTaskSucceeded(retrieved)); // Whether it finished successfully, or failed in the process, // there's no need to keep monitoring this task, so we can - // delete it. - globusService.deleteExternalUploadRecords(t.getTaskId()); + // delete it. + //globusService.deleteExternalUploadRecords(t.getTaskId()); globusService.deleteTask(t); - // @todo double-check that the locks have been properly handled } }); } From 9c62b81c484111df3ed9162c8353aa50bd4b295b Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 19 Aug 2024 10:47:29 -0400 Subject: [PATCH 174/366] refined logging #10623 --- .../dataverse/globus/GlobusServiceBean.java | 231 ++++++++---------- .../iq/dataverse/globus/GlobusUtil.java | 27 ++ .../globus/TaskMonitoringServiceBean.java | 61 ++++- 3 files changed, 191 insertions(+), 128 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 03134d811a7..5e68128c954 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -679,20 +679,24 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S throw new IllegalArgumentException("No valid json entries supplied for the files being uploaded"); } - String logTimestamp = logFormatter.format(new Date()); + Date startDate = new Date(); + + String logTimestamp = logFormatter.format(startDate); Logger globusLogger = Logger.getLogger( "edu.harvard.iq.dataverse.upload.client.DatasetServiceBean." + "GlobusUpload" + logTimestamp); - String logFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "globusUpload_id_" + dataset.getId() + "_" + logTimestamp + String logFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "globusUpload_" + dataset.getId() + "_" + logTimestamp + ".log"; FileHandler fileHandler; - boolean fileHandlerSuceeded; + boolean fileHandlerSuceeded = false; try { fileHandler = new FileHandler(logFileName); globusLogger.setUseParentHandlers(false); fileHandlerSuceeded = true; } catch (IOException | SecurityException ex) { Logger.getLogger(DatasetServiceBean.class.getName()).log(Level.SEVERE, null, ex); - return; // @todo ? + //return; // @todo I don't think we need to return here? + fileHandler = null; + } if (fileHandlerSuceeded) { @@ -727,7 +731,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S // Save the task information in the database so that the Globus monitoring // service can continue checking on its progress. - GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token.getTokenString(), ruleId, new Timestamp(new Date().getTime())); + GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token.getTokenString(), ruleId, new Timestamp(startDate.getTime())); em.persist(taskInProgress); // Save the metadata entries that define the files that are being uploaded @@ -740,6 +744,11 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S em.persist(fileUploadRecord); } + if (fileHandler != null) { + fileHandler.close(); + } + + // return and forget return; } @@ -753,19 +762,62 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S // finish one way or another!) taskState = globusStatusCheck(endpoint, taskIdentifier, globusLogger); // @todo null check, or make sure it's never null - String taskStatus = getTaskStatus(taskState); + String taskStatus = GlobusUtil.getTaskStatus(taskState); + boolean taskSuccess = GlobusUtil.isTaskCompleted(taskState); + + processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, globusLogger, fileHandler, taskSuccess, taskStatus); + + if (fileHandler != null) { + fileHandler.close(); + } + } + /** + * As the name suggests, the method completes and finalizes an upload task, + * whether it completed successfully or failed. (In the latter case, it + * simply sends a failure notification and does some cleanup). + * The method is called in both task monitoring scenarios: the old method, + * that relies on continuous looping, and the new, implemented on the basis + * of timer-like monitoring from a dedicated monitoring Singleton service. + * @param dataset the dataset + * @param filesJsonArray JsonArray containing files metadata entries as passed to /addGlobusFiles + * @param authUser the user that should be be performing the addFiles call + * finalizing adding the files to the Dataset. Note that this + * user will need to be obtained from the saved api token, when this + * method is called via the TaskMonitoringService + * @param ruleId Globus rule/permission id associated with the task + * @param myLogger the Logger; if null, the main logger of the service bean will be used + * @param fileHandler FileHandler associated with the Logger, when not null + * @param taskSuccess boolean task status of the completed task + * @param taskState human-readable task status label as reported by the Globus API + * the method should not throw any exceptions; all the exceptions thrown + * by the methods within are expected to be intercepted. + */ + private void processCompletedUploadTask(Dataset dataset, + JsonArray filesJsonArray, + AuthenticatedUser authUser, + String ruleId, + Logger globusLogger, + FileHandler fileHandler, + boolean taskSuccess, + String taskStatus) { + + Logger myLogger = globusLogger == null ? logger : globusLogger; + if (ruleId != null) { // Transfer is complete, so delete rule - deletePermission(ruleId, dataset, globusLogger); + deletePermission(ruleId, dataset, myLogger); } - + // If success, switch to an EditInProgress lock - do this before removing the // GlobusUpload lock // Keeping a lock through the add datafiles API call avoids a conflicting edit - // and keeps any open dataset page refreshing until the datafile appears - if (!(taskStatus.startsWith("FAILED") || taskStatus.startsWith("INACTIVE"))) { - globusLogger.info("Finished upload via Globus job."); + // and keeps any open dataset page refreshing until the datafile appears. + + // @todo is it necessary? what is wrong exactly with keeping the Globus + // lock on for the duration of the process? + if (taskSuccess) { + myLogger.info("Finished upload via Globus job."); DatasetLock editLock = datasetSvc.addDatasetLock(dataset.getId(), DatasetLock.Reason.EditInProgress, @@ -774,7 +826,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S if (editLock != null) { dataset.addLock(editLock); } else { - globusLogger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId()); + myLogger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId()); } } @@ -792,36 +844,50 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S * addFilesAsync method called within the globusUpload method. I.e. it appeared * that the lock removal was not committed/visible outside this method until * globusUpload itself ended. + * (from @landreev:) If I understand the comment above correctly - annotations + * like "@TransactionAttribute(REQUIRES_NEW) do NOT work when you call a method + * directly within the same service bean. Strictly speaking, it's not the + * "within the same bean" part that is the key, rather, these annotations + * only apply when calling a method via an @EJB-defined service. So it + * is generally possible to call another method within FooServiceBean + * with the REQUIRES_NEW transaction taking effect - but then it would need + * to define *itself* as an @EJB - + * @EJB FooServiceBean fooSvc; + * ... + * fooSvc.doSomethingInNewTransaction(...); + * etc. */ datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.GlobusUpload); } - if (taskStatus.startsWith("FAILED") || taskStatus.startsWith("INACTIVE")) { + if (!taskSuccess) { String comment = "Reason : " + taskStatus.split("#")[1] + "
Short Description : " + taskStatus.split("#")[2]; userNotificationService.sendNotification((AuthenticatedUser) authUser, new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(), comment, true); - globusLogger.info("Globus task failed "); + myLogger.info("Globus task failed "); } else { try { - processUploadedFiles(filesJsonArray, dataset, authUser, globusLogger); + processUploadedFiles(filesJsonArray, dataset, authUser, myLogger); } catch (Exception e) { logger.info("Exception from processUploadedFiles call "); e.printStackTrace(); - globusLogger.info("Exception from processUploadedFiles call " + e.getMessage()); + myLogger.info("Exception from processUploadedFiles call " + e.getMessage()); datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress); - // } } if (ruleId != null) { - deletePermission(ruleId, dataset, globusLogger); - globusLogger.info("Removed upload permission: " + ruleId); - } - if (fileHandlerSuceeded) { - fileHandler.close(); + deletePermission(ruleId, dataset, myLogger); + myLogger.info("Removed upload permission: " + ruleId); } + //if (fileHandler != null) { + // fileHandler.close(); + //} + } + + /** * The code in this method is copy-and-pasted from the previous Borealis * implemenation. @@ -1075,7 +1141,7 @@ public void globusDownload(String jsonData, Dataset dataset, User authUser) thro } task = globusStatusCheck(endpoint, taskIdentifier, globusLogger); // @todo null check - String taskStatus = getTaskStatus(task); + String taskStatus = GlobusUtil.getTaskStatus(task); // Transfer is done (success or failure) so delete the rule if (ruleId != null) { @@ -1132,30 +1198,6 @@ private GlobusTaskState globusStatusCheck(GlobusEndpoint endpoint, String taskId return task; } - private String getTaskStatus(GlobusTaskState task) { - String status = null; - if (task != null) { - status = task.getStatus(); - if (status != null) { - // The task is in progress but is not ok or queued - // (L.A.) I think the assumption here is that this method is called - // exclusively on tasks that have already completed. So that's why - // it is safe to assume that "ACTIVE" means "FAILED". - if (status.equalsIgnoreCase("ACTIVE")) { - status = "FAILED" + "#" + task.getNice_status() + "#" + task.getNice_status_short_description(); - } else { - // The task is either succeeded, failed or inactive. - status = status + "#" + task.getNice_status() + "#" + task.getNice_status_short_description(); - } - } else { - status = "FAILED"; - } - } else { - status = "FAILED"; - } - return status; - } - public JsonObject calculateMissingMetadataFields(List inputList, Logger globusLogger) throws InterruptedException, ExecutionException, IOException { @@ -1386,98 +1428,41 @@ public List findExternalUploadsByTaskId(String tas } // @todo duplicated code, merge with the code handling the "classic" upload workflow - public void processCompletedTask(GlobusTaskInProgress globusTask, boolean taskSuccess) { + public void processCompletedTask(GlobusTaskInProgress globusTask, boolean taskSuccess, String taskStatus, Logger taskLogger) { String ruleId = globusTask.getRuleId(); Dataset dataset = globusTask.getDataset(); - - if (ruleId != null) { - // Transfer is complete, so delete rule - deletePermission(ruleId, dataset, logger); - } - AuthenticatedUser authUser = authSvc.lookupUser(globusTask.getApiToken()); if (authUser == null) { // @todo log error message; do nothing return; } - // Switch the locks on the dataset: - // @todo is it necessary? what is wrong exactly with keeping the Globus - // lock on for the duration of the process? - if (taskSuccess) { - DatasetLock editLock = datasetSvc.addDatasetLock(dataset.getId(), - DatasetLock.Reason.EditInProgress, - (authUser).getId(), - "Completing Globus Upload"); - if (editLock != null) { - dataset.addLock(editLock); - } else { - logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId()); - } - } - - // Remove the Globus lock, regardless of whether this is a success or failure - DatasetLock globusUploadLock = dataset.getLockFor(DatasetLock.Reason.GlobusUpload); - if (globusUploadLock == null) { - logger.log(Level.WARNING, "No GlobusUpload lock found for dataset"); - } else { - logger.log(Level.FINE, "Removing GlobusUpload lock " + globusUploadLock.getId()); - /* - * Note: This call to remove a lock only works immediately because it is in - * another service bean. Despite the removeDatasetLocks method having the - * REQUIRES_NEW transaction annotation, when the globusUpload method and that - * method were in the same bean (globusUpload was in the DatasetServiceBean to - * start), the globus lock was still seen in the API call initiated in the - * addFilesAsync method called within the globusUpload method. I.e. it appeared - * that the lock removal was not committed/visible outside this method until - * globusUpload itself ended. - */ - datasetSvc.removeDatasetLocks(dataset, DatasetLock.Reason.GlobusUpload); - } - - if (taskSuccess && GlobusTaskInProgress.TaskType.UPLOAD.equals(globusTask.getTaskType())) { + if (GlobusTaskInProgress.TaskType.UPLOAD.equals(globusTask.getTaskType())) { List fileUploadsInProgress = findExternalUploadsByTaskId(globusTask.getTaskId()); if (fileUploadsInProgress == null || fileUploadsInProgress.size() < 1) { // @todo log error message; do nothing return; } - addFilesOnSuccess(dataset, authUser, fileUploadsInProgress); - } - - // Handle locks/rules/etc. (?) - if (ruleId != null) { - deletePermission(ruleId, dataset, logger); - logger.info("Removed upload permission: " + ruleId); - } - } - - public void addFilesOnSuccess(Dataset dataset, AuthenticatedUser authUser, List fileUploadsInProgress) { - - JsonArrayBuilder filesJsonArrayBuilder = Json.createArrayBuilder(); - - for (ExternalFileUploadInProgress pendingFile : fileUploadsInProgress) { - String jsonInfoString = pendingFile.getFileInfo(); - JsonObject fileObject = JsonUtil.getJsonObject(jsonInfoString); - filesJsonArrayBuilder.add(fileObject); - } - - JsonArray filesJsonArray = filesJsonArrayBuilder.build(); - - if (filesJsonArray == null || filesJsonArray.size() < 1) { - // @todo log error message; do nothing - return; - } - - try { - processUploadedFiles(filesJsonArray, dataset, authUser, null); - } catch (Exception ex) { - // @todo log error message; make sure the error notification to the - // has been sent (may or may not have already been sent inside the - // method above). + + JsonArrayBuilder filesJsonArrayBuilder = Json.createArrayBuilder(); + + for (ExternalFileUploadInProgress pendingFile : fileUploadsInProgress) { + String jsonInfoString = pendingFile.getFileInfo(); + JsonObject fileObject = JsonUtil.getJsonObject(jsonInfoString); + filesJsonArrayBuilder.add(fileObject); + } + + JsonArray filesJsonArray = filesJsonArrayBuilder.build(); + + //processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, globusLogger, fileHandler, taskSuccess, taskStatus); + processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, taskLogger, null, taskSuccess, taskStatus); + } else { + // @todo extend this async. framework to handle Glonus downloads as well } + } - + public void deleteExternalUploadRecords(String taskId) { em.createNamedQuery("ExternalFileUploadInProgress.deleteByTaskId") .setParameter("taskId", taskId) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java index 67594ad1a5e..652898591ac 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusUtil.java @@ -63,4 +63,31 @@ public static boolean isTaskSucceeded(GlobusTaskState task) { } return false; } + /** + * Produces a human-readable Status label of a completed task + * @param GlobusTaskState task - a looked-up state of a task as reported by Globus API + */ + public static String getTaskStatus(GlobusTaskState task) { + String status = null; + if (task != null) { + status = task.getStatus(); + if (status != null) { + // The task is in progress but is not ok or queued + // (L.A.) I think the assumption here is that this method is called + // exclusively on tasks that have already completed. So that's why + // it is safe to assume that "ACTIVE" means "FAILED". + if (status.equalsIgnoreCase("ACTIVE")) { + status = "FAILED" + "#" + task.getNice_status() + "#" + task.getNice_status_short_description(); + } else { + // The task is either succeeded, failed or inactive. + status = status + "#" + task.getNice_status() + "#" + task.getNice_status_short_description(); + } + } else { + status = "FAILED"; + } + } else { + status = "FAILED"; + } + return status; + } } \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java index 4db25072b6b..a74d0c3f747 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java @@ -12,8 +12,13 @@ import jakarta.ejb.Singleton; import jakarta.ejb.Startup; import jakarta.enterprise.concurrent.ManagedScheduledExecutorService; +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; +import java.util.logging.FileHandler; import java.util.logging.Logger; /** @@ -42,15 +47,16 @@ public class TaskMonitoringServiceBean { SettingsServiceBean settingsSvc; @EJB GlobusServiceBean globusService; - + + private static final SimpleDateFormat logFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss"); + @PostConstruct public void init() { if (systemConfig.isGlobusTaskMonitoringServer()) { logger.info("Starting Globus task monitoring service"); int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault( settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 60); - // @todo scheduleAtFixedDelay() - this.scheduler.scheduleAtFixedRate(this::checkOngoingTasks, + this.scheduler.scheduleWithFixedDelay(this::checkOngoingTasks, 0, pollingInterval, TimeUnit.SECONDS); } else { @@ -68,17 +74,62 @@ public void checkOngoingTasks() { List tasks = globusService.findAllOngoingTasks(); tasks.forEach(t -> { - GlobusTaskState retrieved = globusService.getTask(t.getGlobusToken(), t.getTaskId(), null); + FileHandler taskLogHandler = getTaskLogHandler(t); + Logger taskLogger = getTaskLogger(t, taskLogHandler); + + GlobusTaskState retrieved = globusService.getTask(t.getGlobusToken(), t.getTaskId(), taskLogger); if (GlobusUtil.isTaskCompleted(retrieved)) { // Do our thing, finalize adding the files to the dataset - globusService.processCompletedTask(t, GlobusUtil.isTaskSucceeded(retrieved)); + globusService.processCompletedTask(t, GlobusUtil.isTaskSucceeded(retrieved), GlobusUtil.getTaskStatus(retrieved), taskLogger); // Whether it finished successfully, or failed in the process, // there's no need to keep monitoring this task, so we can // delete it. //globusService.deleteExternalUploadRecords(t.getTaskId()); globusService.deleteTask(t); } + + if (taskLogHandler != null) { + // @todo it should be prudent to cache these loggers and handlers + // between monitoring runs + taskLogHandler.close(); + } }); } + private FileHandler getTaskLogHandler(GlobusTaskInProgress task) { + if (task == null) { + return null; + } + + Date startDate = new Date(task.getStartTime().getTime()); + String logTimeStamp = logFormatter.format(startDate); + + String logFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "globusUpload_" + task.getDataset().getId() + "_" + logTimeStamp + + ".log"; + FileHandler fileHandler; + try { + fileHandler = new FileHandler(logFileName); + } catch (IOException | SecurityException ex) { + // @todo log this error somehow? + fileHandler = null; + } + return fileHandler; + } + + private Logger getTaskLogger(GlobusTaskInProgress task, FileHandler logFileHandler) { + if (logFileHandler == null) { + return null; + } + Date startDate = new Date(task.getStartTime().getTime()); + String logTimeStamp = logFormatter.format(startDate); + + Logger taskLogger = Logger.getLogger( + "edu.harvard.iq.dataverse.upload.client.DatasetServiceBean." + "GlobusUpload" + logTimeStamp); + taskLogger.setUseParentHandlers(false); + + taskLogger.addHandler(logFileHandler); + + return taskLogger; + } + } From 8cdff8d66eb655e8def3e35b21f1a3d438f5608a Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 19 Aug 2024 19:51:43 -0400 Subject: [PATCH 175/366] Added notifications for various failure cases. #10623 --- .../harvard/iq/dataverse/MailServiceBean.java | 27 +++- .../iq/dataverse/UserNotification.java | 3 +- .../iq/dataverse/api/ApiConstants.java | 4 + .../providers/builtin/DataverseUserPage.java | 2 + .../datasetutility/AddReplaceFileHelper.java | 4 +- .../dataverse/globus/GlobusServiceBean.java | 120 ++++++++++-------- .../globus/TaskMonitoringServiceBean.java | 3 +- .../harvard/iq/dataverse/util/MailUtil.java | 17 +++ src/main/java/propertyFiles/Bundle.properties | 9 +- src/main/webapp/dataverseuser.xhtml | 14 ++ 10 files changed, 144 insertions(+), 59 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java index 7359ef8eb33..d29649ad3a6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java @@ -623,6 +623,7 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio comment )) ; return downloadCompletedMessage; + case GLOBUSUPLOADCOMPLETEDWITHERRORS: dataset = (Dataset) targetObject; messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html"); @@ -633,8 +634,30 @@ public String getMessageTextBasedOnNotification(UserNotification userNotificatio comment )) ; return uploadCompletedWithErrorsMessage; + + case GLOBUSUPLOADREMOTEFAILURE: + dataset = (Dataset) targetObject; + messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html"); + String uploadFailedRemotelyMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.upload.failedRemotely", Arrays.asList( + systemConfig.getDataverseSiteUrl(), + dataset.getGlobalId().asString(), + dataset.getDisplayName(), + comment + )) ; + return uploadFailedRemotelyMessage; - case GLOBUSDOWNLOADCOMPLETEDWITHERRORS: + case GLOBUSUPLOADLOCALFAILURE: + dataset = (Dataset) targetObject; + messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html"); + String uploadFailedLocallyMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.upload.failedLocally", Arrays.asList( + systemConfig.getDataverseSiteUrl(), + dataset.getGlobalId().asString(), + dataset.getDisplayName(), + comment + )) ; + return uploadFailedLocallyMessage; + + case GLOBUSDOWNLOADCOMPLETEDWITHERRORS: dataset = (Dataset) targetObject; messageText = BundleUtil.getStringFromBundle("notification.email.greeting.html"); String downloadCompletedWithErrorsMessage = messageText + BundleUtil.getStringFromBundle("notification.mail.globus.download.completedWithErrors", Arrays.asList( @@ -763,6 +786,8 @@ public Object getObjectOfNotification (UserNotification userNotification){ return versionService.find(userNotification.getObjectId()); case GLOBUSUPLOADCOMPLETED: case GLOBUSUPLOADCOMPLETEDWITHERRORS: + case GLOBUSUPLOADREMOTEFAILURE: + case GLOBUSUPLOADLOCALFAILURE: case GLOBUSDOWNLOADCOMPLETED: case GLOBUSDOWNLOADCOMPLETEDWITHERRORS: return datasetService.find(userNotification.getObjectId()); diff --git a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java index 280c2075494..2d37540fab3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/UserNotification.java +++ b/src/main/java/edu/harvard/iq/dataverse/UserNotification.java @@ -39,7 +39,8 @@ public enum Type { CHECKSUMIMPORT, CHECKSUMFAIL, CONFIRMEMAIL, APIGENERATED, INGESTCOMPLETED, INGESTCOMPLETEDWITHERRORS, PUBLISHFAILED_PIDREG, WORKFLOW_SUCCESS, WORKFLOW_FAILURE, STATUSUPDATED, DATASETCREATED, DATASETMENTIONED, GLOBUSUPLOADCOMPLETED, GLOBUSUPLOADCOMPLETEDWITHERRORS, - GLOBUSDOWNLOADCOMPLETED, GLOBUSDOWNLOADCOMPLETEDWITHERRORS, REQUESTEDFILEACCESS; + GLOBUSDOWNLOADCOMPLETED, GLOBUSDOWNLOADCOMPLETEDWITHERRORS, REQUESTEDFILEACCESS, + GLOBUSUPLOADREMOTEFAILURE, GLOBUSUPLOADLOCALFAILURE; public String getDescription() { return BundleUtil.getStringFromBundle("notification.typeDescription." + this.name()); diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java b/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java index 347a8946a46..a2faaf3637c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java @@ -17,4 +17,8 @@ private ApiConstants() { public static final String DS_VERSION_LATEST = ":latest"; public static final String DS_VERSION_DRAFT = ":draft"; public static final String DS_VERSION_LATEST_PUBLISHED = ":latest-published"; + + // addFiles call + public static final String API_ADD_FILES_COUNT_PROCESSED = "Total number of files"; + public static final String API_ADD_FILES_COUNT_SUCCESSFULL = "Number of files successfully added"; } diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java index a0e3f899443..48afb2b830a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java @@ -528,6 +528,8 @@ public void displayNotification() { case GLOBUSUPLOADCOMPLETEDWITHERRORS: case GLOBUSDOWNLOADCOMPLETED: case GLOBUSDOWNLOADCOMPLETEDWITHERRORS: + case GLOBUSUPLOADREMOTEFAILURE: + case GLOBUSUPLOADLOCALFAILURE: userNotification.setTheObject(datasetService.find(userNotification.getObjectId())); break; diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java index 2b35a4cc783..336fa9b5b7a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java @@ -2167,8 +2167,8 @@ public Response addFiles(String jsonData, Dataset dataset, User authUser) { } JsonObjectBuilder result = Json.createObjectBuilder() - .add("Total number of files", totalNumberofFiles) - .add("Number of files successfully added", successNumberofFiles); + .add(ApiConstants.API_ADD_FILES_COUNT_PROCESSED, totalNumberofFiles) + .add(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFULL, successNumberofFiles); return Response.ok().entity(Json.createObjectBuilder() diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 5e68128c954..4bb478d26ed 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -766,7 +766,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S boolean taskSuccess = GlobusUtil.isTaskCompleted(taskState); - processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, globusLogger, fileHandler, taskSuccess, taskStatus); + processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, globusLogger, taskSuccess, taskStatus); if (fileHandler != null) { fileHandler.close(); @@ -798,7 +798,6 @@ private void processCompletedUploadTask(Dataset dataset, AuthenticatedUser authUser, String ruleId, Logger globusLogger, - FileHandler fileHandler, boolean taskSuccess, String taskStatus) { @@ -861,11 +860,17 @@ private void processCompletedUploadTask(Dataset dataset, } if (!taskSuccess) { - String comment = "Reason : " + taskStatus.split("#")[1] + "
Short Description : " - + taskStatus.split("#")[2]; + String comment; + if (taskStatus != null) { + comment = "Reason : " + taskStatus.split("#")[1] + "
Short Description : " + + taskStatus.split("#")[2]; + } else { + comment = "No further information available"; + } + + myLogger.info("Globus Upload task failed "); userNotificationService.sendNotification((AuthenticatedUser) authUser, new Timestamp(new Date().getTime()), - UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(), comment, true); - myLogger.info("Globus task failed "); + UserNotification.Type.GLOBUSUPLOADREMOTEFAILURE, dataset.getId(), comment, true); } else { try { @@ -908,6 +913,8 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut Integer countAll = 0; Integer countSuccess = 0; Integer countError = 0; + Integer countAddFilesSuccess = 0; + String notificationErrorMessage = ""; List inputList = new ArrayList(); @@ -991,13 +998,22 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut myLogger.info("Files processed successfully: " + countSuccess); myLogger.info("Files failures to process: " + countError); - /*String command = "curl -H \"X-Dataverse-key:" + token.getTokenString() + "\" -X POST " - + httpRequestUrl + "/api/datasets/:persistentId/addFiles?persistentId=doi:" - + datasetIdentifier + " -F jsonData='" + newjsonData + "'"; - System.out.println("*******====command ==== " + command);*/ - // ToDo - refactor to call AddReplaceFileHelper.addFiles directly instead of - // calling API - // a quick experimental AddReplaceFileHelper implementation: + if (countSuccess < 1) { + // We don't have any valid entries to call addFiles() for; so, no + // need to proceed. + notificationErrorMessage = "Failed to successfully process any of the file entries, " + + "out of the " + countAll + " total as submitted to Dataverse"; + userNotificationService.sendNotification((AuthenticatedUser) authUser, + new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADREMOTEFAILURE, + dataset.getId(), notificationErrorMessage, true); + return; + } else if (countSuccess < countAll) { + notificationErrorMessage = "Out of the " + countAll + " file entries submitted to /addGlobusFiles " + + "only " + countSuccess + " could be successfully parsed and processed. "; + } + + // A new AddReplaceFileHelper implementation, replacing the old one that + // was relying on calling /addFiles api via curl: // Passing null for the HttpServletRequest to make a new DataverseRequest. // The parent method is always executed asynchronously, so the real request @@ -1028,55 +1044,57 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut JsonObject addFilesJsonObject = JsonUtil.getJsonObject(addFilesResponse.getEntity().toString()); - // @todo null checks etc. + // @todo null check? String addFilesStatus = addFilesJsonObject.getString("status", null); myLogger.info("addFilesResponse status: " + addFilesStatus); - if (ApiConstants.STATUS_OK.equalsIgnoreCase(addFilesStatus)) { - if (addFilesJsonObject.containsKey("data")) { - JsonObject responseFilesData = addFilesJsonObject.getJsonObject("data"); - if (responseFilesData.containsKey("Result")) { - JsonObject addFilesResult = responseFilesData.getJsonObject("Result"); - - Integer addFilesTotal = addFilesResult.getInt("Total number of files", -1); - Integer addFilesSuccess = addFilesResult.getInt("Number of files successfully added", -1); - // @todo handle -1 (missing values) above - // @todo log all this stuff in a task-specific log (??) - myLogger.info("Files processed by addFiles: " + addFilesTotal + ", successfully added: " + addFilesSuccess); - // @todo incorporate this into the user notification - } else { - logger.warning("Malformed addFiles data section: "+ responseFilesData.toString()); - } - } else { - logger.warning("Malformed addFiles response json: " + addFilesJsonObject.toString()); - } - - // if(!taskSkippedFiles) - if (countError == 0) { - userNotificationService.sendNotification((AuthenticatedUser) authUser, - new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADCOMPLETED, - dataset.getId(), countSuccess + " files added out of " + countAll, true); + if (addFilesJsonObject.containsKey("data") && addFilesJsonObject.getJsonObject("data").containsKey("Result")) { + + //Integer countAddFilesTotal = addFilesJsonObject.getJsonObject("data").getJsonObject("Result").getInt(ApiConstants.API_ADD_FILES_COUNT_PROCESSED, -1); + countAddFilesSuccess = addFilesJsonObject.getJsonObject("data").getJsonObject("Result").getInt(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFULL, -1); + myLogger.info("Files successfully added by addFiles(): " + countAddFilesSuccess); + } else { - userNotificationService.sendNotification((AuthenticatedUser) authUser, - new Timestamp(new Date().getTime()), - UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(), - countSuccess + " files added out of " + countAll, true); + myLogger.warning("Malformed addFiles response json: " + addFilesJsonObject.toString()); + notificationErrorMessage = "Malformed response received when attempting to add the files to the dataset. "; } - myLogger.info("Successfully completed addFiles call "); + + myLogger.info("Completed addFiles call "); } else if (ApiConstants.STATUS_ERROR.equalsIgnoreCase(addFilesStatus)) { String addFilesMessage = addFilesJsonObject.getString("message", null); - + myLogger.log(Level.SEVERE, "******* Error while executing addFiles ", newjsonData); myLogger.log(Level.SEVERE, "****** Output from addFiles: ", addFilesMessage); - // @todo send Failure notification + notificationErrorMessage += "Error response received when attempting to add the files to the dataset: " + addFilesMessage + " "; } else { myLogger.log(Level.SEVERE, "******* Error while executing addFiles ", newjsonData); - // @todo send Failure notification + notificationErrorMessage += "Unexpected error encountered when attemptingh to add the files to the dataset."; + } + + // if(!taskSkippedFiles) + if (countAddFilesSuccess == countAll) { + userNotificationService.sendNotification((AuthenticatedUser) authUser, + new Timestamp(new Date().getTime()), UserNotification.Type.GLOBUSUPLOADCOMPLETED, + dataset.getId(), countSuccess + " files added out of " + countAll, true); + } else if (countAddFilesSuccess > 0) { + // success, but partial: + userNotificationService.sendNotification((AuthenticatedUser) authUser, + new Timestamp(new Date().getTime()), + UserNotification.Type.GLOBUSUPLOADCOMPLETEDWITHERRORS, dataset.getId(), + countSuccess + " files added out of " + countAll + notificationErrorMessage, true); + } else { + notificationErrorMessage = "".equals(notificationErrorMessage) + ? " No additional information is available." : notificationErrorMessage; + userNotificationService.sendNotification((AuthenticatedUser) authUser, + new Timestamp(new Date().getTime()), + UserNotification.Type.GLOBUSUPLOADLOCALFAILURE, dataset.getId(), + notificationErrorMessage, true); } + } @Asynchronous @@ -1140,7 +1158,7 @@ public void globusDownload(String jsonData, Dataset dataset, User authUser) thro logger.warning("ruleId not found for taskId: " + taskIdentifier); } task = globusStatusCheck(endpoint, taskIdentifier, globusLogger); - // @todo null check + // @todo null check? String taskStatus = GlobusUtil.getTaskStatus(task); // Transfer is done (success or failure) so delete the rule @@ -1427,13 +1445,13 @@ public List findExternalUploadsByTaskId(String tas return em.createNamedQuery("ExternalFileUploadInProgress.findByTaskId").setParameter("taskId", taskId).getResultList(); } - // @todo duplicated code, merge with the code handling the "classic" upload workflow public void processCompletedTask(GlobusTaskInProgress globusTask, boolean taskSuccess, String taskStatus, Logger taskLogger) { String ruleId = globusTask.getRuleId(); Dataset dataset = globusTask.getDataset(); AuthenticatedUser authUser = authSvc.lookupUser(globusTask.getApiToken()); if (authUser == null) { // @todo log error message; do nothing + // (the fields in GlobusTaskInProgress are not nullable though - ?) return; } @@ -1442,6 +1460,7 @@ public void processCompletedTask(GlobusTaskInProgress globusTask, boolean taskSu if (fileUploadsInProgress == null || fileUploadsInProgress.size() < 1) { // @todo log error message; do nothing + // (will this ever happen though?) return; } @@ -1455,10 +1474,9 @@ public void processCompletedTask(GlobusTaskInProgress globusTask, boolean taskSu JsonArray filesJsonArray = filesJsonArrayBuilder.build(); - //processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, globusLogger, fileHandler, taskSuccess, taskStatus); - processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, taskLogger, null, taskSuccess, taskStatus); + processCompletedUploadTask(dataset, filesJsonArray, authUser, ruleId, taskLogger, taskSuccess, taskStatus); } else { - // @todo extend this async. framework to handle Glonus downloads as well + // @todo eventually, extend this async. framework to handle Glonus downloads as well } } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java index a74d0c3f747..c956831317c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java @@ -67,7 +67,6 @@ public void init() { /** * This method will be executed on a timer-like schedule, continuously * monitoring all the ongoing external Globus tasks (transfers). - * @todo make sure the executions do not overlap/stack up */ public void checkOngoingTasks() { logger.info("Performing a scheduled external Globus task check"); @@ -90,7 +89,7 @@ public void checkOngoingTasks() { if (taskLogHandler != null) { // @todo it should be prudent to cache these loggers and handlers - // between monitoring runs + // between monitoring runs (should be fairly easy to do) taskLogHandler.close(); } }); diff --git a/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java index 36c249de834..f81ce093815 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java @@ -99,6 +99,23 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti } catch (Exception e) { return BundleUtil.getStringFromBundle("notification.email.globus.uploadCompletedWithErrors.subject", rootDvNameAsList); } + case GLOBUSUPLOADREMOTEFAILURE: + try { + DatasetVersion version = (DatasetVersion)objectOfNotification; + List dsNameAsList = Arrays.asList(version.getDataset().getDisplayName()); + return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedRemotely.subject", dsNameAsList); + + } catch (Exception e) { + return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedRemotely.subject", rootDvNameAsList); + } + case GLOBUSUPLOADLOCALFAILURE: + try { + DatasetVersion version = (DatasetVersion)objectOfNotification; + List dsNameAsList = Arrays.asList(version.getDataset().getDisplayName()); + return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedLocally.subject", dsNameAsList); + } catch (Exception e) { + return BundleUtil.getStringFromBundle("notification.email.globus.uploadFailedLocally.subject", rootDvNameAsList); + } case GLOBUSDOWNLOADCOMPLETEDWITHERRORS: try { DatasetVersion version = (DatasetVersion)objectOfNotification; diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 4b366522966..e0488f95e2c 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -253,11 +253,16 @@ notification.mail.import.filesystem=Dataset {2} ({0}/dataset.xhtml?persistentId= notification.mail.globus.upload.completed=Globus transfer to Dataset {2} was successful. File(s) have been uploaded and verified.

{3}
notification.mail.globus.download.completed=Globus transfer of file(s) from the dataset {2} was successful.

{3}
notification.mail.globus.upload.completedWithErrors=Globus transfer to Dataset {2} is complete with errors.

{3}
+notification.mail.globus.upload.failedRemotely=Remote data transfer between Globus collections for Dataset {2} failed, reported via Globus API.

{3}
+notification.mail.globus.upload.failedLocally=Dataverse received a confirmation of a successful Globus data transfer for Dataset {2}, but failed to add the files to the dataset locally.

{3}
notification.mail.globus.download.completedWithErrors=Globus transfer from the dataset {2} is complete with errors.

{3}
notification.import.filesystem=Dataset {1} has been successfully uploaded and verified. notification.globus.upload.completed=Globus transfer to Dataset {1} was successful. File(s) have been uploaded and verified. notification.globus.download.completed=Globus transfer from the dataset {1} was successful. notification.globus.upload.completedWithErrors=Globus transfer to Dataset {1} is complete with errors. +notification.globus.upload.failedRemotely=Remote data transfer between Globus collections for Dataset {2} failed, reported via Globus API.

{3}
+notification.globus.upload.failedLocally=Dataverse received a confirmation of a successful Globus data transfer for Dataset {2}, but failed to add the files to the dataset locally.

{3}
+ notification.globus.download.completedWithErrors=Globus transfer from the dataset {1} is complete with errors. notification.import.checksum={1}, dataset had file checksums added via a batch job. removeNotification=Remove Notification @@ -823,8 +828,8 @@ notification.email.datasetWasMentioned.subject={0}: A Dataset Relationship has b notification.email.globus.uploadCompleted.subject={0}: Files uploaded successfully via Globus and verified notification.email.globus.downloadCompleted.subject={0}: Files downloaded successfully via Globus notification.email.globus.uploadCompletedWithErrors.subject={0}: Uploaded files via Globus with errors -notification.email.globus.downloadCompletedWithErrors.subject={0}: Downloaded files via Globus with errors - +notification.email.globus.uploadFailedRemotely.subject={0}: Failed to upload files via Globus +notification.email.globus.uploadFailedLocally.subject={0}: Failed to add files uploaded via Globus to dataset # dataverse.xhtml dataverse.name=Dataverse Name dataverse.name.title=The project, department, university, professor, or journal this dataverse will contain data for. diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index 9ed8b5209b6..d061348ad87 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -367,6 +367,20 @@ + + + + + + + + + + + + + + From 531e25c05df0ec507b5e3c0650033b0691c96df2 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 20 Aug 2024 09:23:36 -0400 Subject: [PATCH 176/366] Config guide entry. #10623 --- doc/sphinx-guides/source/installation/config.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 0038c188ea5..01bf1419a52 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -3259,6 +3259,13 @@ The email for your institution that you'd like to appear in bag-info.txt. See :r Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_BAGIT_SOURCEORG_EMAIL``. +.. _dataverse.bagit.sourceorg.email: + +dataverse.globus.taskMonitoringServer ++++++++++++++++++++++++++++++++++++++ + +This setting is required in conjunction with the ``globus-use-experimental-async-framework`` feature flag. Setting it to true designates the Dataverse instance to serve as the dedicated polling server. It is needed so that the new framework can be used in a multi-node installation. + .. _feature-flags: Feature Flags @@ -3294,6 +3301,9 @@ please find all known feature flags below. Any of these flags can be activated u * - disable-return-to-author-reason - Removes the reason field in the `Publish/Return To Author` dialog that was added as a required field in v6.2 and makes the reason an optional parameter in the :ref:`return-a-dataset` API call. - ``Off`` + * - globus-use-experimental-async-framework + - Activates a new experimental implementation of Globus polling of ongoing remote data transfers that does not rely on the instance staying up continuously for the duration of the transfers and saves the state information about Globus upload requests in the database. Added in v6.4. Note that the JVM option ``dataverse.globus.taskMonitoringServer`` described above must also be enabled on one (and only one, in a multi-node installation) Dataverse instance. + - ``Off`` **Note:** Feature flags can be set via any `supported MicroProfile Config API source`_, e.g. the environment variable From 007d7150763b55db95c35d3007900cfe46d0f50d Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 20 Aug 2024 09:47:41 -0400 Subject: [PATCH 177/366] Added a few more doc notes. #10623 --- doc/release-notes/10623-globus-improvements.md | 1 + doc/sphinx-guides/source/developers/big-data-support.rst | 2 ++ doc/sphinx-guides/source/developers/globus-api.rst | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 doc/release-notes/10623-globus-improvements.md diff --git a/doc/release-notes/10623-globus-improvements.md b/doc/release-notes/10623-globus-improvements.md new file mode 100644 index 00000000000..03579b59631 --- /dev/null +++ b/doc/release-notes/10623-globus-improvements.md @@ -0,0 +1 @@ +A new alternative implementation of Globus polling during upload data transfers has been added in this release. This experimental framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. See the `globus-use-experimental-async-framework` feature flag in the Configuration guide. \ No newline at end of file diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst index 4aaed10512e..99ea4d2e0ba 100644 --- a/doc/sphinx-guides/source/developers/big-data-support.rst +++ b/doc/sphinx-guides/source/developers/big-data-support.rst @@ -187,3 +187,5 @@ As described in that document, Globus transfers can be initiated by choosing the An overview of the control and data transfer interactions between components was presented at the 2022 Dataverse Community Meeting and can be viewed in the `Integrations and Tools Session Video `_ around the 1 hr 28 min mark. See also :ref:`Globus settings <:GlobusSettings>`. + +An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.globus.taskMonitoringServer`` described in the Configuration guide. diff --git a/doc/sphinx-guides/source/developers/globus-api.rst b/doc/sphinx-guides/source/developers/globus-api.rst index 902fc9db2ee..0f16dc704ef 100644 --- a/doc/sphinx-guides/source/developers/globus-api.rst +++ b/doc/sphinx-guides/source/developers/globus-api.rst @@ -185,6 +185,8 @@ As the transfer can take significant time and the API call is asynchronous, the Once the transfer completes, Dataverse will remove the write permission for the principal. +An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This new framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.globus.taskMonitoringServer`` described in the Configuration guide. + Note that when using a managed endpoint that uses the Globus S3 Connector, the checksum should be correct as Dataverse can validate it. For file-based endpoints, the checksum should be included if available but Dataverse cannot verify it. In the remote/reference case, where there is no transfer to monitor, the standard /addFiles API call (see :ref:`direct-add-to-dataset-api`) is used instead. There are no changes for the Globus case. From 6fcb2856f15ff88b9b0ae4f82dd3caf40b5cb2c3 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 20 Aug 2024 10:47:55 -0400 Subject: [PATCH 178/366] typo #10623 --- src/main/webapp/dataverseuser.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index d061348ad87..bcb71733716 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -374,7 +374,7 @@ - + From f6882df1ea49acb322cd5091a6bf1f6d8e075cfd Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 20 Aug 2024 11:17:14 -0400 Subject: [PATCH 179/366] cut-and-paste error #10623 --- doc/sphinx-guides/source/installation/config.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 01bf1419a52..731eef71c57 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -3259,7 +3259,7 @@ The email for your institution that you'd like to appear in bag-info.txt. See :r Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_BAGIT_SOURCEORG_EMAIL``. -.. _dataverse.bagit.sourceorg.email: +.. _dataverse.globus.taskMonitoringServer: dataverse.globus.taskMonitoringServer +++++++++++++++++++++++++++++++++++++ From 4ae3ee6e4c268fa5911bff8e05377d85f45e5a94 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 20 Aug 2024 11:31:10 -0400 Subject: [PATCH 180/366] (#10623) --- .../java/edu/harvard/iq/dataverse/settings/FeatureFlags.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java b/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java index 746e6e3b75d..c8983b80df1 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/FeatureFlags.java @@ -92,8 +92,7 @@ public enum FeatureFlags { */ DISABLE_RETURN_TO_AUTHOR_REASON("disable-return-to-author-reason"), /** - * TEMPORARY feature flag for the new Globus upload framework (will only be - * used for testing). + * Feature flag for the new Globus upload framework. */ GLOBUS_USE_EXPERIMENTAL_ASYNC_FRAMEWORK("globus-use-experimental-async-framework"), ; From 9cf4e1b90888cf0d78f3659c2098bf142b5192a0 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 21 Aug 2024 18:26:24 -0400 Subject: [PATCH 181/366] some minor cleanup changes #10623 --- .../ExternalFileUploadInProgress.java | 4 ---- .../datasetutility/AddReplaceFileHelper.java | 4 ++-- .../impl/UpdateDatasetVersionCommand.java | 22 +------------------ .../globus/GlobusTaskInProgress.java | 4 ---- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java index ab6a1798307..96bfd3f63f5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java +++ b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ package edu.harvard.iq.dataverse; import jakarta.persistence.Column; diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java index 336fa9b5b7a..8e7c07b80bb 100644 --- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java @@ -2139,7 +2139,7 @@ public Response addFiles(String jsonData, Dataset dataset, User authUser) { logger.log(Level.WARNING, "Dataset not locked for EditInProgress "); } else { datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress); - logger.log(Level.INFO, "Removed EditInProgress lock "+eipLock.getId()); + logger.log(Level.FINE, "Removed EditInProgress lock"); } try { @@ -2306,7 +2306,7 @@ public Response replaceFiles(String jsonData, Dataset ds, User authUser) { logger.warning("Dataset not locked for EditInProgress "); } else { datasetService.removeDatasetLocks(dataset, DatasetLock.Reason.EditInProgress); - logger.info("Removed EditInProgress lock "); + logger.fine("Removed EditInProgress lock "); } try { diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java index faf8884b08d..cad61000e69 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java @@ -103,9 +103,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException { } Dataset theDataset = getDataset(); - //ctxt.permissions().checkUpdateDatasetVersionLock(theDataset, getRequest(), this); - // this is an experiment (probably temporary) - checkUpdateDatasetVersionLock(ctxt); + ctxt.permissions().checkUpdateDatasetVersionLock(theDataset, getRequest(), this); Dataset savedDataset = null; @@ -302,22 +300,4 @@ public boolean onSuccess(CommandContext ctxt, Object r) { return true; } - private void checkUpdateDatasetVersionLock(CommandContext ctxt) throws IllegalCommandException { - List locks = ctxt.datasets().getLocksByDatasetId(getDataset().getId()); - //locks.forEach(lock -> { - for (DatasetLock lock : locks) { - // Ingest lock is ok: - if (DatasetLock.Reason.Ingest != lock.getReason()) { - // with Workflow lock *some* users can edit; - // any other kind of lock - nope - if (DatasetLock.Reason.Workflow != lock.getReason() - || !ctxt.permissions().isMatchingWorkflowLock(getDataset(), - getUser().getIdentifier(), - getRequest().getWFInvocationId())) { - throw new IllegalCommandException( - BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), this); - } - } - } - } } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java index d3d06d38151..0a56b4933a1 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ package edu.harvard.iq.dataverse.globus; import edu.harvard.iq.dataverse.Dataset; From 45fb938acb3fcd027920d8f5308a026713dc942c Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 21 Aug 2024 18:30:49 -0400 Subject: [PATCH 182/366] cosmetic #10623 --- .../engine/command/impl/UpdateDatasetVersionCommand.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java index cad61000e69..e04cae13b35 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetVersionCommand.java @@ -14,7 +14,6 @@ import edu.harvard.iq.dataverse.engine.command.RequiredPermissions; import edu.harvard.iq.dataverse.engine.command.exception.CommandException; import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException; -import edu.harvard.iq.dataverse.util.BundleUtil; import edu.harvard.iq.dataverse.util.DatasetFieldUtil; import edu.harvard.iq.dataverse.util.FileMetadataUtil; @@ -104,7 +103,6 @@ public Dataset execute(CommandContext ctxt) throws CommandException { Dataset theDataset = getDataset(); ctxt.permissions().checkUpdateDatasetVersionLock(theDataset, getRequest(), this); - Dataset savedDataset = null; DatasetVersion persistedVersion = clone; From b3f79fe3102a308df1c8354465adb1f3b9bd2244 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 21 Aug 2024 18:40:39 -0400 Subject: [PATCH 183/366] extra L in SUCCESSFUL (#10623) --- src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java | 2 +- .../iq/dataverse/datasetutility/AddReplaceFileHelper.java | 2 +- .../java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java b/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java index a2faaf3637c..15114085c21 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/ApiConstants.java @@ -20,5 +20,5 @@ private ApiConstants() { // addFiles call public static final String API_ADD_FILES_COUNT_PROCESSED = "Total number of files"; - public static final String API_ADD_FILES_COUNT_SUCCESSFULL = "Number of files successfully added"; + public static final String API_ADD_FILES_COUNT_SUCCESSFUL = "Number of files successfully added"; } diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java index 8e7c07b80bb..a470f08f736 100644 --- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java @@ -2168,7 +2168,7 @@ public Response addFiles(String jsonData, Dataset dataset, User authUser) { JsonObjectBuilder result = Json.createObjectBuilder() .add(ApiConstants.API_ADD_FILES_COUNT_PROCESSED, totalNumberofFiles) - .add(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFULL, successNumberofFiles); + .add(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFUL, successNumberofFiles); return Response.ok().entity(Json.createObjectBuilder() diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 4bb478d26ed..ae84cad545c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -1052,7 +1052,7 @@ private void processUploadedFiles(JsonArray filesJsonArray, Dataset dataset, Aut if (addFilesJsonObject.containsKey("data") && addFilesJsonObject.getJsonObject("data").containsKey("Result")) { //Integer countAddFilesTotal = addFilesJsonObject.getJsonObject("data").getJsonObject("Result").getInt(ApiConstants.API_ADD_FILES_COUNT_PROCESSED, -1); - countAddFilesSuccess = addFilesJsonObject.getJsonObject("data").getJsonObject("Result").getInt(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFULL, -1); + countAddFilesSuccess = addFilesJsonObject.getJsonObject("data").getJsonObject("Result").getInt(ApiConstants.API_ADD_FILES_COUNT_SUCCESSFUL, -1); myLogger.info("Files successfully added by addFiles(): " + countAddFilesSuccess); } else { From 1acae684c31542591ba9e407e8c50cb80de1993a Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 21 Aug 2024 18:58:08 -0400 Subject: [PATCH 184/366] better Globus service availability checks #10623 --- .../harvard/iq/dataverse/api/Datasets.java | 22 ++++++++++++++----- src/main/java/propertyFiles/Bundle.properties | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index 4c547f5295f..aa6989d365a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -3908,7 +3908,7 @@ public Response requestGlobusUpload(@Context ContainerRequestContext crc, @PathP if (!systemConfig.isGlobusUpload()) { return error(Response.Status.SERVICE_UNAVAILABLE, - BundleUtil.getStringFromBundle("datasets.api.globusdownloaddisabled")); + BundleUtil.getStringFromBundle("datasets.api.globusuploaddisabled")); } // ------------------------------------- @@ -4008,11 +4008,6 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, logger.info(" ==== (api addGlobusFilesToDataset) jsonData ====== " + jsonData); - if (!systemConfig.isHTTPUpload()) { - // @todo why isHTTPUpload()? - shouldn't it be checking isGlobusUpload() here? - return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.httpDisabled")); - } - // ------------------------------------- // (1) Get the user from the API key // ------------------------------------- @@ -4035,6 +4030,21 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, return wr.getResponse(); } + // Is Globus upload service available? + + // ... on this Dataverse instance? + if (!systemConfig.isGlobusUpload()) { + return error(Response.Status.SERVICE_UNAVAILABLE, BundleUtil.getStringFromBundle("file.api.globusUploadDisabled")); + } + + // ... and on this specific Dataset? + String storeId = dataset.getEffectiveStorageDriverId(); + // acceptsGlobusTransfers should only be true for an S3 or globus store + if (!GlobusAccessibleStore.acceptsGlobusTransfers(storeId) + && !GlobusAccessibleStore.allowsGlobusReferences(storeId)) { + return badRequest(BundleUtil.getStringFromBundle("datasets.api.globusuploaddisabled")); + } + // @todo check if the dataset is already locked! JsonObject jsonObject = null; diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index e0488f95e2c..25ae8ad00c0 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -1765,6 +1765,7 @@ file.fromWebloaderAfterCreate.tip=An option to upload a folder of files will be file.fromWebloader=Upload a Folder file.api.httpDisabled=File upload via HTTP is not available for this installation of Dataverse. +file.api.globusUploadDisabled=File upload via Globus is not available for this installation of Dataverse. file.api.alreadyHasPackageFile=File upload via HTTP disabled since this dataset already contains a package file. file.replace.original=Original File file.editFiles=Edit Files From 5ba28883e2cdce99da768ebaa07ddd055f1b1229 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 21 Aug 2024 19:03:18 -0400 Subject: [PATCH 185/366] better Globus service availability checks #10623 --- src/main/java/edu/harvard/iq/dataverse/api/Datasets.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index aa6989d365a..ac5b9147dff 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -3908,7 +3908,7 @@ public Response requestGlobusUpload(@Context ContainerRequestContext crc, @PathP if (!systemConfig.isGlobusUpload()) { return error(Response.Status.SERVICE_UNAVAILABLE, - BundleUtil.getStringFromBundle("datasets.api.globusuploaddisabled")); + BundleUtil.getStringFromBundle("file.api.globusUploadDisabled")); } // ------------------------------------- From 2512eab74e82284a4eae6fe29c172a869dbb64a8 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 21 Aug 2024 19:12:43 -0400 Subject: [PATCH 186/366] removed an unnecessary @todo (#10623) --- .../edu/harvard/iq/dataverse/globus/GlobusServiceBean.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index ae84cad545c..6d3138856f2 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -687,19 +687,16 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S String logFileName = System.getProperty("com.sun.aas.instanceRoot") + File.separator + "logs" + File.separator + "globusUpload_" + dataset.getId() + "_" + logTimestamp + ".log"; FileHandler fileHandler; - boolean fileHandlerSuceeded = false; + try { fileHandler = new FileHandler(logFileName); globusLogger.setUseParentHandlers(false); - fileHandlerSuceeded = true; } catch (IOException | SecurityException ex) { Logger.getLogger(DatasetServiceBean.class.getName()).log(Level.SEVERE, null, ex); - //return; // @todo I don't think we need to return here? fileHandler = null; - } - if (fileHandlerSuceeded) { + if (fileHandler != null) { globusLogger.addHandler(fileHandler); } else { globusLogger = logger; From 6b06d9472326b28c3d47e549e14e5ee2af7e6bd3 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 21 Aug 2024 19:20:22 -0400 Subject: [PATCH 187/366] cosmetic #10623 --- .../edu/harvard/iq/dataverse/globus/GlobusServiceBean.java | 2 -- .../iq/dataverse/globus/TaskMonitoringServiceBean.java | 4 ---- 2 files changed, 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 6d3138856f2..133da0a1cab 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -810,8 +810,6 @@ private void processCompletedUploadTask(Dataset dataset, // Keeping a lock through the add datafiles API call avoids a conflicting edit // and keeps any open dataset page refreshing until the datafile appears. - // @todo is it necessary? what is wrong exactly with keeping the Globus - // lock on for the duration of the process? if (taskSuccess) { myLogger.info("Finished upload via Globus job."); diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java index c956831317c..5dd4ce312b6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java @@ -1,7 +1,3 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ package edu.harvard.iq.dataverse.globus; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; From 6d06927169f0c7780ba02791ce3b77d90b9121b3 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Thu, 22 Aug 2024 10:54:06 -0400 Subject: [PATCH 188/366] more changes per feedback. (saving the api token in the GlobusTask entity was a BAD idea!) #10623 --- .../harvard/iq/dataverse/api/Datasets.java | 6 +--- .../dataverse/globus/GlobusServiceBean.java | 9 +++--- .../globus/GlobusTaskInProgress.java | 29 +++++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index ac5b9147dff..960cc408ee5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -4077,19 +4077,15 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, logger.log(Level.WARNING, "Failed to lock the dataset (dataset id={0})", dataset.getId()); } - - ApiToken token = authSvc.findApiTokenByUser(authUser); - if(uriInfo != null) { logger.info(" ==== (api uriInfo.getRequestUri()) jsonData ====== " + uriInfo.getRequestUri().toString()); } - String requestUrl = SystemConfig.getDataverseSiteUrlStatic(); // Async Call try { - globusService.globusUpload(jsonObject, token, dataset, requestUrl, authUser); + globusService.globusUpload(jsonObject, dataset, requestUrl, authUser); } catch (IllegalArgumentException ex) { return badRequest("Invalid parameters: "+ex.getMessage()); } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java index 133da0a1cab..ac3c81622fc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusServiceBean.java @@ -667,7 +667,7 @@ private String getGlobusDownloadScript(Dataset dataset, ApiToken apiToken, List< @Asynchronous @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, String httpRequestUrl, + public void globusUpload(JsonObject jsonData, Dataset dataset, String httpRequestUrl, AuthenticatedUser authUser) throws IllegalArgumentException, ExecutionException, InterruptedException, MalformedURLException { // Before we do anything else, let's do some basic validation of what @@ -728,7 +728,7 @@ public void globusUpload(JsonObject jsonData, ApiToken token, Dataset dataset, S // Save the task information in the database so that the Globus monitoring // service can continue checking on its progress. - GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), token.getTokenString(), ruleId, new Timestamp(startDate.getTime())); + GlobusTaskInProgress taskInProgress = new GlobusTaskInProgress(taskIdentifier, GlobusTaskInProgress.TaskType.UPLOAD, dataset, endpoint.getClientToken(), authUser, ruleId, new Timestamp(startDate.getTime())); em.persist(taskInProgress); // Save the metadata entries that define the files that are being uploaded @@ -1443,10 +1443,9 @@ public List findExternalUploadsByTaskId(String tas public void processCompletedTask(GlobusTaskInProgress globusTask, boolean taskSuccess, String taskStatus, Logger taskLogger) { String ruleId = globusTask.getRuleId(); Dataset dataset = globusTask.getDataset(); - AuthenticatedUser authUser = authSvc.lookupUser(globusTask.getApiToken()); + AuthenticatedUser authUser = globusTask.getLocalUser(); if (authUser == null) { - // @todo log error message; do nothing - // (the fields in GlobusTaskInProgress are not nullable though - ?) + // @todo log error message; do nothing return; } diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java index 0a56b4933a1..8644bca6143 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/GlobusTaskInProgress.java @@ -1,6 +1,7 @@ package edu.harvard.iq.dataverse.globus; import edu.harvard.iq.dataverse.Dataset; +import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser; import jakarta.persistence.Column; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -14,6 +15,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; /** * @@ -67,24 +69,27 @@ public String toString() { } } - @Column + @Column(nullable=false) @Enumerated(EnumType.STRING) private TaskType taskType; /** * Globus API token that should be used to monitor the status of the task */ - @Column + @Column(nullable=false) private String globusToken; /** - * This is the Dataverse API token of the user who initiated the Globus task - */ - private String apiToken; + * This is the the user who initiated the Globus task + */ + @ManyToOne + @JoinColumn + private AuthenticatedUser user; - @Column + @Column(nullable=false) private String ruleId; + @JoinColumn(nullable = false) @ManyToOne private Dataset dataset; @@ -94,12 +99,12 @@ public String toString() { public GlobusTaskInProgress() { } - GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String globusToken, String apiToken, String ruleId, Timestamp startTime) { + GlobusTaskInProgress(String taskId, TaskType taskType, Dataset dataset, String globusToken, AuthenticatedUser authUser, String ruleId, Timestamp startTime) { this.taskId = taskId; this.taskType = taskType; this.dataset = dataset; this.globusToken = globusToken; - this.apiToken = apiToken; + this.user = authUser; this.ruleId = ruleId; this.startTime = startTime; } @@ -138,12 +143,12 @@ public void setGlobusToken(String clientToken) { this.globusToken = clientToken; } - public String getApiToken() { - return apiToken; + public AuthenticatedUser getLocalUser() { + return user; } - public void setApiToken(String apiToken) { - this.apiToken = apiToken; + public void setLocalUser(AuthenticatedUser authUser) { + this.user = authUser; } public String getRuleId() { From 69cfe2909deb099a201442d36101d6686204ad70 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Fri, 23 Aug 2024 12:40:58 -0400 Subject: [PATCH 189/366] changed the polling interval default in the new TaskMonitoringServiceBean #10623 --- doc/sphinx-guides/source/installation/config.rst | 2 +- .../iq/dataverse/globus/TaskMonitoringServiceBean.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 731eef71c57..fe438504f06 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -4784,7 +4784,7 @@ The URL where the `dataverse-globus tasks = globusService.findAllOngoingTasks(); tasks.forEach(t -> { From d223a8f69166778b5015d7d9ad4f8e733ce22394 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Fri, 23 Aug 2024 13:31:02 -0400 Subject: [PATCH 190/366] more changes/refinements per review feedback (#10623) --- .../iq/dataverse/globus/TaskMonitoringServiceBean.java | 3 ++- .../harvard/iq/dataverse/ingest/IngestServiceBean.java | 4 ++-- .../edu/harvard/iq/dataverse/settings/JvmSettings.java | 1 + .../java/edu/harvard/iq/dataverse/util/SystemConfig.java | 9 --------- src/main/java/propertyFiles/Bundle.properties | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java index 341714539cf..fdb2b222804 100644 --- a/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/globus/TaskMonitoringServiceBean.java @@ -1,5 +1,6 @@ package edu.harvard.iq.dataverse.globus; +import edu.harvard.iq.dataverse.settings.JvmSettings; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; import edu.harvard.iq.dataverse.util.SystemConfig; import jakarta.annotation.PostConstruct; @@ -48,7 +49,7 @@ public class TaskMonitoringServiceBean { @PostConstruct public void init() { - if (systemConfig.isGlobusTaskMonitoringServer()) { + if (JvmSettings.GLOBUS_TASK_MONITORING_SERVER.lookupOptional(Boolean.class).orElse(false)) { logger.info("Starting Globus task monitoring service"); int pollingInterval = SystemConfig.getIntLimitFromStringOrDefault( settingsSvc.getValueForKey(SettingsServiceBean.Key.GlobusPollingInterval), 600); diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java index 3f76a319902..b42fd950528 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java @@ -345,8 +345,8 @@ public List saveAndAddFilesToDataset(DatasetVersion version, StorageIO dataAccess = DataAccess.getStorageIO(dataFile); //Populate metadata dataAccess.open(DataAccessOption.READ_ACCESS); - // (this will make a remote call to check if the file exists - // and obtain its size) + // (the .open() above makes a remote call to check if + // the file exists and obtains its size) confirmedFileSize = dataAccess.getSize(); // For directly-uploaded files, we will perform the file size diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java index 9d13be005c9..262d488acab 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java @@ -51,6 +51,7 @@ public enum JvmSettings { DOCROOT_DIRECTORY(SCOPE_FILES, "docroot"), GUESTBOOK_AT_REQUEST(SCOPE_FILES, "guestbook-at-request"), GLOBUS_CACHE_MAXAGE(SCOPE_FILES, "globus-cache-maxage"), + GLOBUS_TASK_MONITORING_SERVER(SCOPE_FILES, "globus-monitoring-server"), //STORAGE DRIVER SETTINGS SCOPE_DRIVER(SCOPE_FILES), diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java index 7417a5db4d4..c664d7d6730 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java @@ -82,7 +82,6 @@ public class SystemConfig { private String buildNumber = null; private static final String JVM_TIMER_SERVER_OPTION = "dataverse.timerServer"; - private static final String JVM_GLOBUS_TASK_MONITORING_OPTION = "dataverse.globus.taskMonitoringServer"; private static final long DEFAULT_GUESTBOOK_RESPONSES_DISPLAY_LIMIT = 5000L; private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_IMAGE = 3000000L; // 3 MB @@ -547,14 +546,6 @@ public boolean isTimerServer() { return false; } - public boolean isGlobusTaskMonitoringServer() { - String optionValue = System.getProperty(JVM_GLOBUS_TASK_MONITORING_OPTION); - if ("true".equalsIgnoreCase(optionValue)) { - return true; - } - return false; - } - public String getFooterCopyrightAndYear() { return BundleUtil.getStringFromBundle("footer.copyright", Arrays.asList(Year.now().getValue() + "")); } diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 25ae8ad00c0..d7e30c5e0e3 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -253,7 +253,7 @@ notification.mail.import.filesystem=Dataset {2} ({0}/dataset.xhtml?persistentId= notification.mail.globus.upload.completed=Globus transfer to Dataset {2} was successful. File(s) have been uploaded and verified.

{3}
notification.mail.globus.download.completed=Globus transfer of file(s) from the dataset {2} was successful.

{3}
notification.mail.globus.upload.completedWithErrors=Globus transfer to Dataset {2} is complete with errors.

{3}
-notification.mail.globus.upload.failedRemotely=Remote data transfer between Globus collections for Dataset {2} failed, reported via Globus API.

{3}
+notification.mail.globus.upload.failedRemotely=Remote data transfer between Globus endpoints for Dataset {2} failed, as reported via Globus API.

{3}
notification.mail.globus.upload.failedLocally=Dataverse received a confirmation of a successful Globus data transfer for Dataset {2}, but failed to add the files to the dataset locally.

{3}
notification.mail.globus.download.completedWithErrors=Globus transfer from the dataset {2} is complete with errors.

{3}
notification.import.filesystem=Dataset {1} has been successfully uploaded and verified. From 0ca5e621002711befaba23ba21208e2c19f08a92 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Fri, 23 Aug 2024 14:32:19 -0400 Subject: [PATCH 191/366] added an upfront locks check to the /addGlobusFiles api #10623 --- .../java/edu/harvard/iq/dataverse/api/Datasets.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index 960cc408ee5..47505ef3879 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -99,6 +99,7 @@ import java.util.stream.Collectors; import static edu.harvard.iq.dataverse.api.ApiConstants.*; +import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException; import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*; import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder; import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; @@ -4045,7 +4046,16 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, return badRequest(BundleUtil.getStringFromBundle("datasets.api.globusuploaddisabled")); } - // @todo check if the dataset is already locked! + // Check if the dataset is already locked + // We are reusing the code and logic used by various command to determine + // if there are any locks on the dataset that would prevent the current + // users from modifying it: + try { + DataverseRequest dataverseRequest = createDataverseRequest(authUser); + permissionService.checkEditDatasetLock(dataset, dataverseRequest, new UpdateDatasetVersionCommand(dataset, dataverseRequest)); + } catch (IllegalCommandException icex) { + return error(Response.Status.FORBIDDEN, "Dataset " + datasetId + " is locked: " + icex.getLocalizedMessage()); + } JsonObject jsonObject = null; try { From 23d0f6c8db678c2f87e7fc2ff4bffabbc3b44d94 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Fri, 23 Aug 2024 14:44:26 -0400 Subject: [PATCH 192/366] added an upfront locks check to the /addGlobusFiles api #10623 --- src/main/java/edu/harvard/iq/dataverse/api/Datasets.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index 47505ef3879..d8e010940cf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -4052,7 +4052,7 @@ public Response addGlobusFilesToDataset(@Context ContainerRequestContext crc, // users from modifying it: try { DataverseRequest dataverseRequest = createDataverseRequest(authUser); - permissionService.checkEditDatasetLock(dataset, dataverseRequest, new UpdateDatasetVersionCommand(dataset, dataverseRequest)); + permissionService.checkEditDatasetLock(dataset, dataverseRequest, null); } catch (IllegalCommandException icex) { return error(Response.Status.FORBIDDEN, "Dataset " + datasetId + " is locked: " + icex.getLocalizedMessage()); } From 50a9ede0037ae255b1f363881a8a0cb42e236746 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 26 Aug 2024 21:12:40 +0200 Subject: [PATCH 193/366] ci(ct): temporarily allow other repos to run the base image workflow Needs to be reverted when done with testing --- .github/workflows/container_base_push.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 660f9bdd861..4843800a3d1 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -26,8 +26,9 @@ jobs: permissions: contents: read packages: read + # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks and only for scheduled - if: ${{ github.repository_owner == 'IQSS' }} + #if: ${{ github.repository_owner == 'IQSS' }} outputs: branches: ${{ steps.matrix.outputs.branches }} steps: @@ -56,8 +57,9 @@ jobs: fail-fast: false matrix: branch: ${{ fromJson(needs.discover.outputs.branches) }} + # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks - if: ${{ github.repository_owner == 'IQSS' }} + #if: ${{ github.repository_owner == 'IQSS' }} steps: - name: Checkout repository From 19de76d77e72b8da9558365ee0510b714a465cb5 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 26 Aug 2024 21:33:29 +0200 Subject: [PATCH 194/366] ci(ct): temporarily disable remote docker builder in fork --- .github/workflows/container_base_push.yml | 55 ++++++++++++----------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 4843800a3d1..ca05a30c95f 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -102,33 +102,34 @@ jobs: platforms: ${{ env.PLATFORMS }} # In case this is a push to develop, we care about buildtime. # Configure a remote ARM64 build host in addition to the local AMD64 in two steps. - - name: Setup SSH agent - if: ${{ github.event_name != 'schedule' }} - uses: webfactory/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }} - - name: Provide the known hosts key and the builder config - if: ${{ github.event_name != 'schedule' }} - run: | - echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts - mkdir -p modules/container-base/target/buildx-state/buildx/instances - cat > modules/container-base/target/buildx-state/buildx/instances/maven << EOF - { "Name": "maven", - "Driver": "docker-container", - "Dynamic": false, - "Nodes": [{"Name": "maven0", - "Endpoint": "unix:///var/run/docker.sock", - "Platforms": [{"os": "linux", "architecture": "amd64"}], - "DriverOpts": null, - "Flags": ["--allow-insecure-entitlement=network.host"], - "Files": null}, - {"Name": "maven1", - "Endpoint": "ssh://${{ secrets.BUILDER_ARM64_SSH_CONNECTION }}", - "Platforms": [{"os": "linux", "architecture": "arm64"}], - "DriverOpts": null, - "Flags": ["--allow-insecure-entitlement=network.host"], - "Files": null}]} - EOF + # TODO: re-enable for final PR + #- name: Setup SSH agent + # if: ${{ github.event_name != 'schedule' }} + # uses: webfactory/ssh-agent@v0.9.0 + # with: + # ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }} + #- name: Provide the known hosts key and the builder config + # if: ${{ github.event_name != 'schedule' }} + # run: | + # echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts + # mkdir -p modules/container-base/target/buildx-state/buildx/instances + # cat > modules/container-base/target/buildx-state/buildx/instances/maven << EOF + # { "Name": "maven", + # "Driver": "docker-container", + # "Dynamic": false, + # "Nodes": [{"Name": "maven0", + # "Endpoint": "unix:///var/run/docker.sock", + # "Platforms": [{"os": "linux", "architecture": "amd64"}], + # "DriverOpts": null, + # "Flags": ["--allow-insecure-entitlement=network.host"], + # "Files": null}, + # {"Name": "maven1", + # "Endpoint": "ssh://${{ secrets.BUILDER_ARM64_SSH_CONNECTION }}", + # "Platforms": [{"os": "linux", "architecture": "arm64"}], + # "DriverOpts": null, + # "Flags": ["--allow-insecure-entitlement=network.host"], + # "Files": null}]} + # EOF - name: Add additional tags as options # TODO: remove the feature branch From a9a5709412b9640e1e595ca989a926b62090d3a9 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 26 Aug 2024 21:14:11 +0200 Subject: [PATCH 195/366] feat(ct): introduce backports for older base images This way we can apply important changes if need be. --- .github/workflows/container_base_push.yml | 17 ++++++++-- .../src/backports/v6.1/001-pom.xml.patch | 33 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 modules/container-base/src/backports/v6.1/001-pom.xml.patch diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index ca05a30c95f..147e5e28d12 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -142,10 +142,23 @@ jobs: echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" fi + # Try to retrieve backport patches for this git ref (but don't fail if there aren't any) + # and try to apply them if present + - name: Get backport patches + continue-on-error: true + uses: actions/checkout@v4 + with: + path: backports + sparse-checkout: | + modules/container-base/src/backports/${{ matrix.branch }} + - name: Apply backport patches + id: patch + run: | + find ${GITHUB_WORKSPACE}/backports/modules/container-base/src/backports/${{ matrix.branch }} -type f -name '*.patch' -print0 | \ + xargs -0 patch -p1 -s -i + - name: Deploy multi-arch base container image to Docker Hub id: build - # Do not build for v6.0 and v6.1. We can simply reuse the one from v6.2. - if: ${{ matrix.branch != 'v6.0' && matrix.branch != 'v6.1' }} run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch new file mode 100644 index 00000000000..590eeae962a --- /dev/null +++ b/modules/container-base/src/backports/v6.1/001-pom.xml.patch @@ -0,0 +1,33 @@ +--- a/modules/container-base/pom.xml 2024-08-26 21:53:55.985584815 +0200 ++++ b/modules/container-base/pom.xml 2024-08-26 21:38:09.925910314 +0200 +@@ -12,6 +12,7 @@ + + io.gdcc + container-base ++ 0.6.1 + ${packaging.type} + Container Base Image + This module provides an application server base image to be decorated with the Dataverse app. +@@ -40,8 +42,10 @@ + + docker-build + gdcc/base:${base.image.tag} +- unstable +- eclipse-temurin:${target.java.version}-jre ++ ${project.version}-pyr${payara.version} ++ 0 ++ eclipse-temurin:${target.java.version}-jre-${java.image.flavor} ++ jammy + 1000 + 1000 + linux/amd64,linux/arm64 +@@ -110,6 +113,9 @@ + + assembly.xml + ++ ++ ${base.image.tag}-r${base.image.revision} ++ + + + From 0691d4d707c60818b3c285d398973ab35ac9b102 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 26 Aug 2024 23:18:38 +0200 Subject: [PATCH 196/366] feat(ct): add patches for v6.1, 6.2 and 6.3 base images - Patching versions into the POM and it's tags. - Adding security fixes for 6.2 and 6.3 base image (missing user statement) - Adding labels to keep information about origins --- .../src/backports/v6.1/001-pom.xml.patch | 4 +-- .../src/backports/v6.1/002-Dockerfile.patch | 10 ++++++ .../src/backports/v6.2/001-pom.xml.patch | 33 +++++++++++++++++++ .../v6.2/002-Dockerfile.labels.patch | 10 ++++++ .../v6.2/003-Dockerfile.security.patch | 10 ++++++ .../src/backports/v6.3/001-pom.xml.patch | 33 +++++++++++++++++++ .../v6.3/002-Dockerfile.labels.patch | 18 ++++++++++ .../v6.3/003-Dockerfile.security.patch | 7 ++++ 8 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 modules/container-base/src/backports/v6.1/002-Dockerfile.patch create mode 100644 modules/container-base/src/backports/v6.2/001-pom.xml.patch create mode 100644 modules/container-base/src/backports/v6.2/002-Dockerfile.labels.patch create mode 100644 modules/container-base/src/backports/v6.2/003-Dockerfile.security.patch create mode 100644 modules/container-base/src/backports/v6.3/001-pom.xml.patch create mode 100644 modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch create mode 100644 modules/container-base/src/backports/v6.3/003-Dockerfile.security.patch diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch index 590eeae962a..4e1c672b521 100644 --- a/modules/container-base/src/backports/v6.1/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.1/001-pom.xml.patch @@ -4,7 +4,7 @@ io.gdcc container-base -+ 0.6.1 ++ 0.8.0 ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. @@ -14,7 +14,7 @@ gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-pyr${payara.version} ++ ${project.version}-${java.image.flavor}-pyr${payara.version}-tmrn${target.java.version} + 0 + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy diff --git a/modules/container-base/src/backports/v6.1/002-Dockerfile.patch b/modules/container-base/src/backports/v6.1/002-Dockerfile.patch new file mode 100644 index 00000000000..4bb7a1eac91 --- /dev/null +++ b/modules/container-base/src/backports/v6.1/002-Dockerfile.patch @@ -0,0 +1,10 @@ +--- a/modules/container-base/src/main/docker/Dockerfile ++++ b/modules/container-base/src/main/docker/Dockerfile +@@ -233,4 +233,6 @@ LABEL org.opencontainers.image.created="@git.build.time@" \ + org.opencontainers.image.vendor="Global Dataverse Community Consortium" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.title="Dataverse Base Image" \ +- org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" ++ org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" \ ++ org.opencontainers.image.base.name="@java.image@" \ ++ org.dataverse.deps.payara.version="@payara.version@" diff --git a/modules/container-base/src/backports/v6.2/001-pom.xml.patch b/modules/container-base/src/backports/v6.2/001-pom.xml.patch new file mode 100644 index 00000000000..5a0fe404148 --- /dev/null +++ b/modules/container-base/src/backports/v6.2/001-pom.xml.patch @@ -0,0 +1,33 @@ +--- a/modules/container-base/pom.xml 2024-08-26 21:53:55.985584815 +0200 ++++ b/modules/container-base/pom.xml 2024-08-26 21:38:09.925910314 +0200 +@@ -12,6 +12,7 @@ + + io.gdcc + container-base ++ 0.9.0 + ${packaging.type} + Container Base Image + This module provides an application server base image to be decorated with the Dataverse app. +@@ -40,8 +42,10 @@ + + docker-build + gdcc/base:${base.image.tag} +- unstable +- eclipse-temurin:${target.java.version}-jre ++ ${project.version}-${java.image.flavor}-pyr${payara.version}-tmrn${target.java.version} ++ 0 ++ eclipse-temurin:${target.java.version}-jre-${java.image.flavor} ++ jammy + 1000 + 1000 + linux/amd64,linux/arm64 +@@ -110,6 +113,9 @@ + + assembly.xml + ++ ++ ${base.image.tag}-r${base.image.revision} ++ + + + diff --git a/modules/container-base/src/backports/v6.2/002-Dockerfile.labels.patch b/modules/container-base/src/backports/v6.2/002-Dockerfile.labels.patch new file mode 100644 index 00000000000..fbb7f80c4ce --- /dev/null +++ b/modules/container-base/src/backports/v6.2/002-Dockerfile.labels.patch @@ -0,0 +1,10 @@ +--- a/modules/container-base/src/main/docker/Dockerfile ++++ b/modules/container-base/src/main/docker/Dockerfile +@@ -242,4 +242,6 @@ LABEL org.opencontainers.image.created="@git.build.time@" \ + org.opencontainers.image.vendor="Global Dataverse Community Consortium" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.title="Dataverse Base Image" \ +- org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" ++ org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" \ ++ org.opencontainers.image.base.name="@java.image@" \ ++ org.dataverse.deps.payara.version="@payara.version@" diff --git a/modules/container-base/src/backports/v6.2/003-Dockerfile.security.patch b/modules/container-base/src/backports/v6.2/003-Dockerfile.security.patch new file mode 100644 index 00000000000..1ab4c3a980a --- /dev/null +++ b/modules/container-base/src/backports/v6.2/003-Dockerfile.security.patch @@ -0,0 +1,10 @@ +--- a/modules/container-base/src/main/docker/Dockerfile ++++ b/modules/container-base/src/main/docker/Dockerfile +@@ -226,6 +226,7 @@ USER root + RUN true && \ + chgrp -R 0 "${DOMAIN_DIR}" && \ + chmod -R g=u "${DOMAIN_DIR}" ++USER payara + + # Set the entrypoint to tini (as a process supervisor) + ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/modules/container-base/src/backports/v6.3/001-pom.xml.patch b/modules/container-base/src/backports/v6.3/001-pom.xml.patch new file mode 100644 index 00000000000..595a43beed4 --- /dev/null +++ b/modules/container-base/src/backports/v6.3/001-pom.xml.patch @@ -0,0 +1,33 @@ +--- a/modules/container-base/pom.xml 2024-08-26 21:53:55.985584815 +0200 ++++ b/modules/container-base/pom.xml 2024-08-26 21:38:09.925910314 +0200 +@@ -12,6 +12,7 @@ + + io.gdcc + container-base ++ 0.9.1 + ${packaging.type} + Container Base Image + This module provides an application server base image to be decorated with the Dataverse app. +@@ -40,8 +42,10 @@ + + docker-build + gdcc/base:${base.image.tag} +- unstable +- eclipse-temurin:${target.java.version}-jre ++ ${project.version}-${java.image.flavor}-pyr${payara.version}-tmrn${target.java.version} ++ 0 ++ eclipse-temurin:${target.java.version}-jre-${java.image.flavor} ++ jammy + 1000 + 1000 + linux/amd64,linux/arm64 +@@ -110,6 +113,9 @@ + + assembly.xml + ++ ++ ${base.image.tag}-r${base.image.revision} ++ + + + diff --git a/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch b/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch new file mode 100644 index 00000000000..c0bbe7698d8 --- /dev/null +++ b/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch @@ -0,0 +1,18 @@ +--- a/modules/container-base/src/main/docker/Dockerfile ++++ b/modules/container-base/src/main/docker/Dockerfile +@@ -224,6 +224,7 @@ USER root + RUN true && \ + chgrp -R 0 "${DOMAIN_DIR}" && \ + chmod -R g=u "${DOMAIN_DIR}" ++USER payara + + # Set the entrypoint to tini (as a process supervisor) + ENTRYPOINT ["/usr/bin/dumb-init", "--"] +@@ -240,4 +241,6 @@ LABEL org.opencontainers.image.created="@git.build.time@" \ + org.opencontainers.image.vendor="Global Dataverse Community Consortium" \ + org.opencontainers.image.licenses="Apache-2.0" \ + org.opencontainers.image.title="Dataverse Base Image" \ +- org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" ++ org.opencontainers.image.description="This container image provides an application server tuned for Dataverse software" \ ++ org.opencontainers.image.base.name="@java.image@" \ ++ org.dataverse.deps.payara.version="@payara.version@" diff --git a/modules/container-base/src/backports/v6.3/003-Dockerfile.security.patch b/modules/container-base/src/backports/v6.3/003-Dockerfile.security.patch new file mode 100644 index 00000000000..d8487b3aacc --- /dev/null +++ b/modules/container-base/src/backports/v6.3/003-Dockerfile.security.patch @@ -0,0 +1,7 @@ +--- a/modules/container-base/src/main/docker/Dockerfile ++++ b/modules/container-base/src/main/docker/Dockerfile +@@ -224,6 +224,7 @@ USER root + RUN true && \ + chgrp -R 0 "${DOMAIN_DIR}" && \ + chmod -R g=u "${DOMAIN_DIR}" ++USER payara From ae8ced2f3040b4c29648a3f9da321c25c189a1fa Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 26 Aug 2024 23:25:18 +0200 Subject: [PATCH 197/366] ci,fix(ct): only apply 1 patch file at a time for base images Otherwise the patch is applied to some other patchfile, which makes no sense. --- .github/workflows/container_base_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 147e5e28d12..b0be1b72c89 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -155,7 +155,7 @@ jobs: id: patch run: | find ${GITHUB_WORKSPACE}/backports/modules/container-base/src/backports/${{ matrix.branch }} -type f -name '*.patch' -print0 | \ - xargs -0 patch -p1 -s -i + xargs -0 -n1 patch -p1 -s -i - name: Deploy multi-arch base container image to Docker Hub id: build From 37fb155739096f5e4a178ab3a851db8033eb4d34 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 26 Aug 2024 23:27:31 +0200 Subject: [PATCH 198/366] ci,fix(ct): correction of v6.3 Dockerfile patches Double patching makes CI trip over. --- .../src/backports/v6.3/002-Dockerfile.labels.patch | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch b/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch index c0bbe7698d8..c7744882153 100644 --- a/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch +++ b/modules/container-base/src/backports/v6.3/002-Dockerfile.labels.patch @@ -1,13 +1,5 @@ --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile -@@ -224,6 +224,7 @@ USER root - RUN true && \ - chgrp -R 0 "${DOMAIN_DIR}" && \ - chmod -R g=u "${DOMAIN_DIR}" -+USER payara - - # Set the entrypoint to tini (as a process supervisor) - ENTRYPOINT ["/usr/bin/dumb-init", "--"] @@ -240,4 +241,6 @@ LABEL org.opencontainers.image.created="@git.build.time@" \ org.opencontainers.image.vendor="Global Dataverse Community Consortium" \ org.opencontainers.image.licenses="Apache-2.0" \ From c177d9ab7e281e5b0accbc94767c4630ac87cf92 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 26 Aug 2024 23:42:01 +0200 Subject: [PATCH 199/366] ci,fix(ct): make v6.3 get alpha tag Was 6.2 - but we are at v6.3 already! --- .github/workflows/container_base_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index b0be1b72c89..ee7cb85a42e 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -138,7 +138,7 @@ jobs: if [[ "${{ matrix.branch }}" == "develop" || "${{ matrix.branch }}" == "10478-version-base-img" ]]; then echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" # In case of releases <=6.2, we still need to provide backward compatible names "alpha" and "unstable" - elif [[ "${{ matrix.branch }}" == "v6.2" ]]; then + elif [[ "${{ matrix.branch }}" == "v6.3" ]]; then echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" fi From fffcfe05374ea932fcf76112c328b77a9dcb2e95 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 27 Aug 2024 16:23:45 +0200 Subject: [PATCH 200/366] refactor(ct): align base POM tags with suitable policy across releases and develop --- modules/container-base/pom.xml | 13 ++++++++++--- .../src/backports/v6.1/001-pom.xml.patch | 10 ++++++---- .../src/backports/v6.2/001-pom.xml.patch | 10 ++++++---- .../src/backports/v6.3/001-pom.xml.patch | 10 ++++++---- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index 60be420bd9a..5de94bfc941 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -13,7 +13,7 @@ io.gdcc container-base - 1 + 1.0.0 ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. @@ -42,8 +42,12 @@ docker-build gdcc/base:${base.image.tag} - rev${project.version} - eclipse-temurin:${target.java.version}-jre + ${project.version}-${java.image.flavor} + + SNAPSHOT + ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + noble 1000 1000 linux/amd64,linux/arm64 @@ -111,6 +115,9 @@ assembly.xml + + ${base.image.tag.revision} + diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch index 4e1c672b521..508b496af14 100644 --- a/modules/container-base/src/backports/v6.1/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.1/001-pom.xml.patch @@ -8,14 +8,16 @@ ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. -@@ -40,8 +42,10 @@ +@@ -40,8 +42,12 @@ docker-build gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor}-pyr${payara.version}-tmrn${target.java.version} -+ 0 ++ ${project.version}-${java.image.flavor} ++ ++ SNAPSHOT ++ ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 @@ -26,7 +28,7 @@ assembly.xml + -+ ${base.image.tag}-r${base.image.revision} ++ ${base.image.tag.revision} + diff --git a/modules/container-base/src/backports/v6.2/001-pom.xml.patch b/modules/container-base/src/backports/v6.2/001-pom.xml.patch index 5a0fe404148..256680c2595 100644 --- a/modules/container-base/src/backports/v6.2/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.2/001-pom.xml.patch @@ -8,14 +8,16 @@ ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. -@@ -40,8 +42,10 @@ +@@ -40,8 +42,12 @@ docker-build gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor}-pyr${payara.version}-tmrn${target.java.version} -+ 0 ++ ${project.version}-${java.image.flavor} ++ ++ SNAPSHOT ++ ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 @@ -26,7 +28,7 @@ assembly.xml + -+ ${base.image.tag}-r${base.image.revision} ++ ${base.image.tag.revision} + diff --git a/modules/container-base/src/backports/v6.3/001-pom.xml.patch b/modules/container-base/src/backports/v6.3/001-pom.xml.patch index 595a43beed4..b1ab9bfe589 100644 --- a/modules/container-base/src/backports/v6.3/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.3/001-pom.xml.patch @@ -8,14 +8,16 @@ ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. -@@ -40,8 +42,10 @@ +@@ -40,8 +42,12 @@ docker-build gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor}-pyr${payara.version}-tmrn${target.java.version} -+ 0 ++ ${project.version}-${java.image.flavor} ++ ++ SNAPSHOT ++ ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 @@ -26,7 +28,7 @@ assembly.xml + -+ ${base.image.tag}-r${base.image.revision} ++ ${base.image.tag.revision} + From 74bf796603b42a2c03cbe187e8ef3e93b5072a5a Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Tue, 27 Aug 2024 11:45:58 -0400 Subject: [PATCH 201/366] Revert "Add CrossRef config properties description" This reverts commit 6df751346325948935582836a69b6e5378fb1b06. --- .../source/installation/config.rst | 44 ------------------- 1 file changed, 44 deletions(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 24f1d0cce12..e7ba624222e 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -2370,50 +2370,6 @@ should delete the old JVM option and the wrapped password alias, then recreate as shown for :ref:`dataverse.pid.datacite.password` but with the EZID alias name. -.. _dataverse.pid.crossref.url: - -dataverse.pid.crossref.url -++++++++++++++++++++++++++ - -CrossRef url used to post metadata. - -.. _dataverse.pid.crossref.rest-api-url: - -dataverse.pid.crossref.rest-api-url -+++++++++++++++++++++++++++++++++++ - -CrossRef API url to retrieve metadata information - -.. _dataverse.pid.crossref.username: - -dataverse.pid.crossref.username -+++++++++++++++++++++++++++++++ - -CrossRef uses `HTTP Basic authentication `_ -for their APIs. -- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.password`. - -.. _dataverse.pid.crossref.password: - -dataverse.pid.crossref.password -+++++++++++++++++++++++++++++++ - -- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.username`. - -.. _dataverse.pid.crossref.depositor: - -dataverse.pid.crossref.depositor -++++++++++++++++++++++++++++++++ - -The entity, such as a person or organization, that deposited the Dataset in the repository - -.. _dataverse.pid.crossref.depositor-email: - -dataverse.pid.crossref.depositor-email -++++++++++++++++++++++++++++++++++++++ - -Contact email to the indicated Depositor - .. _dataverse.timerServer: dataverse.timerServer From eeb260e092448aa0363c1847aa5bd9ea4a6a9842 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Tue, 27 Aug 2024 11:46:17 -0400 Subject: [PATCH 202/366] Revert "Add CrossRef provider logic" This reverts commit e1bf3c35f2c085d6831d8f3859a123da80745741. --- .../source/installation/config.rst | 9 - pom.xml | 5 - .../iq/dataverse/CrossRefRESTfullClient.java | 118 ------- .../dataverse/DOICrossRefRegisterService.java | 313 ------------------ .../iq/dataverse/DOICrossRefServiceBean.java | 117 ------- .../iq/dataverse/EjbDataverseEngine.java | 8 - .../iq/dataverse/GlobalIdServiceBean.java | 3 +- .../engine/command/CommandContext.java | 24 +- .../iq/dataverse/settings/JvmSettings.java | 11 +- .../dataverse/crossref_metadata_template.xml | 29 -- .../dataverse/engine/TestCommandContext.java | 5 - 11 files changed, 23 insertions(+), 619 deletions(-) delete mode 100644 src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java delete mode 100644 src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index e7ba624222e..a7d7905ca4a 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -245,15 +245,6 @@ this provider. - :ref:`dataverse.pid.ezid.username` - :ref:`dataverse.pid.ezid.password` -**JVM Options for CrossRef:** - -- :ref:`dataverse.pid.crossref.url` -- :ref:`dataverse.pid.crossref.rest-api-url` -- :ref:`dataverse.pid.crossref.username` -- :ref:`dataverse.pid.crossref.password` -- :ref:`dataverse.pid.crossref.depositor` -- :ref:`dataverse.pid.crossref.depositor-email` - **Database Settings:** - :ref:`:DoiProvider <:DoiProvider>` diff --git a/pom.xml b/pom.xml index 72ef3391524..7c12a45135c 100644 --- a/pom.xml +++ b/pom.xml @@ -653,11 +653,6 @@ 3.2.0 test - - org.apache.httpcomponents - fluent-hc - 4.5.14 - diff --git a/src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java deleted file mode 100644 index 4b6728eca57..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/CrossRefRESTfullClient.java +++ /dev/null @@ -1,118 +0,0 @@ -package edu.harvard.iq.dataverse; - -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.CredentialsProvider; -import org.apache.http.client.fluent.Request; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.mime.HttpMultipartMode; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; - -import java.io.Closeable; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class CrossRefRESTfullClient implements Closeable { - - private static final Logger logger = Logger.getLogger(CrossRefRESTfullClient.class.getCanonicalName()); - - private final String url; - private final String apiUrl; - private final String username; - private final String password; - private final CloseableHttpClient httpClient; - private final HttpClientContext context; - private final String encoding = "utf-8"; - - public CrossRefRESTfullClient(String url, String apiUrl, String username, String password) { - this.url = url; - this.apiUrl = apiUrl; - this.username = username; - this.password = password; - try { - context = HttpClientContext.create(); - CredentialsProvider credsProvider = new BasicCredentialsProvider(); - credsProvider.setCredentials(new AuthScope(null, -1), - new UsernamePasswordCredentials(username, password)); - context.setCredentialsProvider(credsProvider); - - httpClient = HttpClients.createDefault(); - } catch (Exception ioe) { - close(); - logger.log(Level.SEVERE,"Fail to init Client",ioe); - throw new RuntimeException("Fail to init Client", ioe); - } - } - - public void close() { - if (this.httpClient != null) { - try { - httpClient.close(); - } catch (IOException io) { - logger.warning("IOException closing hhtpClient: " + io.getMessage()); - } - } - } - - public String getMetadata(String doi) { - HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi); - httpGet.setHeader("Accept", "application/json"); - try { - HttpResponse response = httpClient.execute(httpGet); - String data = EntityUtils.toString(response.getEntity(), encoding); - if (response.getStatusLine().getStatusCode() != 200) { - String errMsg = "Response from getMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; - logger.info(errMsg); - throw new RuntimeException(errMsg); - } - return data; - } catch (IOException ioe) { - logger.info("IOException when get metadata"); - throw new RuntimeException("IOException when get metadata", ioe); - } - } - - public String postMetadata(String xml) throws IOException { - HttpEntity entity = MultipartEntityBuilder.create() - .addTextBody("operation", "doMDUpload") - .addTextBody("login_id", username) - .addTextBody("login_passwd", password) - .addBinaryBody("fname", xml.getBytes(StandardCharsets.UTF_8), ContentType.APPLICATION_XML, "metadata.xml") - .setMode(HttpMultipartMode.BROWSER_COMPATIBLE) - .build(); - HttpResponse response = Request.Post(url + "/servlet/deposit") - .body(entity) - .setHeader("Accept", "*/*") - .execute().returnResponse(); - - String data = EntityUtils.toString(response.getEntity(), encoding); - if (response.getStatusLine().getStatusCode() != 200) { - String errMsg = "Response from postMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; - logger.info(errMsg); - throw new IOException(errMsg); - } - return data; - } - - public boolean testDOIExists(String doi) throws IOException { - HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi); - httpGet.setHeader("Accept", "application/json"); - HttpResponse response = httpClient.execute(httpGet); - if (response.getStatusLine().getStatusCode() != 200) { - EntityUtils.consumeQuietly(response.getEntity()); - return false; - } - EntityUtils.consumeQuietly(response.getEntity()); - return true; - } -} diff --git a/src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java deleted file mode 100644 index 6e8ed20d570..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DOICrossRefRegisterService.java +++ /dev/null @@ -1,313 +0,0 @@ -package edu.harvard.iq.dataverse; - -import com.fasterxml.jackson.databind.ObjectMapper; -import edu.harvard.iq.dataverse.settings.JvmSettings; -import jakarta.ejb.EJB; -import jakarta.ejb.Stateless; -import org.apache.commons.text.StringEscapeUtils; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -import static edu.harvard.iq.dataverse.util.SystemConfig.getDataverseSiteUrlStatic; - -@Stateless -public class DOICrossRefRegisterService { - private static final Logger logger = Logger.getLogger(DOICrossRefRegisterService.class.getCanonicalName()); - - @EJB - DataverseServiceBean dataverseService; - - private CrossRefRESTfullClient client = null; - - private CrossRefRESTfullClient getClient() { - if (client == null) { - client = new CrossRefRESTfullClient( - JvmSettings.CROSSREF_URL.lookup(), - JvmSettings.CROSSREF_REST_API_URL.lookup(), - JvmSettings.CROSSREF_USERNAME.lookup(), - JvmSettings.CROSSREF_PASSWORD.lookup() - ); - } - return client; - } - - public boolean testDOIExists(String identifier) { - boolean doiExists; - try { - CrossRefRESTfullClient client = getClient(); - doiExists = client.testDOIExists(identifier.substring(identifier.indexOf(":") + 1)); - } catch (Exception e) { - logger.log(Level.INFO, identifier, e); - return false; - } - return doiExists; - } - - public HashMap getMetadata(String identifier) throws IOException { - HashMap metadata = new HashMap<>(); - try { - CrossRefRESTfullClient client = getClient(); - String jsonMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1)); - Map mappedJson = new ObjectMapper().readValue(jsonMetadata, HashMap.class); - logger.log(Level.FINE, jsonMetadata); - metadata.put("_status", mappedJson.get("status").toString()); - } catch (RuntimeException e) { - logger.log(Level.INFO, identifier, e); - } - return metadata; - } - - public String reserveIdentifier(String identifier, DvObject dvObject) throws IOException { - logger.info("Crossref reserveIdentifier"); - String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); - - CrossRefRESTfullClient client = getClient(); - return client.postMetadata(xmlMetadata); - } - - public void modifyIdentifier(String identifier, DvObject dvObject) throws IOException { - logger.info("Crossref modifyIdentifier"); - String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); - - CrossRefRESTfullClient client = getClient(); - client.postMetadata(xmlMetadata); - } - - public String getMetadataFromDvObject(String identifier, DvObject dvObject) { - Dataset dataset; - - if (dvObject instanceof Dataset) { - dataset = (Dataset) dvObject; - } else { - dataset = (Dataset) dvObject.getOwner(); - } - - CrossRefMetadataTemplate metadataTemplate = new CrossRefMetadataTemplate(); - metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1)); - metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors()); - metadataTemplate.setDepositor(JvmSettings.CROSSREF_DEPOSITOR.lookup()); - metadataTemplate.setDepositorEmail(JvmSettings.CROSSREF_DEPOSITOR_EMAIL.lookup()); - metadataTemplate.setInstitution(dataverseService.getRootDataverseName()); - - String title = dvObject.getCurrentName(); - if (dvObject.isInstanceofDataFile()) { - //Note file title is not currently escaped the way the dataset title is, so adding it here. - title = StringEscapeUtils.escapeXml10(title); - } - - if (title.isEmpty() || title.equals(DatasetField.NA_VALUE)) { - title = AbstractGlobalIdServiceBean.UNAVAILABLE; - } - - metadataTemplate.setTitle(title); - - return metadataTemplate.generateXML(); - } -} - -class CrossRefMetadataTemplate { - - private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.edu.harvard.iq.dataverse.CrossRefMetadataTemplate"); - private static String template; - - static { - try (InputStream in = CrossRefMetadataTemplate.class.getResourceAsStream("crossref_metadata_template.xml")) { - template = CrossRefFileUtil.readAndClose(in, "utf-8"); - } catch (Exception e) { - logger.log(Level.SEVERE, "crossref metadata template load error"); - logger.log(Level.SEVERE, "String " + e); - logger.log(Level.SEVERE, "localized message " + e.getLocalizedMessage()); - logger.log(Level.SEVERE, "cause " + e.getCause()); - logger.log(Level.SEVERE, "message " + e.getMessage()); - } - } - - private final String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); - private String institution; - private String depositor; - private String depositorEmail; - private String databaseTitle; - private String identifier; - private String title; - private final String baseUrl = getDataverseSiteUrlStatic(); - private List authors; - - public List getAuthors() { - return authors; - } - - public void setAuthors(List authors) { - this.authors = authors; - } - - public CrossRefMetadataTemplate() { - } - - public String generateXML() { - String xmlMetadata = template.replace("${depositor}", depositor) - .replace("${depositorEmail}", depositorEmail) - .replace("${title}", title) - .replace("${institution}", institution) - .replace("${batchId}", identifier + " " + timestamp) - .replace("${timestamp}", timestamp); - - StringBuilder datasetElement = new StringBuilder(); - datasetElement.append(""); - - StringBuilder contributorsElement = new StringBuilder(); - if (authors != null && !authors.isEmpty()) { - contributorsElement.append(""); - for (DatasetAuthor author : authors) { - contributorsElement.append(""); - contributorsElement.append(author.getName().getDisplayValue()); - contributorsElement.append(""); - contributorsElement.append(author.getName().getDisplayValue()); - contributorsElement.append(""); - - if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) { - contributorsElement.append("") - .append(author.getAffiliation().getDisplayValue()) - .append(""); - } - - if (author.getIdType() != null && - author.getIdValue() != null && - !author.getIdType().isEmpty() && - !author.getIdValue().isEmpty() && - author.getAffiliation() != null && - !author.getAffiliation().getDisplayValue().isEmpty()) { - if (author.getIdType().equals("ORCID")) { - contributorsElement.append("").append("https://orcid.org/").append(author.getIdValue()).append(""); - } - if (author.getIdType().equals("ISNI")) { - contributorsElement.append("").append(author.getIdValue()).append(""); - } - if (author.getIdType().equals("LCNA")) { - contributorsElement.append("").append(author.getIdValue()).append(""); - } - } - - contributorsElement.append(""); - } - contributorsElement.append(""); - - } else { - contributorsElement.append("") - .append(AbstractGlobalIdServiceBean.UNAVAILABLE) - .append(""); - } - - datasetElement.append(contributorsElement); - - datasetElement.append("") - .append(this.title) - .append(""); - - datasetElement.append("") - .append(this.identifier) - .append("") - .append(this.baseUrl).append("/dataset.xhtml?persistentId=doi:").append(this.identifier) - .append(""); - - datasetElement.append(""); - xmlMetadata = xmlMetadata.replace("${datasets}", datasetElement.toString()); - return xmlMetadata; - } - - public static String getTemplate() { - return template; - } - - public static void setTemplate(String template) { - CrossRefMetadataTemplate.template = template; - } - - public String getIdentifier() { - return identifier; - } - - public String getDepositor() { - return depositor; - } - - public void setDepositor(String depositor) { - this.depositor = depositor; - } - - public void setIdentifier(String identifier) { - this.identifier = identifier; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getInstitution() { - return institution; - } - - public void setInstitution(String institution) { - this.institution = institution; - } - - public String getDepositorEmail() { - return depositorEmail; - } - - public void setDepositorEmail(String depositorEmail) { - this.depositorEmail = depositorEmail; - } - - public String getDatabaseTitle() { - return databaseTitle; - } - - public void setDatabaseTitle(String databaseTitle) { - this.databaseTitle = databaseTitle; - } -} - -class CrossRefFileUtil { - - public static void close(InputStream in) { - if (in != null) { - try { - in.close(); - } catch (IOException e) { - throw new RuntimeException("Fail to close InputStream"); - } - } - } - - public static String readAndClose(InputStream inStream, String encoding) { - ByteArrayOutputStream outStream = new ByteArrayOutputStream(); - byte[] buf = new byte[128]; - String data; - try { - int cnt; - while ((cnt = inStream.read(buf)) >= 0) { - outStream.write(buf, 0, cnt); - } - data = outStream.toString(encoding); - } catch (IOException ioe) { - throw new RuntimeException("IOException"); - } finally { - close(inStream); - } - return data; - } -} - diff --git a/src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java deleted file mode 100644 index 50fafc5f036..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DOICrossRefServiceBean.java +++ /dev/null @@ -1,117 +0,0 @@ -package edu.harvard.iq.dataverse; - -import jakarta.ejb.EJB; -import jakarta.ejb.Stateless; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; - -@Stateless -public class DOICrossRefServiceBean extends DOIServiceBean { - private static final Logger logger = Logger.getLogger(DOICrossRefServiceBean.class.getCanonicalName()); - - @EJB - DOICrossRefRegisterService doiCrossRefRegisterService; - - - @Override - public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) throws Exception { - logger.info("CrossRef alreadyRegistered"); - if (pid == null || pid.asString().isEmpty()) { - logger.fine("No identifier sent."); - return false; - } - boolean alreadyExists; - String identifier = pid.asString(); - try { - alreadyExists = doiCrossRefRegisterService.testDOIExists(identifier); - } catch (Exception e) { - logger.log(Level.WARNING, "alreadyExists failed"); - return false; - } - return alreadyExists; - } - - @Override - public boolean registerWhenPublished() { - return true; - } - - @Override - public List getProviderInformation() { - return List.of("CrossRef", "https://status.crossref.org/"); - } - - @Override - protected String getProviderKeyName() { - return "CrossRef"; - } - - @Override - public String createIdentifier(DvObject dvObject) throws Throwable { - logger.info("CrossRef createIdentifier"); - if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) { - dvObject = generateIdentifier(dvObject); - } - String identifier = getIdentifier(dvObject); - try { - String retString = doiCrossRefRegisterService.reserveIdentifier(identifier, dvObject); - logger.log(Level.FINE, "CrossRef create DOI identifier retString : " + retString); - return retString; - } catch (Exception e) { - logger.log(Level.WARNING, "CrossRef Identifier not created: create failed", e); - throw e; - } - } - - @Override - public Map getIdentifierMetadata(DvObject dvObject) { - logger.info("CrossRef getIdentifierMetadata"); - String identifier = getIdentifier(dvObject); - Map metadata = new HashMap<>(); - try { - metadata = doiCrossRefRegisterService.getMetadata(identifier); - } catch (Exception e) { - logger.log(Level.WARNING, "getIdentifierMetadata failed", e); - } - return metadata; - } - - @Override - public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception { - logger.info("CrossRef modifyIdentifier"); - String identifier = getIdentifier(dvObject); - try { - doiCrossRefRegisterService.modifyIdentifier(identifier, dvObject); - } catch (Exception e) { - logger.log(Level.WARNING, "modifyMetadata failed", e); - throw e; - } - return identifier; - } - - @Override - public void deleteIdentifier(DvObject dvo) throws Exception { - logger.info("CrossRef deleteIdentifier"); - } - - @Override - public boolean publicizeIdentifier(DvObject dvObject) { - logger.info("CrossRef updateIdentifierStatus"); - if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) { - dvObject = generateIdentifier(dvObject); - } - String identifier = getIdentifier(dvObject); - - try { - doiCrossRefRegisterService.reserveIdentifier(identifier, dvObject); - return true; - } catch (Exception e) { - logger.log(Level.WARNING, "modifyMetadata failed: " + e.getMessage(), e); - return false; - } - } -} diff --git a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java index cfb17caf5a0..5a689c06019 100644 --- a/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java +++ b/src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java @@ -119,9 +119,6 @@ public class EjbDataverseEngine { @EJB DOIDataCiteServiceBean doiDataCite; - @EJB - DOICrossRefServiceBean doiCrossRef; - @EJB FakePidProviderServiceBean fakePidProvider; @@ -496,11 +493,6 @@ public DOIDataCiteServiceBean doiDataCite() { return doiDataCite; } - @Override - public DOICrossRefServiceBean doiCrossRef() { - return doiCrossRef; - } - @Override public FakePidProviderServiceBean fakePidProvider() { return fakePidProvider; diff --git a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java index ec96bcf603f..aebf13778c3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/GlobalIdServiceBean.java @@ -204,9 +204,8 @@ class BeanDispatcher { switch ( doiProvider ) { case "EZID": return ctxt.doiEZId(); case "DataCite": return ctxt.doiDataCite(); - case "CrossRef": return ctxt.doiCrossRef(); case "FAKE": return ctxt.fakePidProvider(); - default: + default: logger.log(Level.SEVERE, "Unknown doiProvider: {0}", doiProvider); return null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java index 596a76be172..f74c1222bb0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java @@ -1,9 +1,29 @@ package edu.harvard.iq.dataverse.engine.command; -import edu.harvard.iq.dataverse.*; +import edu.harvard.iq.dataverse.DOIDataCiteServiceBean; +import edu.harvard.iq.dataverse.DOIEZIdServiceBean; +import edu.harvard.iq.dataverse.HandlenetServiceBean; +import edu.harvard.iq.dataverse.DataFileServiceBean; +import edu.harvard.iq.dataverse.DatasetLinkingServiceBean; +import edu.harvard.iq.dataverse.DatasetServiceBean; +import edu.harvard.iq.dataverse.DatasetVersionServiceBean; +import edu.harvard.iq.dataverse.DataverseFacetServiceBean; +import edu.harvard.iq.dataverse.DataverseFieldTypeInputLevelServiceBean; +import edu.harvard.iq.dataverse.DataverseLinkingServiceBean; +import edu.harvard.iq.dataverse.DataverseRoleServiceBean; +import edu.harvard.iq.dataverse.DataverseServiceBean; import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean; +import edu.harvard.iq.dataverse.DvObjectServiceBean; +import edu.harvard.iq.dataverse.FeaturedDataverseServiceBean; +import edu.harvard.iq.dataverse.FileDownloadServiceBean; +import edu.harvard.iq.dataverse.GuestbookResponseServiceBean; +import edu.harvard.iq.dataverse.GuestbookServiceBean; import edu.harvard.iq.dataverse.search.IndexServiceBean; +import edu.harvard.iq.dataverse.PermissionServiceBean; +import edu.harvard.iq.dataverse.RoleAssigneeServiceBean; import edu.harvard.iq.dataverse.search.SearchServiceBean; +import edu.harvard.iq.dataverse.TemplateServiceBean; +import edu.harvard.iq.dataverse.UserNotificationServiceBean; import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean; import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean; import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean; @@ -84,8 +104,6 @@ public interface CommandContext { public DOIDataCiteServiceBean doiDataCite(); - public DOICrossRefServiceBean doiCrossRef(); - public FakePidProviderServiceBean fakePidProvider(); public HandlenetServiceBean handleNet(); diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java index 0600175deb5..3bc06738a7e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java @@ -104,16 +104,7 @@ public enum JvmSettings { DATACITE_REST_API_URL(SCOPE_PID_DATACITE, "rest-api-url", "doi.dataciterestapiurlstring", "doi.mdcbaseurlstring"), DATACITE_USERNAME(SCOPE_PID_DATACITE, "username", "doi.username"), DATACITE_PASSWORD(SCOPE_PID_DATACITE, "password", "doi.password"), - - // PROVIDER CROSSREF - SCOPE_PID_CROSSREF(SCOPE_PID, "crossref"), - CROSSREF_URL(SCOPE_PID_CROSSREF, "url"), - CROSSREF_REST_API_URL(SCOPE_PID_CROSSREF, "rest-api-url"), - CROSSREF_USERNAME(SCOPE_PID_CROSSREF, "username", "doi.username"), - CROSSREF_PASSWORD(SCOPE_PID_CROSSREF, "password", "doi.password"), - CROSSREF_DEPOSITOR(SCOPE_PID_CROSSREF, "depositor"), - CROSSREF_DEPOSITOR_EMAIL(SCOPE_PID_CROSSREF, "depositor-email"), - + // PROVIDER PERMALINK SCOPE_PID_PERMALINK(SCOPE_PID, "permalink"), PERMALINK_BASEURL(SCOPE_PID_PERMALINK, "base-url", "perma.baseurlstring"), diff --git a/src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml deleted file mode 100644 index f37ed63cfff..00000000000 --- a/src/main/resources/edu/harvard/iq/dataverse/crossref_metadata_template.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - ${batchId} - ${timestamp} - - ${depositor} - ${depositorEmail} - - Crossref - - - - - - ${title} - - - ${institution} - - - ${datasets} - - - diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java index 15810f85d39..a80adb33b8d 100644 --- a/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java +++ b/src/test/java/edu/harvard/iq/dataverse/engine/TestCommandContext.java @@ -131,11 +131,6 @@ public DOIDataCiteServiceBean doiDataCite() { return null; } - @Override - public DOICrossRefServiceBean doiCrossRef() { - return null; - } - @Override public FakePidProviderServiceBean fakePidProvider() { return null; From ac1b23c2ac879583fa4e6c9563b8adc368183a77 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:45:32 -0400 Subject: [PATCH 203/366] add CrossRef Pid Provider --- .../8581-add-crossref-pid-provider.md | 3 + .../source/installation/config.rst | 53 +++ .../pidproviders/PidProviderFactoryBean.java | 7 +- .../doi/crossref/CrossRefDOIPidProvider.java | 125 +++++++ .../crossref/CrossRefDOIProviderFactory.java | 43 +++ .../crossref/CrossRefDOIRegisterService.java | 326 ++++++++++++++++++ .../doi/crossref/CrossRefRESTfullClient.java | 119 +++++++ .../iq/dataverse/settings/JvmSettings.java | 10 +- .../crossref/crossref_metadata_template.xml | 29 ++ .../dataverse/pidproviders/PidUtilTest.java | 19 +- 10 files changed, 728 insertions(+), 6 deletions(-) create mode 100644 doc/release-notes/8581-add-crossref-pid-provider.md create mode 100644 src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIPidProvider.java create mode 100644 src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java create mode 100644 src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java create mode 100644 src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java create mode 100644 src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref/crossref_metadata_template.xml diff --git a/doc/release-notes/8581-add-crossref-pid-provider.md b/doc/release-notes/8581-add-crossref-pid-provider.md new file mode 100644 index 00000000000..3610aa6d7cc --- /dev/null +++ b/doc/release-notes/8581-add-crossref-pid-provider.md @@ -0,0 +1,3 @@ +Added CrossRef DOI Pid Provider + +See Installation Configuration document for JVM Settings to enable CrossRef as a Pid Provider diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index ae3b07fecfe..364af24f32c 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -617,6 +617,15 @@ this provider. - :ref:`dataverse.pid.ezid.username` - :ref:`dataverse.pid.ezid.password` +**JVM Options for CrossRef:** + +- :ref:`dataverse.pid.crossref.url` +- :ref:`dataverse.pid.crossref.rest-api-url` +- :ref:`dataverse.pid.crossref.username` +- :ref:`dataverse.pid.crossref.password` +- :ref:`dataverse.pid.crossref.depositor` +- :ref:`dataverse.pid.crossref.depositor-email` + **Database Settings:** - :ref:`:DoiProvider <:DoiProvider>` @@ -2841,6 +2850,50 @@ should delete the old JVM option and the wrapped password alias, then recreate as shown for :ref:`dataverse.pid.datacite.password` but with the EZID alias name. +.. _dataverse.pid.crossref.url: + +dataverse.pid.crossref.url +++++++++++++++++++++++++++ + +CrossRef url used to post metadata. + +.. _dataverse.pid.crossref.rest-api-url: + +dataverse.pid.crossref.rest-api-url ++++++++++++++++++++++++++++++++++++ + +CrossRef API url to retrieve metadata information + +.. _dataverse.pid.crossref.username: + +dataverse.pid.crossref.username ++++++++++++++++++++++++++++++++ + +CrossRef uses `HTTP Basic authentication `_ +for their APIs. +- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.password`. + +.. _dataverse.pid.crossref.password: + +dataverse.pid.crossref.password ++++++++++++++++++++++++++++++++ + +- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.username`. + +.. _dataverse.pid.crossref.depositor: + +dataverse.pid.crossref.depositor +++++++++++++++++++++++++++++++++ + +The entity, such as a person or organization, that deposited the Dataset in the repository + +.. _dataverse.pid.crossref.depositor-email: + +dataverse.pid.crossref.depositor-email +++++++++++++++++++++++++++++++++++++++ + +Contact email to the indicated Depositor + .. _dataverse.timerServer: dataverse.timerServer diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java index 40044408c63..3086df71819 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java @@ -12,7 +12,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; import java.util.Optional; import java.util.ServiceLoader; import java.util.logging.Level; @@ -30,6 +29,7 @@ import edu.harvard.iq.dataverse.DvObjectServiceBean; import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.pidproviders.doi.UnmanagedDOIProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIProviderFactory; import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.ezid.EZIdDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.fake.FakeDOIProvider; @@ -188,6 +188,9 @@ private void loadProviders() { legacy = new FakeDOIProvider("legacy", "legacy", authority, shoulder, identifierGenerationStyle, dataFilePidFormat, "", ""); break; + case "CrossRef": + legacy = new CrossRefDOIProviderFactory().createPidProvider(JvmSettings.PID_DEFAULT_PROVIDER.lookup()); + break; } break; case "hdl": @@ -247,4 +250,4 @@ public PidProvider getDefaultPidGenerator() { return PidUtil.getPidProvider(protocol, authority, shoulder); } } -} \ No newline at end of file +} diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIPidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIPidProvider.java new file mode 100644 index 00000000000..32ed70a443c --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIPidProvider.java @@ -0,0 +1,125 @@ +package edu.harvard.iq.dataverse.pidproviders.doi.crossref; + +import edu.harvard.iq.dataverse.DvObject; +import edu.harvard.iq.dataverse.GlobalId; +import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class CrossRefDOIPidProvider extends AbstractDOIProvider { + private static final Logger logger = Logger.getLogger(CrossRefDOIPidProvider.class.getCanonicalName()); + + public static final String TYPE = "crossref"; + + CrossRefDOIRegisterService crossRefDOIRegisterService; + + public CrossRefDOIPidProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle, String datafilePidFormat, String managedList, String excludedList, + String url, String apiUrl, String username, String password, String depositor, String depositorEmail) { + super(id, label, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat, + managedList, excludedList); + + crossRefDOIRegisterService = new CrossRefDOIRegisterService(url, apiUrl, username, password, depositor, depositorEmail); + } + + @Override + public boolean alreadyRegistered(GlobalId pid, boolean noProviderDefault) throws Exception { + logger.info("CrossRef alreadyRegistered"); + if (pid == null || pid.asString().isEmpty()) { + logger.fine("No identifier sent."); + return false; + } + boolean alreadyExists; + String identifier = pid.asString(); + try { + alreadyExists = crossRefDOIRegisterService.testDOIExists(identifier); + } catch (Exception e) { + logger.log(Level.WARNING, "alreadyExists failed"); + return false; + } + return alreadyExists; + } + + @Override + public boolean registerWhenPublished() { + return true; + } + + @Override + public List getProviderInformation() { + return List.of("CrossRef", "https://status.crossref.org/"); + } + + @Override + public String createIdentifier(DvObject dvObject) throws Throwable { + logger.info("CrossRef createIdentifier"); + if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) { + dvObject = generatePid(dvObject); + } + String identifier = getIdentifier(dvObject); + try { + String retString = crossRefDOIRegisterService.reserveIdentifier(identifier, dvObject); + logger.log(Level.FINE, "CrossRef create DOI identifier retString : " + retString); + return retString; + } catch (Exception e) { + logger.log(Level.WARNING, "CrossRef Identifier not created: create failed", e); + throw e; + } + } + + @Override + public Map getIdentifierMetadata(DvObject dvObject) { + logger.info("CrossRef getIdentifierMetadata"); + String identifier = getIdentifier(dvObject); + Map metadata = new HashMap<>(); + try { + metadata = crossRefDOIRegisterService.getMetadata(identifier); + } catch (Exception e) { + logger.log(Level.WARNING, "getIdentifierMetadata failed", e); + } + return metadata; + } + + @Override + public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception { + logger.info("CrossRef modifyIdentifier"); + String identifier = getIdentifier(dvObject); + try { + crossRefDOIRegisterService.modifyIdentifier(identifier, dvObject); + } catch (Exception e) { + logger.log(Level.WARNING, "modifyMetadata failed", e); + throw e; + } + return identifier; + } + + @Override + public void deleteIdentifier(DvObject dvo) throws Exception { + logger.info("CrossRef deleteIdentifier"); + } + + @Override + public boolean publicizeIdentifier(DvObject dvObject) { + logger.info("CrossRef updateIdentifierStatus"); + if (dvObject.getIdentifier() == null || dvObject.getIdentifier().isEmpty()) { + dvObject = generatePid(dvObject); + } + String identifier = getIdentifier(dvObject); + + try { + crossRefDOIRegisterService.reserveIdentifier(identifier, dvObject); + return true; + } catch (Exception e) { + logger.log(Level.WARNING, "modifyMetadata failed: " + e.getMessage(), e); + return false; + } + } + + @Override + public String getProviderType() { + return TYPE; + } +} diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java new file mode 100644 index 00000000000..1320a0d1e4c --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java @@ -0,0 +1,43 @@ +package edu.harvard.iq.dataverse.pidproviders.doi.crossref; + +import com.google.auto.service.AutoService; +import edu.harvard.iq.dataverse.pidproviders.PidProvider; +import edu.harvard.iq.dataverse.pidproviders.PidProviderFactory; +import edu.harvard.iq.dataverse.settings.JvmSettings; +import edu.harvard.iq.dataverse.util.SystemConfig; + +@AutoService(PidProviderFactory.class) +public class CrossRefDOIProviderFactory implements PidProviderFactory { + + @Override + public PidProvider createPidProvider(String providerId) { + String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId); + if (!providerType.equals(CrossRefDOIPidProvider.TYPE)) { + // Being asked to create a non-CrossRef provider + return null; + } + String providerLabel = JvmSettings.PID_PROVIDER_LABEL.lookup(providerId); + String providerAuthority = JvmSettings.PID_PROVIDER_AUTHORITY.lookup(providerId); + String providerShoulder = JvmSettings.PID_PROVIDER_SHOULDER.lookupOptional(providerId).orElse(""); + String identifierGenerationStyle = JvmSettings.PID_PROVIDER_IDENTIFIER_GENERATION_STYLE + .lookupOptional(providerId).orElse("randomString"); + String datafilePidFormat = JvmSettings.PID_PROVIDER_DATAFILE_PID_FORMAT.lookupOptional(providerId) + .orElse(SystemConfig.DataFilePIDFormat.DEPENDENT.toString()); + String managedList = JvmSettings.PID_PROVIDER_MANAGED_LIST.lookupOptional(providerId).orElse(""); + String excludedList = JvmSettings.PID_PROVIDER_EXCLUDED_LIST.lookupOptional(providerId).orElse(""); + + String baseUrl = JvmSettings.CROSSREF_URL.lookup(providerId); + String apiUrl = JvmSettings.CROSSREF_REST_API_URL.lookup(providerId); + String username = JvmSettings.CROSSREF_USERNAME.lookup(providerId); + String password = JvmSettings.CROSSREF_PASSWORD.lookup(providerId); + String depositor = JvmSettings.CROSSREF_DEPOSITOR.lookup(providerId); + String depositorEmail = JvmSettings.CROSSREF_DEPOSITOR_EMAIL.lookup(providerId); + + return new CrossRefDOIPidProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle, + datafilePidFormat, managedList, excludedList, baseUrl, apiUrl, username, password, depositor, depositorEmail); + } + + public String getType() { + return CrossRefDOIPidProvider.TYPE; + } +} diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java new file mode 100644 index 00000000000..4e369799c1f --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java @@ -0,0 +1,326 @@ +package edu.harvard.iq.dataverse.pidproviders.doi.crossref; + +import com.fasterxml.jackson.databind.ObjectMapper; +import edu.harvard.iq.dataverse.*; +import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; +import jakarta.enterprise.inject.spi.CDI; +import org.apache.commons.text.StringEscapeUtils; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static edu.harvard.iq.dataverse.util.SystemConfig.getDataverseSiteUrlStatic; + +public class CrossRefDOIRegisterService implements java.io.Serializable { + private static final Logger logger = Logger.getLogger(CrossRefDOIRegisterService.class.getCanonicalName()); + + private final String url; + private final String apiUrl; + private final String username; + private final String password; + private final String depositor; + private final String depositorEmail; + + + private static DataverseServiceBean dataverseService = null; + + private CrossRefRESTfullClient client = null; + + public CrossRefDOIRegisterService(String url, String apiUrl, String username, String password, String depositor, String depositorEmail) { + this.url = url; + this.apiUrl = apiUrl; + this.username = username; + this.password = password; + this.depositor = depositor; + this.depositorEmail = depositorEmail; + } + + private CrossRefRESTfullClient getClient() { + if (client == null) { + client = new CrossRefRESTfullClient(url, apiUrl, username, password); + } + return client; + } + + public boolean testDOIExists(String identifier) { + boolean doiExists; + try { + CrossRefRESTfullClient client = getClient(); + doiExists = client.testDOIExists(identifier.substring(identifier.indexOf(":") + 1)); + } catch (Exception e) { + logger.log(Level.INFO, identifier, e); + return false; + } + return doiExists; + } + + public HashMap getMetadata(String identifier) throws IOException { + HashMap metadata = new HashMap<>(); + try { + CrossRefRESTfullClient client = getClient(); + String jsonMetadata = client.getMetadata(identifier.substring(identifier.indexOf(":") + 1)); + Map mappedJson = new ObjectMapper().readValue(jsonMetadata, HashMap.class); + logger.log(Level.FINE, jsonMetadata); + metadata.put("_status", mappedJson.get("status").toString()); + } catch (RuntimeException e) { + logger.log(Level.INFO, identifier, e); + } + return metadata; + } + + public String reserveIdentifier(String identifier, DvObject dvObject) throws IOException { + logger.info("Crossref reserveIdentifier"); + String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); + + CrossRefRESTfullClient client = getClient(); + return client.postMetadata(xmlMetadata); + } + + public void modifyIdentifier(String identifier, DvObject dvObject) throws IOException { + logger.info("Crossref modifyIdentifier"); + String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); + + CrossRefRESTfullClient client = getClient(); + client.postMetadata(xmlMetadata); + } + + public String getMetadataFromDvObject(String identifier, DvObject dvObject) { + Dataset dataset; + + if (dvObject instanceof Dataset) { + dataset = (Dataset) dvObject; + } else { + dataset = (Dataset) dvObject.getOwner(); + } + if (dataverseService == null) { + dataverseService = CDI.current().select(DataverseServiceBean.class).get(); + } + + CrossRefMetadataTemplate metadataTemplate = new CrossRefMetadataTemplate(); + metadataTemplate.setIdentifier(identifier.substring(identifier.indexOf(':') + 1)); + metadataTemplate.setAuthors(dataset.getLatestVersion().getDatasetAuthors()); + metadataTemplate.setDepositor(depositor); + metadataTemplate.setDepositorEmail(depositorEmail); + metadataTemplate.setInstitution(dataverseService.getRootDataverseName()); + + String title = dvObject.getCurrentName(); + if (dvObject.isInstanceofDataFile()) { + //Note file title is not currently escaped the way the dataset title is, so adding it here. + title = StringEscapeUtils.escapeXml10(title); + } + + if (title.isEmpty() || title.equals(DatasetField.NA_VALUE)) { + title = AbstractPidProvider.UNAVAILABLE; + } + + metadataTemplate.setTitle(title); + + return metadataTemplate.generateXML(); + } +} + +class CrossRefMetadataTemplate { + + private static final Logger logger = Logger.getLogger("edu.harvard.iq.dataverse.edu.harvard.iq.dataverse.CrossRefMetadataTemplate"); + private static String template; + + static { + try (InputStream in = CrossRefMetadataTemplate.class.getResourceAsStream("crossref_metadata_template.xml")) { + template = CrossRefFileUtil.readAndClose(in, "utf-8"); + } catch (Exception e) { + logger.log(Level.SEVERE, "crossref metadata template load error"); + logger.log(Level.SEVERE, "String " + e); + logger.log(Level.SEVERE, "localized message " + e.getLocalizedMessage()); + logger.log(Level.SEVERE, "cause " + e.getCause()); + logger.log(Level.SEVERE, "message " + e.getMessage()); + } + } + + private final String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + private String institution; + private String depositor; + private String depositorEmail; + private String databaseTitle; + private String identifier; + private String title; + private final String baseUrl = getDataverseSiteUrlStatic(); + private List authors; + + public List getAuthors() { + return authors; + } + + public void setAuthors(List authors) { + this.authors = authors; + } + + public CrossRefMetadataTemplate() { + } + + public String generateXML() { + String xmlMetadata = template.replace("${depositor}", depositor) + .replace("${depositorEmail}", depositorEmail) + .replace("${title}", title) + .replace("${institution}", institution) + .replace("${batchId}", identifier + " " + timestamp) + .replace("${timestamp}", timestamp); + + StringBuilder datasetElement = new StringBuilder(); + datasetElement.append(""); + + StringBuilder contributorsElement = new StringBuilder(); + if (authors != null && !authors.isEmpty()) { + contributorsElement.append(""); + for (DatasetAuthor author : authors) { + contributorsElement.append(""); + contributorsElement.append(author.getName().getDisplayValue()); + contributorsElement.append(""); + contributorsElement.append(author.getName().getDisplayValue()); + contributorsElement.append(""); + + if (author.getAffiliation() != null && !author.getAffiliation().getDisplayValue().isEmpty()) { + contributorsElement.append("") + .append(author.getAffiliation().getDisplayValue()) + .append(""); + } + + if (author.getIdType() != null && + author.getIdValue() != null && + !author.getIdType().isEmpty() && + !author.getIdValue().isEmpty() && + author.getAffiliation() != null && + !author.getAffiliation().getDisplayValue().isEmpty()) { + if (author.getIdType().equals("ORCID")) { + contributorsElement.append("").append("https://orcid.org/").append(author.getIdValue()).append(""); + } + if (author.getIdType().equals("ISNI")) { + contributorsElement.append("").append(author.getIdValue()).append(""); + } + if (author.getIdType().equals("LCNA")) { + contributorsElement.append("").append(author.getIdValue()).append(""); + } + } + + contributorsElement.append(""); + } + contributorsElement.append(""); + + } else { + contributorsElement.append("") + .append(AbstractPidProvider.UNAVAILABLE) + .append(""); + } + + datasetElement.append(contributorsElement); + + datasetElement.append("") + .append(this.title) + .append(""); + + datasetElement.append("") + .append(this.identifier) + .append("") + .append(this.baseUrl).append("/dataset.xhtml?persistentId=doi:").append(this.identifier) + .append(""); + + datasetElement.append(""); + xmlMetadata = xmlMetadata.replace("${datasets}", datasetElement.toString()); + return xmlMetadata; + } + + public static String getTemplate() { + return template; + } + + public static void setTemplate(String template) { + CrossRefMetadataTemplate.template = template; + } + + public String getIdentifier() { + return identifier; + } + + public String getDepositor() { + return depositor; + } + + public void setDepositor(String depositor) { + this.depositor = depositor; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getInstitution() { + return institution; + } + + public void setInstitution(String institution) { + this.institution = institution; + } + + public String getDepositorEmail() { + return depositorEmail; + } + + public void setDepositorEmail(String depositorEmail) { + this.depositorEmail = depositorEmail; + } + + public String getDatabaseTitle() { + return databaseTitle; + } + + public void setDatabaseTitle(String databaseTitle) { + this.databaseTitle = databaseTitle; + } +} + +class CrossRefFileUtil { + + public static void close(InputStream in) { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + throw new RuntimeException("Fail to close InputStream"); + } + } + } + + public static String readAndClose(InputStream inStream, String encoding) { + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + byte[] buf = new byte[128]; + String data; + try { + int cnt; + while ((cnt = inStream.read(buf)) >= 0) { + outStream.write(buf, 0, cnt); + } + data = outStream.toString(encoding); + } catch (IOException ioe) { + throw new RuntimeException("IOException"); + } finally { + close(inStream); + } + return data; + } +} + diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java new file mode 100644 index 00000000000..4e989fe691d --- /dev/null +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java @@ -0,0 +1,119 @@ +package edu.harvard.iq.dataverse.pidproviders.doi.crossref; + +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.mime.HttpMultipartMode; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; + +import java.io.Closeable; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class CrossRefRESTfullClient implements Closeable { + + private static final Logger logger = Logger.getLogger(CrossRefRESTfullClient.class.getCanonicalName()); + + private final String url; + private final String apiUrl; + private final String username; + private final String password; + private final CloseableHttpClient httpClient; + private final HttpClientContext context; + private final String encoding = "utf-8"; + + public CrossRefRESTfullClient(String url, String apiUrl, String username, String password) { + this.url = url; + this.apiUrl = apiUrl; + this.username = username; + this.password = password; + try { + context = HttpClientContext.create(); + CredentialsProvider credsProvider = new BasicCredentialsProvider(); + credsProvider.setCredentials(new AuthScope(null, -1), + new UsernamePasswordCredentials(username, password)); + context.setCredentialsProvider(credsProvider); + + httpClient = HttpClients.createDefault(); + } catch (Exception ioe) { + close(); + logger.log(Level.SEVERE,"Fail to init Client",ioe); + throw new RuntimeException("Fail to init Client", ioe); + } + } + + public void close() { + if (this.httpClient != null) { + try { + httpClient.close(); + } catch (IOException io) { + logger.warning("IOException closing httpClient: " + io.getMessage()); + } + } + } + + public String getMetadata(String doi) { + HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi); + httpGet.setHeader("Accept", "application/json"); + try { + HttpResponse response = httpClient.execute(httpGet); + String data = EntityUtils.toString(response.getEntity(), encoding); + if (response.getStatusLine().getStatusCode() != 200) { + String errMsg = "Response from getMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; + logger.info(errMsg); + throw new RuntimeException(errMsg); + } + return data; + } catch (IOException ioe) { + logger.info("IOException when get metadata"); + throw new RuntimeException("IOException when get metadata", ioe); + } + } + + public String postMetadata(String xml) throws IOException { + HttpEntity entity = MultipartEntityBuilder.create() + .addTextBody("operation", "doMDUpload") + .addTextBody("login_id", username) + .addTextBody("login_passwd", password) + .addBinaryBody("fname", xml.getBytes(StandardCharsets.UTF_8), ContentType.APPLICATION_XML, "metadata.xml") + .setMode(HttpMultipartMode.BROWSER_COMPATIBLE) + .build(); + + HttpPost httpPost = new HttpPost(url + "/servlet/deposit"); + httpPost.setHeader("Accept", "*/*"); + httpPost.setEntity(entity); + HttpResponse response = httpClient.execute(httpPost); + + String data = EntityUtils.toString(response.getEntity(), encoding); + if (response.getStatusLine().getStatusCode() != 200) { + String errMsg = "Response from postMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; + logger.info(errMsg); + throw new IOException(errMsg); + } + return data; + } + + public boolean testDOIExists(String doi) throws IOException { + HttpGet httpGet = new HttpGet(this.apiUrl + "/works/" + doi); + httpGet.setHeader("Accept", "application/json"); + HttpResponse response = httpClient.execute(httpGet); + if (response.getStatusLine().getStatusCode() != 200) { + EntityUtils.consumeQuietly(response.getEntity()); + return false; + } + EntityUtils.consumeQuietly(response.getEntity()); + return true; + } +} diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java index 9d13be005c9..29e42bb67fe 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java @@ -124,7 +124,15 @@ public enum JvmSettings { DATACITE_REST_API_URL(SCOPE_PID_DATACITE, "rest-api-url"), DATACITE_USERNAME(SCOPE_PID_DATACITE, "username"), DATACITE_PASSWORD(SCOPE_PID_DATACITE, "password"), - + + // PROVIDER CROSSREF + CROSSREF_URL(SCOPE_PID_PROVIDER, "url"), + CROSSREF_REST_API_URL(SCOPE_PID_PROVIDER, "rest-api-url"), + CROSSREF_USERNAME(SCOPE_PID_PROVIDER, "username"), + CROSSREF_PASSWORD(SCOPE_PID_PROVIDER, "password"), + CROSSREF_DEPOSITOR(SCOPE_PID_PROVIDER, "depositor"), + CROSSREF_DEPOSITOR_EMAIL(SCOPE_PID_PROVIDER, "depositor-email"), + // PROVIDER PERMALINK SCOPE_PID_PERMALINK(SCOPE_PID_PROVIDER, "permalink"), PERMALINK_BASE_URL(SCOPE_PID_PERMALINK, "base-url"), diff --git a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref/crossref_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref/crossref_metadata_template.xml new file mode 100644 index 00000000000..f37ed63cfff --- /dev/null +++ b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref/crossref_metadata_template.xml @@ -0,0 +1,29 @@ + + + + ${batchId} + ${timestamp} + + ${depositor} + ${depositorEmail} + + Crossref + + + + + + ${title} + + + ${institution} + + + ${datasets} + + + diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java index cffac741c78..1b5938999a0 100644 --- a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java @@ -5,6 +5,8 @@ import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.UnmanagedDOIProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIPidProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIProviderFactory; import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteProviderFactory; import edu.harvard.iq.dataverse.pidproviders.doi.ezid.EZIdDOIProvider; @@ -25,7 +27,6 @@ import edu.harvard.iq.dataverse.util.testing.LocalJvmSettings; import java.io.IOException; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -41,7 +42,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; @@ -114,8 +114,20 @@ @JvmSetting(key = JvmSettings.HANDLENET_KEY_PASSPHRASE, value = "passphrase", varArgs ="hdl1") @JvmSetting(key = JvmSettings.HANDLENET_KEY_PATH, value = "/tmp/cred", varArgs ="hdl1") +// CrossRef 1 +@JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "CrossRef 1", varArgs = "crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = CrossRefDOIPidProvider.TYPE, varArgs = "crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.5072", varArgs = "crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "FK2/", varArgs = "crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "cr:20.20.20/FK2ABCDEF", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_URL, value = "http://localhost", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_REST_API_URL, value = "http://localhost", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_USERNAME, value = "crusername", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_PASSWORD, value = "secret", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_DEPOSITOR, value = "xyz", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_DEPOSITOR_EMAIL, value = "xyz@example.com", varArgs ="crossref1") //List to instantiate -@JvmSetting(key = JvmSettings.PID_PROVIDERS, value = "perma1, perma2, dc1, dc2, ez1, fake1, hdl1") +@JvmSetting(key = JvmSettings.PID_PROVIDERS, value = "perma1, perma2, dc1, dc2, ez1, fake1, hdl1, crossref1") public class PidUtilTest { @@ -133,6 +145,7 @@ public static void setUpClass() throws Exception { pidProviderFactoryMap.put(HandlePidProvider.TYPE, new HandleProviderFactory()); pidProviderFactoryMap.put(FakeDOIProvider.TYPE, new FakeProviderFactory()); pidProviderFactoryMap.put(EZIdDOIProvider.TYPE, new EZIdProviderFactory()); + pidProviderFactoryMap.put(CrossRefDOIPidProvider.TYPE, new CrossRefDOIProviderFactory()); PidUtil.clearPidProviders(); From c5b9ccc3e370fa7c7d3e83be538a5c359de4b2e9 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 28 Aug 2024 15:53:51 +0200 Subject: [PATCH 204/366] docs(ct): document new tagging and release policy for base image --- .../source/container/base-image.rst | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index 0005265fb1c..e364579b568 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -26,15 +26,26 @@ Supported Image Tags This image is sourced from the main upstream code `repository of the Dataverse software `_. Development and maintenance of the `image's code `_ -happens there (again, by the community). Community-supported image tags are based on the two most important -upstream branches: - -- The ``unstable`` tag corresponds to the ``develop`` branch, where pull requests are merged. - (`Dockerfile `__) -- The ``alpha`` tag corresponds to the ``master`` branch, where releases are cut from. - (`Dockerfile `__) - - +happens there (again, by the community). + +In our tagging, we `follow the Bitname example `_: + +- ``latest``: Rolling tag on par with whatever happens on the ``develop`` branch. (`Dockerfile `__) + Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag. + Usage is recommended for development purposes only. +- ``..--p-j``: + Rolling tag corresponding to functionality provided by the ``container-base`` module at a certain version. + Auto-released for changes on ``develop`` branch as well as scheduled maintenance for the *three* most recent Dataverse releases. + Semantic versioning applies to functionality of the base image only. + (`Dockerfile `__ or same location within tagged Dataverse releases) +- ``..--p-j-r``: + Immutable tag, otherwise same as above. + Revision is incremented for rebuilds of the base image. + Recommended for production builds and usage. + +**Note:** It is not possible to provide shorter rolling tags, as the source for a tag like ``x.y.z-jammy`` would not be unambiguous. +If the version number does not change between releases and/or the ``develop`` branch, one is going to win over another image. +If at the same time Payara or Java version change (which is independent from the module version!), it becomes unclear which version people end up using. Image Contents ++++++++++++++ From c8f95a0e008d8e004dd2b25f3f450083968b73ef Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 28 Aug 2024 15:59:49 +0200 Subject: [PATCH 205/366] refactor(ct): align base image tagging with documented policy --- modules/container-base/pom.xml | 4 ++-- modules/container-base/src/backports/v6.1/001-pom.xml.patch | 4 ++-- modules/container-base/src/backports/v6.2/001-pom.xml.patch | 4 ++-- modules/container-base/src/backports/v6.3/001-pom.xml.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index 5de94bfc941..8e5c476c64a 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -42,10 +42,10 @@ docker-build gdcc/base:${base.image.tag} - ${project.version}-${java.image.flavor} + ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} SNAPSHOT - ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} + ${base.image.tag}-r${base.image.revision} eclipse-temurin:${target.java.version}-jre-${java.image.flavor} noble 1000 diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch index 508b496af14..a61f6b6fb14 100644 --- a/modules/container-base/src/backports/v6.1/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.1/001-pom.xml.patch @@ -14,10 +14,10 @@ gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor} ++ ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} + + SNAPSHOT -+ ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} ++ ${base.image.tag}-r${base.image.revision} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 diff --git a/modules/container-base/src/backports/v6.2/001-pom.xml.patch b/modules/container-base/src/backports/v6.2/001-pom.xml.patch index 256680c2595..90fccffe53d 100644 --- a/modules/container-base/src/backports/v6.2/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.2/001-pom.xml.patch @@ -14,10 +14,10 @@ gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor} ++ ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} + + SNAPSHOT -+ ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} ++ ${base.image.tag}-r${base.image.revision} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 diff --git a/modules/container-base/src/backports/v6.3/001-pom.xml.patch b/modules/container-base/src/backports/v6.3/001-pom.xml.patch index b1ab9bfe589..83e151b6656 100644 --- a/modules/container-base/src/backports/v6.3/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.3/001-pom.xml.patch @@ -14,10 +14,10 @@ gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor} ++ ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} + + SNAPSHOT -+ ${base.image.tag}-pyr${payara.version}-tmrn${target.java.version}-r${base.image.revision} ++ ${base.image.tag}-r${base.image.revision} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 From 37c7411fe5bcc45f360cb4affa3f211440725d0f Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:55:13 -0400 Subject: [PATCH 206/366] making changes per review --- .../source/installation/config.rst | 39 ++++++++++++++----- .../pidproviders/PidProviderFactoryBean.java | 7 +--- ...Provider.java => CrossRefDOIProvider.java} | 8 ++-- .../crossref/CrossRefDOIProviderFactory.java | 6 +-- .../iq/dataverse/settings/JvmSettings.java | 13 ++++--- .../dataverse/pidproviders/PidUtilTest.java | 16 ++++---- .../dataverse/settings/JvmSettingsTest.java | 10 ++++- 7 files changed, 62 insertions(+), 37 deletions(-) rename src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/{CrossRefDOIPidProvider.java => CrossRefDOIProvider.java} (90%) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 364af24f32c..3410d2404e6 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -503,6 +503,36 @@ for `Fabrica `_ and their APIs. You need to provide the same credentials (``username``, ``password``) to Dataverse software to mint and manage DOIs for you. As noted above, you should use one of the more secure options for setting the password. +CrossRef-specific Settings +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +dataverse.pid.*.crossref.url +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +dataverse.pid.*.crossref.rest-api-url +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +dataverse.pid.*.crossref.username +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +dataverse.pid.*.crossref.password +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +dataverse.pid.*.crossref.depositor +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +dataverse.pid.*.crossref.depositor-email +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +PID Providers of type ``crossref`` require six additional parameters that define how the provider connects to CrossRef. +CrossRef has two APIs that are used in Dataverse: + +The base URL of the `CrossRef `_, +used to mint and manage DOIs. Current valid values for ``dataverse.pid.*.datacite.mds-api-url`` are "https://mds.datacite.org" (production) and "https://mds.test.datacite.org" (testing, the default). + +CrossRef uses `HTTP Basic authentication `_ +XML files can be POSTed to CrossRef where they are added to the submission queue to await processing +`Post URL `_ +REST API allows the search and reuse our members' metadata. +`Rest API `_ and their APIs. +You need to provide the same credentials (``username``, ``password``) to Dataverse software to mint and manage DOIs for you. +As noted above, you should use one of the more secure options for setting the password. +Depositor and Depositor Email are used for the generation and distribution of Depositor reports. .. _dataverse.pid.*.ezid: @@ -617,15 +647,6 @@ this provider. - :ref:`dataverse.pid.ezid.username` - :ref:`dataverse.pid.ezid.password` -**JVM Options for CrossRef:** - -- :ref:`dataverse.pid.crossref.url` -- :ref:`dataverse.pid.crossref.rest-api-url` -- :ref:`dataverse.pid.crossref.username` -- :ref:`dataverse.pid.crossref.password` -- :ref:`dataverse.pid.crossref.depositor` -- :ref:`dataverse.pid.crossref.depositor-email` - **Database Settings:** - :ref:`:DoiProvider <:DoiProvider>` diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java index 3086df71819..40044408c63 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java @@ -12,6 +12,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; import java.util.Optional; import java.util.ServiceLoader; import java.util.logging.Level; @@ -29,7 +30,6 @@ import edu.harvard.iq.dataverse.DvObjectServiceBean; import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.pidproviders.doi.UnmanagedDOIProvider; -import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIProviderFactory; import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.ezid.EZIdDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.fake.FakeDOIProvider; @@ -188,9 +188,6 @@ private void loadProviders() { legacy = new FakeDOIProvider("legacy", "legacy", authority, shoulder, identifierGenerationStyle, dataFilePidFormat, "", ""); break; - case "CrossRef": - legacy = new CrossRefDOIProviderFactory().createPidProvider(JvmSettings.PID_DEFAULT_PROVIDER.lookup()); - break; } break; case "hdl": @@ -250,4 +247,4 @@ public PidProvider getDefaultPidGenerator() { return PidUtil.getPidProvider(protocol, authority, shoulder); } } -} +} \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIPidProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProvider.java similarity index 90% rename from src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIPidProvider.java rename to src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProvider.java index 32ed70a443c..98a4f806836 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIPidProvider.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProvider.java @@ -10,15 +10,15 @@ import java.util.logging.Level; import java.util.logging.Logger; -public class CrossRefDOIPidProvider extends AbstractDOIProvider { - private static final Logger logger = Logger.getLogger(CrossRefDOIPidProvider.class.getCanonicalName()); +public class CrossRefDOIProvider extends AbstractDOIProvider { + private static final Logger logger = Logger.getLogger(CrossRefDOIProvider.class.getCanonicalName()); public static final String TYPE = "crossref"; CrossRefDOIRegisterService crossRefDOIRegisterService; - public CrossRefDOIPidProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle, String datafilePidFormat, String managedList, String excludedList, - String url, String apiUrl, String username, String password, String depositor, String depositorEmail) { + public CrossRefDOIProvider(String id, String label, String providerAuthority, String providerShoulder, String identifierGenerationStyle, String datafilePidFormat, String managedList, String excludedList, + String url, String apiUrl, String username, String password, String depositor, String depositorEmail) { super(id, label, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat, managedList, excludedList); diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java index 1320a0d1e4c..545212cc43c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIProviderFactory.java @@ -12,7 +12,7 @@ public class CrossRefDOIProviderFactory implements PidProviderFactory { @Override public PidProvider createPidProvider(String providerId) { String providerType = JvmSettings.PID_PROVIDER_TYPE.lookup(providerId); - if (!providerType.equals(CrossRefDOIPidProvider.TYPE)) { + if (!providerType.equals(CrossRefDOIProvider.TYPE)) { // Being asked to create a non-CrossRef provider return null; } @@ -33,11 +33,11 @@ public PidProvider createPidProvider(String providerId) { String depositor = JvmSettings.CROSSREF_DEPOSITOR.lookup(providerId); String depositorEmail = JvmSettings.CROSSREF_DEPOSITOR_EMAIL.lookup(providerId); - return new CrossRefDOIPidProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle, + return new CrossRefDOIProvider(providerId, providerLabel, providerAuthority, providerShoulder, identifierGenerationStyle, datafilePidFormat, managedList, excludedList, baseUrl, apiUrl, username, password, depositor, depositorEmail); } public String getType() { - return CrossRefDOIPidProvider.TYPE; + return CrossRefDOIProvider.TYPE; } } diff --git a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java index 29e42bb67fe..0acc5d3267f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java +++ b/src/main/java/edu/harvard/iq/dataverse/settings/JvmSettings.java @@ -126,12 +126,13 @@ public enum JvmSettings { DATACITE_PASSWORD(SCOPE_PID_DATACITE, "password"), // PROVIDER CROSSREF - CROSSREF_URL(SCOPE_PID_PROVIDER, "url"), - CROSSREF_REST_API_URL(SCOPE_PID_PROVIDER, "rest-api-url"), - CROSSREF_USERNAME(SCOPE_PID_PROVIDER, "username"), - CROSSREF_PASSWORD(SCOPE_PID_PROVIDER, "password"), - CROSSREF_DEPOSITOR(SCOPE_PID_PROVIDER, "depositor"), - CROSSREF_DEPOSITOR_EMAIL(SCOPE_PID_PROVIDER, "depositor-email"), + SCOPE_PID_CROSSREF(SCOPE_PID_PROVIDER, "crossref"), + CROSSREF_URL(SCOPE_PID_CROSSREF, "url"), + CROSSREF_REST_API_URL(SCOPE_PID_CROSSREF, "rest-api-url"), + CROSSREF_USERNAME(SCOPE_PID_CROSSREF, "username"), + CROSSREF_PASSWORD(SCOPE_PID_CROSSREF, "password"), + CROSSREF_DEPOSITOR(SCOPE_PID_CROSSREF, "depositor"), + CROSSREF_DEPOSITOR_EMAIL(SCOPE_PID_CROSSREF, "depositor-email"), // PROVIDER PERMALINK SCOPE_PID_PERMALINK(SCOPE_PID_PROVIDER, "permalink"), diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java index 1b5938999a0..1661dd57174 100644 --- a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java @@ -5,7 +5,7 @@ import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.UnmanagedDOIProvider; -import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIPidProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.crossref.CrossRefDOIProviderFactory; import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider; import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteProviderFactory; @@ -116,12 +116,12 @@ // CrossRef 1 @JvmSetting(key = JvmSettings.PID_PROVIDER_LABEL, value = "CrossRef 1", varArgs = "crossref1") -@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = CrossRefDOIPidProvider.TYPE, varArgs = "crossref1") -@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.5072", varArgs = "crossref1") -@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "FK2/", varArgs = "crossref1") -@JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "cr:20.20.20/FK2ABCDEF", varArgs ="crossref1") -@JvmSetting(key = JvmSettings.CROSSREF_URL, value = "http://localhost", varArgs ="crossref1") -@JvmSetting(key = JvmSettings.CROSSREF_REST_API_URL, value = "http://localhost", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_TYPE, value = CrossRefDOIProvider.TYPE, varArgs = "crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_AUTHORITY, value = "10.11111", varArgs = "crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_SHOULDER, value = "DVN/", varArgs = "crossref1") +@JvmSetting(key = JvmSettings.PID_PROVIDER_MANAGED_LIST, value = "", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_URL, value = "https://doi.crossref.org", varArgs ="crossref1") +@JvmSetting(key = JvmSettings.CROSSREF_REST_API_URL, value = "https://test.crossref.org", varArgs ="crossref1") @JvmSetting(key = JvmSettings.CROSSREF_USERNAME, value = "crusername", varArgs ="crossref1") @JvmSetting(key = JvmSettings.CROSSREF_PASSWORD, value = "secret", varArgs ="crossref1") @JvmSetting(key = JvmSettings.CROSSREF_DEPOSITOR, value = "xyz", varArgs ="crossref1") @@ -145,7 +145,7 @@ public static void setUpClass() throws Exception { pidProviderFactoryMap.put(HandlePidProvider.TYPE, new HandleProviderFactory()); pidProviderFactoryMap.put(FakeDOIProvider.TYPE, new FakeProviderFactory()); pidProviderFactoryMap.put(EZIdDOIProvider.TYPE, new EZIdProviderFactory()); - pidProviderFactoryMap.put(CrossRefDOIPidProvider.TYPE, new CrossRefDOIProviderFactory()); + pidProviderFactoryMap.put(CrossRefDOIProvider.TYPE, new CrossRefDOIProviderFactory()); PidUtil.clearPidProviders(); diff --git a/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java index f4494b7116e..e75954fa908 100644 --- a/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java @@ -21,11 +21,17 @@ void lookupSetting() { void lookupPidProviderSetting() { assertEquals("test", JvmSettings.DATACITE_USERNAME.lookup("datacite")); } - + + @Test + @SystemProperty(key = "dataverse.pid.crossref1.crossref.username", value = "test") + void lookupPidProviderSetting2() { + assertEquals("test", JvmSettings.CROSSREF_USERNAME.lookup("crossref1")); + } + @Test @SystemProperty(key = "dataverse.ingest.rserve.port", value = "1234") void lookupSettingViaAliasWithDefaultInMPCFile() { assertEquals("1234", JvmSettings.RSERVE_PORT.lookup()); } -} \ No newline at end of file +} From 7946c5a80c17680ee1aa60510f097b1eef83ea5c Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:58:43 -0400 Subject: [PATCH 207/366] fix doc error --- doc/sphinx-guides/source/installation/config.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 3410d2404e6..a96a867c216 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -507,7 +507,7 @@ CrossRef-specific Settings ^^^^^^^^^^^^^^^^^^^^^^^^^^ dataverse.pid.*.crossref.url -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dataverse.pid.*.crossref.rest-api-url ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dataverse.pid.*.crossref.username @@ -515,9 +515,9 @@ dataverse.pid.*.crossref.username dataverse.pid.*.crossref.password ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dataverse.pid.*.crossref.depositor -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dataverse.pid.*.crossref.depositor-email -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ PID Providers of type ``crossref`` require six additional parameters that define how the provider connects to CrossRef. CrossRef has two APIs that are used in Dataverse: From 136021316726bcfe2ff3c7ba48ad008f24973854 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 28 Aug 2024 18:03:25 +0200 Subject: [PATCH 208/366] ci(ct): split up push releases and maintenance workflows --- .github/workflows/container_base_push.yml | 107 +++----------- .github/workflows/container_maintenance.yml | 152 ++++++++++++++++++++ 2 files changed, 171 insertions(+), 88 deletions(-) create mode 100644 .github/workflows/container_maintenance.yml diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index ee7cb85a42e..f0e1b9d9f14 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -1,5 +1,5 @@ --- -name: Base Container Image +name: Container Images Releasing on: push: @@ -7,56 +7,23 @@ on: - 'v[6-9].**' branches: - 'develop' - - '10478-version-base-img' + # "Path filters are not evaluated for pushes of tags" https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore paths: - 'modules/container-base/**' - 'modules/dataverse-parent/pom.xml' - '.github/workflows/container_base_push.yml' - schedule: - - cron: '23 3 * * 0' # Run for 'develop' every Sunday at 03:23 UTC env: PLATFORMS: linux/amd64,linux/arm64 - NUM_PAST_RELEASES: 3 + DEVELOPMENT_BRANCH: develop jobs: - discover: - name: Discover Release Matrix - runs-on: ubuntu-latest - permissions: - contents: read - packages: read - # TODO: re-enable for final PR - # Only run in upstream repo - avoid unnecessary runs in forks and only for scheduled - #if: ${{ github.repository_owner == 'IQSS' }} - outputs: - branches: ${{ steps.matrix.outputs.branches }} - steps: - - name: Build branch matrix options - id: matrix - # TODO: remove the feature branch and re-enable the if/else! - run: | - # Get last three releases and include develop branch as matrix elements - #if [[ "${{ github.event_name }}" == "schedule" ]]; then - echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | \ - jq '[ .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, "develop", "10478-version-base-img" ]')" | tr -d "\n" | tr -s " " | \ - tee -a "$GITHUB_OUTPUT" - #else - # # Note: github.ref_name will be the name of the branch or the tag pushed - # echo "branches=['${{ github.ref_name }}']" | tee -a "$GITHUB_OUTPUT" - #fi - build: name: Build image runs-on: ubuntu-latest permissions: contents: read packages: read - needs: discover - strategy: - fail-fast: false - matrix: - branch: ${{ fromJson(needs.discover.outputs.branches) }} # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks #if: ${{ github.repository_owner == 'IQSS' }} @@ -64,8 +31,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - with: - ref: ${{ matrix.branch }} - name: Determine Java version from Parent POM run: | echo "JAVA_VERSION=$(grep '' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV} @@ -94,12 +59,6 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - # In case of scheduled maintenance, we don't care about buildtime: use QEMU for AMD64 + ARM64 - - name: Set up QEMU for multi-arch builds - if: ${{ github.event_name == 'schedule' }} - uses: docker/setup-qemu-action@v3 - with: - platforms: ${{ env.PLATFORMS }} # In case this is a push to develop, we care about buildtime. # Configure a remote ARM64 build host in addition to the local AMD64 in two steps. # TODO: re-enable for final PR @@ -131,52 +90,17 @@ jobs: # "Files": null}]} # EOF - - name: Add additional tags as options - # TODO: remove the feature branch - run: | - # For the development branch, update the latest tag in addition - if [[ "${{ matrix.branch }}" == "develop" || "${{ matrix.branch }}" == "10478-version-base-img" ]]; then - echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" - # In case of releases <=6.2, we still need to provide backward compatible names "alpha" and "unstable" - elif [[ "${{ matrix.branch }}" == "v6.3" ]]; then - echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.additional=alpha" | tee -a "${GITHUB_ENV}" - fi + # TODO: logic of retrieving the current reversion number, adding the property to the mvn call below - # Try to retrieve backport patches for this git ref (but don't fail if there aren't any) - # and try to apply them if present - - name: Get backport patches - continue-on-error: true - uses: actions/checkout@v4 - with: - path: backports - sparse-checkout: | - modules/container-base/src/backports/${{ matrix.branch }} - - name: Apply backport patches - id: patch + - name: Configure update of "latest" tag for development branch + if: ${{ github.ref_name == env.DEVELOPMENT_BRANCH }} run: | - find ${GITHUB_WORKSPACE}/backports/modules/container-base/src/backports/${{ matrix.branch }} -type f -name '*.patch' -print0 | \ - xargs -0 -n1 patch -p1 -s -i + echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" - name: Deploy multi-arch base container image to Docker Hub id: build run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} - - if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }} - name: Push description to DockerHub - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - repository: gdcc/base - short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" - readme-filepath: ./modules/container-base/README.md - - # - if: always() - # name: Save status (workaround for matrix outputs) - # run: | - # # steps.build.outcome is the status BEFORE continue-on-error - # echo "STATUS_$( echo "${{ matrix.branch }}" | tr ".:;,-/ " "_" )=${{ steps.build.outcome }}" | tee -a "${GITHUB_ENV}" - push-app-img: name: "Rebase & Publish App Image" permissions: @@ -187,11 +111,18 @@ jobs: needs: - discover - build - strategy: - fail-fast: false - matrix: - branch: ${{ fromJson(needs.discover.outputs.branches) }} uses: ./.github/workflows/container_app_push.yml with: - branch: ${{ matrix.branch }} + branch: ${{ github.ref_name }} + + # TODO: job to update the docker hub description with supported tags and all + #- if: ${{ github.event_name == 'push' && github.ref_name == env.DEVELOPMENT_BRANCH }} + # name: Push description to DockerHub + # uses: peter-evans/dockerhub-description@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + # repository: gdcc/base + # short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" + # readme-filepath: ./modules/container-base/README.md diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml new file mode 100644 index 00000000000..8f7efa4300d --- /dev/null +++ b/.github/workflows/container_maintenance.yml @@ -0,0 +1,152 @@ +--- +name: Container Images Scheduled Maintenance + +on: + # TODO: remove "push" in final PR + push: + branches: + - '10478-version-base-img' + paths: + - 'modules/container-base/**' + - 'modules/dataverse-parent/pom.xml' + - '.github/workflows/container_maintenance.yml' + # Allow manual workflow triggers in case we need to repair images on Docker Hub (build and replace) + workflow_dispatch: + schedule: + - cron: '23 3 * * 0' # Run for 'develop' every Sunday at 03:23 UTC + +env: + PLATFORMS: linux/amd64,linux/arm64 + NUM_PAST_RELEASES: 3 + # TODO: change to "develop" in final PR + DEVELOP_BRANCH: 10478-version-base-img + +jobs: + discover: + name: Discover Release Matrix + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + # TODO: re-enable for final PR + # Only run in upstream repo - avoid unnecessary runs in forks and only for scheduled + #if: ${{ github.repository_owner == 'IQSS' }} + outputs: + branches: ${{ steps.matrix.outputs.branches }} + current_release: ${{ steps.matrix.outputs.current_release }} + steps: + - name: Build branch matrix options + id: matrix + run: | + echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | \ + jq '[ .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, "${{ env.DEVELOP_BRANCH }}" ]')" | tr -d "\n" | tr -s " " | \ + tee -a "$GITHUB_OUTPUT" + echo "current_release=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq '.[0].tag_name' )" | tee -a "$GITHUB_OUTPUT" + + build: + name: Build image + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + needs: discover + strategy: + fail-fast: false + matrix: + branch: ${{ fromJson(needs.discover.outputs.branches) }} + # TODO: re-enable for final PR + # Only run in upstream repo - avoid unnecessary runs in forks + #if: ${{ github.repository_owner == 'IQSS' }} + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ matrix.branch }} + - name: Determine Java version from Parent POM + run: | + echo "JAVA_VERSION=$(grep '' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV} + + - name: Set up JDK ${{ env.JAVA_VERSION }} + id: setup-java + uses: actions/setup-java@v4 + with: + java-version: ${{ env.JAVA_VERSION }} + distribution: 'temurin' + cache: 'maven' + cache-dependency-path: | + modules/container-base/pom.xml + - name: Download common cache on branch cache miss + if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} + uses: actions/cache/restore@v4 + with: + key: dataverse-maven-cache + path: ~/.m2/repository + + # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and + # on events in context of upstream because secrets. PRs run in context of forks by default! + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Set up QEMU for multi-arch builds + uses: docker/setup-qemu-action@v3 + with: + platforms: ${{ env.PLATFORMS }} + + # Try to retrieve backport patches for this git ref (but don't fail if there aren't any) + # and try to apply them if present + - name: Get and apply backported patches + # There might be no patches - ignore errors + continue-on-error: true + run: | + mkdir -p "${GITHUB_WORKSPACE}/patches" + curl -sSL "https://github.com/${GITHUB_REPOSITORY}/archive/${DEVELOP_BRANCH}.tar.gz" | \ + tar -zxf - -C "${GITHUB_WORKSPACE}/patches" --wildcards "*/modules/container-base/src/backports/${{ matrix.branch }}" --strip-components=6 + find "${GITHUB_WORKSPACE}/patches" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -s -i + - name: Configure update of "latest" tag for development branch + if: ${{ matrix.branch == env.DEVELOP_BRANCH }} + run: | + echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" + + # TODO: figure out if rebuild is necessary + # TODO: logic of retrieving the current reversion number, adding the property to the mvn call below + + - name: Deploy multi-arch base container image to Docker Hub + id: build + run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + + # - if: always() + # name: Save status (workaround for matrix outputs) + # run: | + # # steps.build.outcome is the status BEFORE continue-on-error + # echo "STATUS_$( echo "${{ matrix.branch }}" | tr ".:;,-/ " "_" )=${{ steps.build.outcome }}" | tee -a "${GITHUB_ENV}" + + push-app-img: + name: "Rebase & Publish App Image" + permissions: + contents: read + packages: write + pull-requests: write + secrets: inherit + needs: + - discover + - build + strategy: + fail-fast: false + matrix: + branch: ${{ fromJson(needs.discover.outputs.branches) }} + uses: ./.github/workflows/container_app_push.yml + with: + branch: ${{ matrix.branch }} + + # TODO: job to update the docker hub description with supported tags and all + # - name: Push description to DockerHub + # uses: peter-evans/dockerhub-description@v3 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + # repository: gdcc/base + # short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" + # readme-filepath: ./modules/container-base/README.md From 716e2899656f03b64395057b8e193f40b8cc485b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 11:14:13 +0200 Subject: [PATCH 209/366] ci(ct): exclude app image rebuilds for easier testing --- .github/workflows/container_maintenance.yml | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 8f7efa4300d..4e329cb9fe7 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -123,23 +123,23 @@ jobs: # # steps.build.outcome is the status BEFORE continue-on-error # echo "STATUS_$( echo "${{ matrix.branch }}" | tr ".:;,-/ " "_" )=${{ steps.build.outcome }}" | tee -a "${GITHUB_ENV}" - push-app-img: - name: "Rebase & Publish App Image" - permissions: - contents: read - packages: write - pull-requests: write - secrets: inherit - needs: - - discover - - build - strategy: - fail-fast: false - matrix: - branch: ${{ fromJson(needs.discover.outputs.branches) }} - uses: ./.github/workflows/container_app_push.yml - with: - branch: ${{ matrix.branch }} + #push-app-img: + # name: "Rebase & Publish App Image" + # permissions: + # contents: read + # packages: write + # pull-requests: write + # secrets: inherit + # needs: + # - discover + # - build + # strategy: + # fail-fast: false + # matrix: + # branch: ${{ fromJson(needs.discover.outputs.branches) }} + # uses: ./.github/workflows/container_app_push.yml + # with: + # branch: ${{ matrix.branch }} # TODO: job to update the docker hub description with supported tags and all # - name: Push description to DockerHub From d6339a9ae26594b215aad1a6b6e236b354e71f34 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 11:08:03 +0200 Subject: [PATCH 210/366] ci(ct): detect necessary rebuilds and calculate revision number --- .github/workflows/container_maintenance.yml | 76 +++++++++++++++++++-- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 4e329cb9fe7..0323c1a7227 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -105,17 +105,83 @@ jobs: curl -sSL "https://github.com/${GITHUB_REPOSITORY}/archive/${DEVELOP_BRANCH}.tar.gz" | \ tar -zxf - -C "${GITHUB_WORKSPACE}/patches" --wildcards "*/modules/container-base/src/backports/${{ matrix.branch }}" --strip-components=6 find "${GITHUB_WORKSPACE}/patches" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -s -i + + # Figure out if a rebuild is necessary because either there is an updated Java image or our installed packages need updates + - name: Check for recent Temurin image updates + id: temurin-check + run: | + JAVA_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout )" + JAVA_IMAGE_NS="library" + JAVA_IMAGE_REPO="$( echo "$JAVA_IMAGE" | cut -f1 -d: )" + JAVA_IMAGE_TAG="$( echo "$JAVA_IMAGE" | cut -f2 -d: )" + JAVA_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${JAVA_IMAGE_NS}/repositories/${JAVA_IMAGE_REPO}/tags/${JAVA_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$JAVA_IMAGE_LAST_UPDATE" = "null" ]]; then + echo "::error title='Invalid Java Image'::Could not find ${JAVA_IMAGE} in the registry" + exit 1 + fi + + BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" + BASE_IMAGE_NS="$( echo "$BASE_IMAGE" | cut -f1 -d/ )" + BASE_IMAGE_REPO="$( echo "$BASE_IMAGE" | cut -f1 -d: | cut -f2 -d/ )" + BASE_IMAGE_TAG="$( echo "$BASE_IMAGE" | cut -f2 -d: )" + BASE_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${BASE_IMAGE_NS}/repositories/${BASE_IMAGE_REPO}/tags/${BASE_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$BASE_IMAGE_LAST_UPDATE" = "null" || "$BASE_IMAGE_LAST_UPDATE" < "$JAVA_IMAGE_LAST_UPDATE" ]]; then + echo "Java image $JAVA_IMAGE has a newer release ($JAVA_IMAGE_LAST_UPDATE), which is more recent than $BASE_IMAGE ($BASE_IMAGE_LAST_UPDATE)" + echo "newer_java_image=true" >> "${GITHUB_OUTPUT}" + else + echo "Java image $JAVA_IMAGE ($JAVA_IMAGE_LAST_UPDATE) is older than $BASE_IMAGE ($BASE_IMAGE_LAST_UPDATE)" + echo "newer_java_image=false" >> "${GITHUB_OUTPUT}" + fi + # TODO: if we introduce more flavors as a matrix, we need to adapt the install command to check for updates + - name: Check for package updates in base image + id: package-check + if: ${{ steps.temurin-check.outputs.newer_java_image == 'false' }} + run: | + BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" + PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" + if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update && apt install -s ${PKGS}" | grep "0 upgraded" ) ]]; then + echo "Base image $BASE_IMAGE needs package updates" + echo "newer_packages=true" >> "${GITHUB_OUTPUT}" + else + echo "Base image $BASE_IMAGE has no package updates" + echo "newer_packages=false" >> "${GITHUB_OUTPUT}" + fi + + - name: Calculate revision number for immutable tag + run: | + BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" + BASE_IMAGE_NS_REPO="$( echo "$BASE_IMAGE" | cut -d: -f1 )" + BASE_IMAGE_TAG=""$( echo "$BASE_IMAGE" | cut -d: -f2 )"" + + function get_all_tags() { + ref="$1" + case "$ref" in + */*) :;; # namespace/repository syntax, leave as is + *) ref="library/$ref";; # bare repository name (docker official image); must convert to namespace/repository syntax + esac + token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ref}:pull" ) + i=0 + while [ $? == 0 ]; do + i=$((i+1)) + curl -sS -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/${ref}/tags/?page=$i&page_size=100" | jq -r '."results"[]["name"]' 2>/dev/null + done + } + CURRENT=$( get_all_tags "${BASE_IMAGE_NS_REPO}" | grep "${BASE_IMAGE_TAG}-r" | sed -e "s#${BASE_IMAGE_TAG}-r##" | sort -h | tail -n1 ) + + # If there is a current number, increment it - otherwise this is the initial version, set to 0 + if [[ "$CURRENT" ]]; then + echo "REVISION_OPTION=-Dbase.image.revision=$((CURRENT+1))" | tee -a "${GITHUB_ENV}" + else + echo "REVISION_OPTION=-Dbase.image.revision=0" | tee -a "${GITHUB_ENV}" + fi - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" - - # TODO: figure out if rebuild is necessary - # TODO: logic of retrieving the current reversion number, adding the property to the mvn call below - - name: Deploy multi-arch base container image to Docker Hub + if: ${{ steps.temurin-check.outputs.newer_java_image == 'true' || steps.package-check.outputs.newer_packages == 'true' }} id: build - run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${REVISION_OPTION} -Ddocker.platforms=${{ env.PLATFORMS }} # - if: always() # name: Save status (workaround for matrix outputs) From 289f352ed11db894ecb52f5f3f34592e5a700177 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 12:36:25 +0200 Subject: [PATCH 211/366] build(ct): update base image with wait4x 2.14.1 Hopefully will clear lots of reported security vulnerabilities --- modules/container-base/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index 00deb085ec9..e3717928285 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -106,7 +106,7 @@ EOF ARG JATTACH_VERSION="v2.2" ARG JATTACH_TGZ_CHECKSUM_AMD64="acd9e17f15749306be843df392063893e97bfecc5260eef73ee98f06e5cfe02f" ARG JATTACH_TGZ_CHECKSUM_ARM64="288ae5ed87ee7fe0e608c06db5a23a096a6217c9878ede53c4e33710bdcaab51" -ARG WAIT4X_VERSION="v2.14.0" +ARG WAIT4X_VERSION="v2.14.1" ARG PKGS="jq imagemagick curl unzip wget acl lsof procps netcat-openbsd dumb-init" # Installing the packages in an extra container layer for better caching From 3a771f96726c98b66ada0c5eeb8020b56be36364 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 12:40:24 +0200 Subject: [PATCH 212/366] ci(ct): add option to manual trigger of maintenance workflow to force build --- .github/workflows/container_maintenance.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 0323c1a7227..f4a91aea562 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -12,6 +12,12 @@ on: - '.github/workflows/container_maintenance.yml' # Allow manual workflow triggers in case we need to repair images on Docker Hub (build and replace) workflow_dispatch: + inputs: + force_build: + type: boolean + required: false + default: false + description: "Build and deploy even if no newer Java images or package updates are found." schedule: - cron: '23 3 * * 0' # Run for 'develop' every Sunday at 03:23 UTC @@ -179,7 +185,7 @@ jobs: run: | echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" - name: Deploy multi-arch base container image to Docker Hub - if: ${{ steps.temurin-check.outputs.newer_java_image == 'true' || steps.package-check.outputs.newer_packages == 'true' }} + if: ${{ steps.temurin-check.outputs.newer_java_image == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} id: build run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${REVISION_OPTION} -Ddocker.platforms=${{ env.PLATFORMS }} From 899bba62bb5aa753e4be876079b69b7c03d64e7b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 12:43:51 +0200 Subject: [PATCH 213/366] ci(ct): no longer react to pushes in maintenance workflow Only use either scheduled or manual events to run the workflow. --- .github/workflows/container_maintenance.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index f4a91aea562..6c7b9d3e9ca 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -2,14 +2,6 @@ name: Container Images Scheduled Maintenance on: - # TODO: remove "push" in final PR - push: - branches: - - '10478-version-base-img' - paths: - - 'modules/container-base/**' - - 'modules/dataverse-parent/pom.xml' - - '.github/workflows/container_maintenance.yml' # Allow manual workflow triggers in case we need to repair images on Docker Hub (build and replace) workflow_dispatch: inputs: From ed17240da719d8a8862be57299ec60cb34a73d04 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 13:33:16 +0200 Subject: [PATCH 214/366] ci(ct): extract revision logic into separate script Easier to test and reuse for different workflows --- .../workflows/scripts/get_next_revision.sh | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 .github/workflows/scripts/get_next_revision.sh diff --git a/.github/workflows/scripts/get_next_revision.sh b/.github/workflows/scripts/get_next_revision.sh new file mode 100755 index 00000000000..5ec10ee2fb9 --- /dev/null +++ b/.github/workflows/scripts/get_next_revision.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# This script is used to retrieve the next revision number for a given image reference. +# The image reference must be of the form "[/]:", where the namespace will default to "library" if omitted. + +set -eu + +IMAGE=${1} +IMAGE_NS_REPO="$( echo "$IMAGE" | cut -d: -f1 )" +IMAGE_TAG="$( echo "$IMAGE" | cut -d: -f2 )" + +if [[ "$IMAGE_TAG" == "$IMAGE_NS_REPO" ]]; then + >&2 echo "You must provide an image reference in the format [/]:" + exit 1 +fi + +case "$IMAGE_NS_REPO" in + */*) :;; # namespace/repository syntax, leave as is + *) IMAGE_NS_REPO="library/$IMAGE_NS_REPO";; # bare repository name (docker official image); must convert to namespace/repository syntax +esac + +# Without such a token we run into rate limits +token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$IMAGE_NS_REPO:pull" ) + +ALL_TAGS="$( + i=0 + while [ $? == 0 ]; do + i=$((i+1)) + RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) + if [[ $( echo "$RESULT" | jq '.message' ) != "null" ]]; then + # If we run into an error on the first attempt, that means we have a problem. + if [[ "$i" == "1" ]]; then + >&2 echo "Error when retrieving tag data: $( echo "$RESULT" | jq '.message' )" + exit 2 + # Otherwise it will just mean we reached the last page already + else + break + fi + else + echo "$RESULT" | jq -r '."results"[]["name"]' + # DEBUG: + #echo "$RESULT" | >&2 jq -r '."results"[]["name"]' + fi + done +)" + +# If a former tag could not be found, it just might not exist already. Setting to -1, will be incremented to 0 to start a new series. +CURRENT=$( echo "$ALL_TAGS" | grep "${IMAGE_TAG}-r" | sed -e "s#${IMAGE_TAG}-r##" | sort -h | tail -n1 || echo "-1" ) +echo "$((CURRENT+1))" From 454fbe6c63cd9ea84c20970abcc2727c7fc401dc Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 13:34:09 +0200 Subject: [PATCH 215/366] ci(ct): add revision logic to base image release workflow on push --- .github/workflows/container_base_push.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index f0e1b9d9f14..fad436f0dda 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -90,8 +90,10 @@ jobs: # "Files": null}]} # EOF - # TODO: logic of retrieving the current reversion number, adding the property to the mvn call below - + - name: Calculate revision number for immutable tag + run: | + BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" + echo "REVISION_OPTION=-Dbase.image.revision=$( .github/workflows/scripts/get_next_revision.sh "${BASE_IMAGE}" )" | tee -a "${GITHUB_ENV}" - name: Configure update of "latest" tag for development branch if: ${{ github.ref_name == env.DEVELOPMENT_BRANCH }} run: | @@ -99,7 +101,7 @@ jobs: - name: Deploy multi-arch base container image to Docker Hub id: build - run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${REVISION_OPTION} -Ddocker.platforms=${{ env.PLATFORMS }} push-app-img: name: "Rebase & Publish App Image" From f1e3a3f0890a44e51f0417bd25433f8cbadbf7b1 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 13:34:32 +0200 Subject: [PATCH 216/366] ci(ct): temporarily disable release of app image when rebuilding base --- .github/workflows/container_base_push.yml | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index fad436f0dda..5ce05c6f8e6 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -103,19 +103,19 @@ jobs: id: build run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${REVISION_OPTION} -Ddocker.platforms=${{ env.PLATFORMS }} - push-app-img: - name: "Rebase & Publish App Image" - permissions: - contents: read - packages: write - pull-requests: write - secrets: inherit - needs: - - discover - - build - uses: ./.github/workflows/container_app_push.yml - with: - branch: ${{ github.ref_name }} + #push-app-img: + # name: "Rebase & Publish App Image" + # permissions: + # contents: read + # packages: write + # pull-requests: write + # secrets: inherit + # needs: + # - discover + # - build + # uses: ./.github/workflows/container_app_push.yml + # with: + # branch: ${{ github.ref_name }} # TODO: job to update the docker hub description with supported tags and all From 266c7bc29993086a6918be710baaa6f3975f7af2 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 13:34:48 +0200 Subject: [PATCH 217/366] ci(ct): temporarily enable triggering release workflow from feature branch --- .github/workflows/container_base_push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 5ce05c6f8e6..532c64bd781 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -7,6 +7,8 @@ on: - 'v[6-9].**' branches: - 'develop' + # TODO: delete for final PR + - '10478-version-base-img' # "Path filters are not evaluated for pushes of tags" https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore paths: - 'modules/container-base/**' From c04d9e406716b02265894f2b9b5b0f3f47242046 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 13:35:25 +0200 Subject: [PATCH 218/366] ci(ct): use script for revision logic in maintenance flow --- .github/workflows/container_maintenance.yml | 29 ++++----------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 6c7b9d3e9ca..2e668af5162 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -147,31 +147,12 @@ jobs: - name: Calculate revision number for immutable tag run: | + # Get the revision logic script (not present on older releases) + curl -sSL "https://github.com/${GITHUB_REPOSITORY}/archive/${DEVELOP_BRANCH}.tar.gz" | \ + tar -zxf - -C "." --wildcards "*/.github/workflows/scripts/get_next_revision.sh" --strip-components=1 + # Now get the new revision number BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" - BASE_IMAGE_NS_REPO="$( echo "$BASE_IMAGE" | cut -d: -f1 )" - BASE_IMAGE_TAG=""$( echo "$BASE_IMAGE" | cut -d: -f2 )"" - - function get_all_tags() { - ref="$1" - case "$ref" in - */*) :;; # namespace/repository syntax, leave as is - *) ref="library/$ref";; # bare repository name (docker official image); must convert to namespace/repository syntax - esac - token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:${ref}:pull" ) - i=0 - while [ $? == 0 ]; do - i=$((i+1)) - curl -sS -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/${ref}/tags/?page=$i&page_size=100" | jq -r '."results"[]["name"]' 2>/dev/null - done - } - CURRENT=$( get_all_tags "${BASE_IMAGE_NS_REPO}" | grep "${BASE_IMAGE_TAG}-r" | sed -e "s#${BASE_IMAGE_TAG}-r##" | sort -h | tail -n1 ) - - # If there is a current number, increment it - otherwise this is the initial version, set to 0 - if [[ "$CURRENT" ]]; then - echo "REVISION_OPTION=-Dbase.image.revision=$((CURRENT+1))" | tee -a "${GITHUB_ENV}" - else - echo "REVISION_OPTION=-Dbase.image.revision=0" | tee -a "${GITHUB_ENV}" - fi + echo "REVISION_OPTION=-Dbase.image.revision=$( .github/workflows/scripts/get_next_revision.sh "${BASE_IMAGE}" )" | tee -a "${GITHUB_ENV}" - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | From 2efd1b534803bb04f7e171548ba3f5561db0886d Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 29 Aug 2024 13:52:46 +0200 Subject: [PATCH 219/366] ci(ct): fix revision logic to return 0 when rolling tag not present before --- .github/workflows/scripts/get_next_revision.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/get_next_revision.sh b/.github/workflows/scripts/get_next_revision.sh index 5ec10ee2fb9..631f8b6f513 100755 --- a/.github/workflows/scripts/get_next_revision.sh +++ b/.github/workflows/scripts/get_next_revision.sh @@ -45,5 +45,9 @@ ALL_TAGS="$( )" # If a former tag could not be found, it just might not exist already. Setting to -1, will be incremented to 0 to start a new series. -CURRENT=$( echo "$ALL_TAGS" | grep "${IMAGE_TAG}-r" | sed -e "s#${IMAGE_TAG}-r##" | sort -h | tail -n1 || echo "-1" ) -echo "$((CURRENT+1))" +CURRENT=$( echo "$ALL_TAGS" | grep "${IMAGE_TAG}-r" | sed -e "s#${IMAGE_TAG}-r##" | sort -h | tail -n1 ) +if [[ "$CURRENT" ]]; then + echo "$((CURRENT+1))" +else + echo "0" +fi From 583147694652129e0b02d1fdd3e72bf5ccfa36c0 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 29 Aug 2024 15:36:59 +0100 Subject: [PATCH 220/366] Added: collection properties to solr search API results --- conf/solr/schema.xml | 1 + .../iq/dataverse/search/IndexServiceBean.java | 1 + .../harvard/iq/dataverse/search/SearchFields.java | 1 + .../iq/dataverse/search/SearchServiceBean.java | 9 ++++++++- .../iq/dataverse/search/SolrSearchResult.java | 14 ++++++++++++++ 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/conf/solr/schema.xml b/conf/solr/schema.xml index 5dde750573d..b7e894ed1df 100644 --- a/conf/solr/schema.xml +++ b/conf/solr/schema.xml @@ -142,6 +142,7 @@ + diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index c91eb0bfa7c..a65fdcc0880 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -277,6 +277,7 @@ public Future indexDataverse(Dataverse dataverse, boolean processPaths) if (dataverse.getOwner() != null) { solrInputDocument.addField(SearchFields.PARENT_ID, dataverse.getOwner().getId()); solrInputDocument.addField(SearchFields.PARENT_NAME, dataverse.getOwner().getName()); + solrInputDocument.addField(SearchFields.DATAVERSE_PARENT_ALIAS, dataverse.getOwner().getAlias()); } } List dataversePathSegmentsAccumulator = new ArrayList<>(); diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java index 02649cec68c..01535167881 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchFields.java @@ -94,6 +94,7 @@ public class SearchFields { public static final String UNF = "unf"; public static final String DATAVERSE_NAME = "dvName"; public static final String DATAVERSE_ALIAS = "dvAlias"; + public static final String DATAVERSE_PARENT_ALIAS = "dvParentAlias"; public static final String DATAVERSE_AFFILIATION = "dvAffiliation"; public static final String DATAVERSE_DESCRIPTION = "dvDescription"; public static final String DATAVERSE_CATEGORY = "dvCategory"; diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java index 1d25dbcdaba..52895bd553f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java @@ -499,11 +499,14 @@ public SolrQueryResponse search( String dvTree = (String) solrDocument.getFirstValue(SearchFields.SUBTREE); String identifierOfDataverse = (String) solrDocument.getFieldValue(SearchFields.IDENTIFIER_OF_DATAVERSE); String nameOfDataverse = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_NAME); + String dataverseAffiliation = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_AFFILIATION); + String dataverseParentAlias = (String) solrDocument.getFieldValue(SearchFields.DATAVERSE_PARENT_ALIAS); + String dataverseParentName = (String) solrDocument.getFieldValue(SearchFields.PARENT_NAME); Long embargoEndDate = (Long) solrDocument.getFieldValue(SearchFields.EMBARGO_END_DATE); Long retentionEndDate = (Long) solrDocument.getFieldValue(SearchFields.RETENTION_END_DATE); // Boolean datasetValid = (Boolean) solrDocument.getFieldValue(SearchFields.DATASET_VALID); - + List matchedFields = new ArrayList<>(); SolrSearchResult solrSearchResult = new SolrSearchResult(query, name); @@ -590,6 +593,10 @@ public SolrQueryResponse search( if (type.equals("dataverses")) { solrSearchResult.setName(name); solrSearchResult.setHtmlUrl(baseUrl + SystemConfig.DATAVERSE_PATH + identifier); + solrSearchResult.setDataverseAffiliation(dataverseAffiliation); + solrSearchResult.setDataverseParentAlias(dataverseParentAlias); + solrSearchResult.setDataverseParentName(dataverseParentName); + // Do not set the ImageUrl, let the search include fragment fill in // the thumbnail, similarly to how the dataset and datafile cards // are handled. diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index b40dcd69f3b..1e9919f35f4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -1,5 +1,6 @@ package edu.harvard.iq.dataverse.search; +import static edu.harvard.iq.dataverse.search.SearchFields.PARENT_NAME; import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder; import java.util.ArrayList; @@ -88,6 +89,7 @@ public class SolrSearchResult { private String fileChecksumValue; private String dataverseAlias; private String dataverseParentAlias; + private String dataverseParentName; // private boolean statePublished; /** * @todo Investigate/remove this "unpublishedState" variable. For files that have been published along with a dataset it says "true", which makes no @@ -641,6 +643,10 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool nullSafeJsonBuilder.add("metadataBlocks", metadataFieldBuilder); } + } else if (this.entity.isInstanceofDataverse()) { + nullSafeJsonBuilder.add("affiliation", dataverseAffiliation); + nullSafeJsonBuilder.add("parentDataverseName", dataverseParentName); + nullSafeJsonBuilder.add("parentDataverseIdentifier", dataverseParentAlias); } } @@ -1182,6 +1188,14 @@ public void setDataverseParentAlias(String dataverseParentAlias) { this.dataverseParentAlias = dataverseParentAlias; } + /** + * @param dataverseParentName the dataverseParentName to set + */ + public void setDataverseParentName(String dataverseParentName) { + this.dataverseParentName = dataverseParentName; + } + + public float getScore() { return score; } From 54d85ef49b8acf94823af5aba2f437a2a464dc19 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 29 Aug 2024 15:39:41 +0100 Subject: [PATCH 221/366] Removed: unused import --- .../java/edu/harvard/iq/dataverse/search/SolrSearchResult.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index 1e9919f35f4..d9f71e1f2d5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -1,6 +1,5 @@ package edu.harvard.iq.dataverse.search; -import static edu.harvard.iq.dataverse.search.SearchFields.PARENT_NAME; import static edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder.jsonObjectBuilder; import java.util.ArrayList; From bbf62936cb639dec375980f45a1abaf39080c785 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 29 Aug 2024 18:40:04 +0100 Subject: [PATCH 222/366] Added: releaseOrCreateDate field to Dataset and DataFile entities in Search API payload --- .../harvard/iq/dataverse/search/SolrSearchResult.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index d9f71e1f2d5..a9e2a9a062c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -542,6 +542,13 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool if (this.entity == null) { } else { + if (this.entity.isInstanceofDataset() || this.entity.isInstanceofDataFile()) { + // "published_at" field is only set when the version state is not draft. + // This field also takes into account entities in draft version (Datasets and/or DataFiles), + // returning the creation date if the entity is not published, or the publication date otherwise. + nullSafeJsonBuilder.add("releaseOrCreateDate", getFormattedReleaseOrCreateDate()); + } + if (this.entity.isInstanceofDataset()) { nullSafeJsonBuilder.add("storageIdentifier", this.entity.getStorageIdentifier()); Dataset ds = (Dataset) this.entity; @@ -727,6 +734,10 @@ private String getDateTimePublished() { return datePublished; } + private String getFormattedReleaseOrCreateDate() { + return releaseOrCreateDate == null ? null : Util.getDateTimeFormat().format(releaseOrCreateDate); + } + public String getId() { return id; } From 3a4bcf2c3885f888f9879ff49c077112896add5e Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 29 Aug 2024 18:41:13 +0100 Subject: [PATCH 223/366] Refactor: getDateTimePublished --- .../java/edu/harvard/iq/dataverse/search/SolrSearchResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index a9e2a9a062c..1206a1a22a0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -729,7 +729,7 @@ private Map> computeRequestedMetadataFieldMapNames(List Date: Thu, 29 Aug 2024 19:11:23 +0100 Subject: [PATCH 224/366] Changed: releaseOrCreateDate only used in DataFiles --- .../iq/dataverse/search/SolrSearchResult.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index 1206a1a22a0..e830456bcc1 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -542,13 +542,6 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool if (this.entity == null) { } else { - if (this.entity.isInstanceofDataset() || this.entity.isInstanceofDataFile()) { - // "published_at" field is only set when the version state is not draft. - // This field also takes into account entities in draft version (Datasets and/or DataFiles), - // returning the creation date if the entity is not published, or the publication date otherwise. - nullSafeJsonBuilder.add("releaseOrCreateDate", getFormattedReleaseOrCreateDate()); - } - if (this.entity.isInstanceofDataset()) { nullSafeJsonBuilder.add("storageIdentifier", this.entity.getStorageIdentifier()); Dataset ds = (Dataset) this.entity; @@ -653,6 +646,11 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool nullSafeJsonBuilder.add("affiliation", dataverseAffiliation); nullSafeJsonBuilder.add("parentDataverseName", dataverseParentName); nullSafeJsonBuilder.add("parentDataverseIdentifier", dataverseParentAlias); + } else if (this.entity.isInstanceofDataFile()) { + // "published_at" field is only set when the version state is not draft. + // This field also takes into account DataFiles in draft version, + // returning the creation date if the entity is not published, or the publication date otherwise. + nullSafeJsonBuilder.add("releaseOrCreateDate", getFormattedReleaseOrCreateDate()); } } @@ -1205,7 +1203,6 @@ public void setDataverseParentName(String dataverseParentName) { this.dataverseParentName = dataverseParentName; } - public float getScore() { return score; } From 30dd2608cf20a0959ee21d98039000f3488113d2 Mon Sep 17 00:00:00 2001 From: GPortas Date: Thu, 29 Aug 2024 19:11:57 +0100 Subject: [PATCH 225/366] Changed: minor comment tweak --- .../java/edu/harvard/iq/dataverse/search/SolrSearchResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index e830456bcc1..487422928fc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -649,7 +649,7 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool } else if (this.entity.isInstanceofDataFile()) { // "published_at" field is only set when the version state is not draft. // This field also takes into account DataFiles in draft version, - // returning the creation date if the entity is not published, or the publication date otherwise. + // returning the creation date if the DataFile is not published, or the publication date otherwise. nullSafeJsonBuilder.add("releaseOrCreateDate", getFormattedReleaseOrCreateDate()); } } From b61395ae57f02587ce6cc4de15ad46cf6ed72a42 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 30 Aug 2024 16:11:20 +0200 Subject: [PATCH 226/366] build,doc(parent): add special base image versioning As long as we are developing the next version of Dataverse, we don't want the develop branch to fight the container images updated by the maintenance workflow for the past releases. To avoid this, we simply use the next release version for the base image we use during development. It requires updating a property during the release process twice, as we need to set the version to the "main" version property ($revision) once we aim for creating the tag. This way, when using the release tag in forks or other ways as a foundation, people end up with the right base image. After the tag is done, we need to prepare using the virtual next version within the develop branch again. --- .../source/developers/making-releases.rst | 10 ++++++++ modules/dataverse-parent/pom.xml | 24 ++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/doc/sphinx-guides/source/developers/making-releases.rst b/doc/sphinx-guides/source/developers/making-releases.rst index e436ba9e9d2..a403f249beb 100755 --- a/doc/sphinx-guides/source/developers/making-releases.rst +++ b/doc/sphinx-guides/source/developers/making-releases.rst @@ -46,6 +46,7 @@ Bump Version Numbers Increment the version number to the milestone (e.g. 5.10.1) in the following two files: - modules/dataverse-parent/pom.xml -> ```` -> ```` (e.g. `pom.xml commit `_) +- modules/dataverse-parent/pom.xml -> ```` -> profile "ct" -> ```` -> Set ```` as ``${revision}`` - doc/sphinx-guides/source/conf.py (two places, e.g. `conf.py commit `_) Add the version being released to the lists in the following file: @@ -213,6 +214,15 @@ Now that we've published the release, close the milestone and create a new one. Note that for milestones we use just the number without the "v" (e.g. "5.10.1"). +Update the Container Base Image Version Property +------------------------------------------------ + +Create a new branch ``prepare-next-iteration`` and update the following files to prepare for the next development cycle: + +- modules/dataverse-parent/pom.xml -> ```` -> profile "ct" -> ```` -> Set ```` as ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}`` + +Now create a pull request and merge it - there is no review or QA necessary, as it is a predefined necessity. + Add the Release to the Dataverse Roadmap ---------------------------------------- diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index 281aa274132..3df06281547 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -449,10 +449,13 @@ ct - - + ${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion} + @@ -478,6 +481,21 @@ false + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + + + parse-version + + parse-version + + initialize + + + From f95476a4d9baa1c3386ac068583732a037c4fd58 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 30 Aug 2024 16:17:48 +0200 Subject: [PATCH 227/366] build(ct,parent): adapt base image POM to new tagging policy We will use a long tag with Payara and Java version in it during development. This way we auto-update images on dev's PCs on these breaking changes. For any releases, we will use short tags using only the version and the OS flavor. These rolling tags will be accompanied by the revisioned tags. These extend the base name with the suffix as before, but only for releases, not the development branch. As the development branch is a rolling target, immutable tags make little sense. This commit also adds the necessary backporting patches to older releases for the parent module to define the base.image.version as $revision, as described in the extended release process. --- modules/container-base/pom.xml | 12 ++++-------- .../src/backports/v6.1/001-pom.xml.patch | 17 ++++------------- .../src/backports/v6.1/003-parent-pom.xml.patch | 11 +++++++++++ .../src/backports/v6.2/001-pom.xml.patch | 17 ++++------------- .../src/backports/v6.2/004-parent-pom.xml.patch | 11 +++++++++++ .../src/backports/v6.3/001-pom.xml.patch | 17 ++++------------- .../src/backports/v6.3/004-parent-pom.xml.patch | 11 +++++++++++ 7 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 modules/container-base/src/backports/v6.1/003-parent-pom.xml.patch create mode 100644 modules/container-base/src/backports/v6.2/004-parent-pom.xml.patch create mode 100644 modules/container-base/src/backports/v6.3/004-parent-pom.xml.patch diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index 8e5c476c64a..e707c6a69c8 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -13,7 +13,6 @@ io.gdcc container-base - 1.0.0 ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. @@ -41,11 +40,11 @@ ct docker-build + gdcc/base:${base.image.tag} - ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} - - SNAPSHOT - ${base.image.tag}-r${base.image.revision} + + ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} + ${base.image.version}-${java.image.flavor} eclipse-temurin:${target.java.version}-jre-${java.image.flavor} noble 1000 @@ -115,9 +114,6 @@ assembly.xml - - ${base.image.tag.revision} - diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch index a61f6b6fb14..ef0fbdda9fc 100644 --- a/modules/container-base/src/backports/v6.1/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.1/001-pom.xml.patch @@ -1,23 +1,14 @@ --- a/modules/container-base/pom.xml 2024-08-26 21:53:55.985584815 +0200 +++ b/modules/container-base/pom.xml 2024-08-26 21:38:09.925910314 +0200 -@@ -12,6 +12,7 @@ - - io.gdcc - container-base -+ 0.8.0 - ${packaging.type} - Container Base Image - This module provides an application server base image to be decorated with the Dataverse app. -@@ -40,8 +42,12 @@ +@@ -40,8 +42,11 @@ docker-build gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} -+ -+ SNAPSHOT -+ ${base.image.tag}-r${base.image.revision} ++ gdcc/base:${base.image.tag} ++ ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} ++ ${base.image.version}-${java.image.flavor} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 diff --git a/modules/container-base/src/backports/v6.1/003-parent-pom.xml.patch b/modules/container-base/src/backports/v6.1/003-parent-pom.xml.patch new file mode 100644 index 00000000000..a69cfd43ea7 --- /dev/null +++ b/modules/container-base/src/backports/v6.1/003-parent-pom.xml.patch @@ -0,0 +1,11 @@ +--- a/modules/dataverse-parent/pom.xml ++++ b/modules/dataverse-parent/pom.xml +@@ -457,7 +457,8 @@ + + ++ ${revision} + + + diff --git a/modules/container-base/src/backports/v6.2/001-pom.xml.patch b/modules/container-base/src/backports/v6.2/001-pom.xml.patch index 90fccffe53d..ef0fbdda9fc 100644 --- a/modules/container-base/src/backports/v6.2/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.2/001-pom.xml.patch @@ -1,23 +1,14 @@ --- a/modules/container-base/pom.xml 2024-08-26 21:53:55.985584815 +0200 +++ b/modules/container-base/pom.xml 2024-08-26 21:38:09.925910314 +0200 -@@ -12,6 +12,7 @@ - - io.gdcc - container-base -+ 0.9.0 - ${packaging.type} - Container Base Image - This module provides an application server base image to be decorated with the Dataverse app. -@@ -40,8 +42,12 @@ +@@ -40,8 +42,11 @@ docker-build gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} -+ -+ SNAPSHOT -+ ${base.image.tag}-r${base.image.revision} ++ gdcc/base:${base.image.tag} ++ ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} ++ ${base.image.version}-${java.image.flavor} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 diff --git a/modules/container-base/src/backports/v6.2/004-parent-pom.xml.patch b/modules/container-base/src/backports/v6.2/004-parent-pom.xml.patch new file mode 100644 index 00000000000..a69cfd43ea7 --- /dev/null +++ b/modules/container-base/src/backports/v6.2/004-parent-pom.xml.patch @@ -0,0 +1,11 @@ +--- a/modules/dataverse-parent/pom.xml ++++ b/modules/dataverse-parent/pom.xml +@@ -457,7 +457,8 @@ + + ++ ${revision} + + + diff --git a/modules/container-base/src/backports/v6.3/001-pom.xml.patch b/modules/container-base/src/backports/v6.3/001-pom.xml.patch index 83e151b6656..ef0fbdda9fc 100644 --- a/modules/container-base/src/backports/v6.3/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.3/001-pom.xml.patch @@ -1,23 +1,14 @@ --- a/modules/container-base/pom.xml 2024-08-26 21:53:55.985584815 +0200 +++ b/modules/container-base/pom.xml 2024-08-26 21:38:09.925910314 +0200 -@@ -12,6 +12,7 @@ - - io.gdcc - container-base -+ 0.9.1 - ${packaging.type} - Container Base Image - This module provides an application server base image to be decorated with the Dataverse app. -@@ -40,8 +42,12 @@ +@@ -40,8 +42,11 @@ docker-build gdcc/base:${base.image.tag} - unstable - eclipse-temurin:${target.java.version}-jre -+ ${project.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} -+ -+ SNAPSHOT -+ ${base.image.tag}-r${base.image.revision} ++ gdcc/base:${base.image.tag} ++ ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} ++ ${base.image.version}-${java.image.flavor} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 diff --git a/modules/container-base/src/backports/v6.3/004-parent-pom.xml.patch b/modules/container-base/src/backports/v6.3/004-parent-pom.xml.patch new file mode 100644 index 00000000000..a69cfd43ea7 --- /dev/null +++ b/modules/container-base/src/backports/v6.3/004-parent-pom.xml.patch @@ -0,0 +1,11 @@ +--- a/modules/dataverse-parent/pom.xml ++++ b/modules/dataverse-parent/pom.xml +@@ -457,7 +457,8 @@ + + ++ ${revision} + + + From a4354c0e05c4cc09057e924519fb70f313b65cee Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 30 Aug 2024 16:20:24 +0200 Subject: [PATCH 228/366] ci(ct): determine base image name once in maintenance workflow Instead of retrieving the base image name again in every step, add it to the environment as variable. In the same go, enforce the shorter tags for release branches and the full length ones for the development branch. --- .github/workflows/container_maintenance.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 2e668af5162..976f01f920f 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -104,6 +104,16 @@ jobs: tar -zxf - -C "${GITHUB_WORKSPACE}/patches" --wildcards "*/modules/container-base/src/backports/${{ matrix.branch }}" --strip-components=6 find "${GITHUB_WORKSPACE}/patches" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -s -i + # Determine the base image name we are going to use from here on + - name: Determine base image name + run: | + if [[ "${{ matrix.branch }}" = "${{ env.DEVELOP_BRANCH }}" ]]; then + NAME=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout ) + else + NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag='${base.image.tag.release}' -q -DforceStdout ) + fi + echo "BASE_IMAGE=${NAME}" | tee -a "${GITHUB_ENV}" + # Figure out if a rebuild is necessary because either there is an updated Java image or our installed packages need updates - name: Check for recent Temurin image updates id: temurin-check @@ -118,7 +128,6 @@ jobs: exit 1 fi - BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" BASE_IMAGE_NS="$( echo "$BASE_IMAGE" | cut -f1 -d/ )" BASE_IMAGE_REPO="$( echo "$BASE_IMAGE" | cut -f1 -d: | cut -f2 -d/ )" BASE_IMAGE_TAG="$( echo "$BASE_IMAGE" | cut -f2 -d: )" @@ -135,7 +144,6 @@ jobs: id: package-check if: ${{ steps.temurin-check.outputs.newer_java_image == 'false' }} run: | - BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update && apt install -s ${PKGS}" | grep "0 upgraded" ) ]]; then echo "Base image $BASE_IMAGE needs package updates" @@ -151,7 +159,6 @@ jobs: curl -sSL "https://github.com/${GITHUB_REPOSITORY}/archive/${DEVELOP_BRANCH}.tar.gz" | \ tar -zxf - -C "." --wildcards "*/.github/workflows/scripts/get_next_revision.sh" --strip-components=1 # Now get the new revision number - BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" echo "REVISION_OPTION=-Dbase.image.revision=$( .github/workflows/scripts/get_next_revision.sh "${BASE_IMAGE}" )" | tee -a "${GITHUB_ENV}" - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} From f15c9d60bcaed58fbe667595beafe099cf1e910f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 30 Aug 2024 16:21:06 +0200 Subject: [PATCH 229/366] style,ci(ct): use shell parameter extension and less cut Little faster, little more portable. --- .github/workflows/container_maintenance.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 976f01f920f..fdf40f81750 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -120,17 +120,17 @@ jobs: run: | JAVA_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout )" JAVA_IMAGE_NS="library" - JAVA_IMAGE_REPO="$( echo "$JAVA_IMAGE" | cut -f1 -d: )" - JAVA_IMAGE_TAG="$( echo "$JAVA_IMAGE" | cut -f2 -d: )" + JAVA_IMAGE_REPO="${JAVA_IMAGE%:*}" + JAVA_IMAGE_TAG="${JAVA_IMAGE#*:}" JAVA_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${JAVA_IMAGE_NS}/repositories/${JAVA_IMAGE_REPO}/tags/${JAVA_IMAGE_TAG}" | jq -r .last_updated )" if [[ "$JAVA_IMAGE_LAST_UPDATE" = "null" ]]; then echo "::error title='Invalid Java Image'::Could not find ${JAVA_IMAGE} in the registry" exit 1 fi - BASE_IMAGE_NS="$( echo "$BASE_IMAGE" | cut -f1 -d/ )" - BASE_IMAGE_REPO="$( echo "$BASE_IMAGE" | cut -f1 -d: | cut -f2 -d/ )" - BASE_IMAGE_TAG="$( echo "$BASE_IMAGE" | cut -f2 -d: )" + BASE_IMAGE_NS="${BASE_IMAGE%/*}" + BASE_IMAGE_REPO="$( echo "${BASE_IMAGE%:*}" | cut -f2 -d/ )" + BASE_IMAGE_TAG="${BASE_IMAGE#*:}" BASE_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${BASE_IMAGE_NS}/repositories/${BASE_IMAGE_REPO}/tags/${BASE_IMAGE_TAG}" | jq -r .last_updated )" if [[ "$BASE_IMAGE_LAST_UPDATE" = "null" || "$BASE_IMAGE_LAST_UPDATE" < "$JAVA_IMAGE_LAST_UPDATE" ]]; then echo "Java image $JAVA_IMAGE has a newer release ($JAVA_IMAGE_LAST_UPDATE), which is more recent than $BASE_IMAGE ($BASE_IMAGE_LAST_UPDATE)" From e3de4a178de418934d8036ac7a720523920959bf Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 30 Aug 2024 16:28:12 +0200 Subject: [PATCH 230/366] ci(ct): on release branches make the base image tags short and add additional revision tag --- .github/workflows/container_maintenance.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index fdf40f81750..da7d3028c3f 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -153,13 +153,15 @@ jobs: echo "newer_packages=false" >> "${GITHUB_OUTPUT}" fi - - name: Calculate revision number for immutable tag + - name: Calculate revision number for immutable tag (on release branches only) + if: ${{ matrix.branch != env.DEVELOP_BRANCH }} run: | # Get the revision logic script (not present on older releases) curl -sSL "https://github.com/${GITHUB_REPOSITORY}/archive/${DEVELOP_BRANCH}.tar.gz" | \ tar -zxf - -C "." --wildcards "*/.github/workflows/scripts/get_next_revision.sh" --strip-components=1 # Now get the new revision number - echo "REVISION_OPTION=-Dbase.image.revision=$( .github/workflows/scripts/get_next_revision.sh "${BASE_IMAGE}" )" | tee -a "${GITHUB_ENV}" + REVISION_TAG="${BASE_IMAGE#*:}-r$( .github/workflows/scripts/get_next_revision.sh "${BASE_IMAGE}" )" + echo "DOCKER_TAGS=-Dbase.image.tag=\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=${REVISION_TAG}" | tee -a "${GITHUB_ENV}" - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | @@ -167,7 +169,7 @@ jobs: - name: Deploy multi-arch base container image to Docker Hub if: ${{ steps.temurin-check.outputs.newer_java_image == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} id: build - run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${REVISION_OPTION} -Ddocker.platforms=${{ env.PLATFORMS }} + run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} # - if: always() # name: Save status (workaround for matrix outputs) From 56cbdad0bc6d25c820285398998764bb8d6bda8b Mon Sep 17 00:00:00 2001 From: GPortas Date: Fri, 30 Aug 2024 17:15:43 +0100 Subject: [PATCH 231/366] Changed: updated search.rst guides --- doc/sphinx-guides/source/api/search.rst | 30 ++++++++++++++++--- .../iq/dataverse/search/SolrSearchResult.java | 2 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/doc/sphinx-guides/source/api/search.rst b/doc/sphinx-guides/source/api/search.rst index 297f1283ef7..1862fbdf68f 100755 --- a/doc/sphinx-guides/source/api/search.rst +++ b/doc/sphinx-guides/source/api/search.rst @@ -64,7 +64,13 @@ https://demo.dataverse.org/api/search?q=trees "image_url":"https://demo.dataverse.org/api/access/dvCardImage/7", "identifier":"trees", "description":"A tree dataverse with some birds", - "published_at":"2016-05-10T12:53:38Z" + "published_at":"2016-05-10T12:53:38Z", + "publicationStatuses": [ + "Published" + ], + "affiliation": "Dataverse.org", + "parentDataverseName": "Root", + "parentDataverseIdentifier": "root" }, { "name":"Chestnut Trees", @@ -73,7 +79,13 @@ https://demo.dataverse.org/api/search?q=trees "image_url":"https://demo.dataverse.org/api/access/dvCardImage/9", "identifier":"chestnuttrees", "description":"A dataverse with chestnut trees and an oriole", - "published_at":"2016-05-10T12:52:38Z" + "published_at":"2016-05-10T12:52:38Z", + "publicationStatuses": [ + "Published" + ], + "affiliation": "Dataverse.org", + "parentDataverseName": "Root", + "parentDataverseIdentifier": "root" }, { "name":"trees.png", @@ -91,7 +103,11 @@ https://demo.dataverse.org/api/search?q=trees "dataset_name": "Dataset One", "dataset_id": "32", "dataset_persistent_id": "doi:10.5072/FK2/XTT5BV", - "dataset_citation":"Spruce, Sabrina, 2016, \"Spruce Goose\", http://dx.doi.org/10.5072/FK2/XTT5BV, Root Dataverse, V1" + "dataset_citation":"Spruce, Sabrina, 2016, \"Spruce Goose\", http://dx.doi.org/10.5072/FK2/XTT5BV, Root Dataverse, V1", + "publicationStatuses": [ + "Published" + ], + releaseOrCreateDate: "2016-05-10T12:53:39Z" }, { "name":"Birds", @@ -100,7 +116,13 @@ https://demo.dataverse.org/api/search?q=trees "image_url":"https://demo.dataverse.org/api/access/dvCardImage/2", "identifier":"birds", "description":"A bird Dataverse collection with some trees", - "published_at":"2016-05-10T12:57:27Z" + "published_at":"2016-05-10T12:57:27Z", + "publicationStatuses": [ + "Published" + ], + "affiliation": "Dataverse.org", + "parentDataverseName": "Root", + "parentDataverseIdentifier": "root" }, { "name":"Darwin's Finches", diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index 487422928fc..3045f141454 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -648,7 +648,7 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool nullSafeJsonBuilder.add("parentDataverseIdentifier", dataverseParentAlias); } else if (this.entity.isInstanceofDataFile()) { // "published_at" field is only set when the version state is not draft. - // This field also takes into account DataFiles in draft version, + // On the contrary, this field also takes into account DataFiles in draft version, // returning the creation date if the DataFile is not published, or the publication date otherwise. nullSafeJsonBuilder.add("releaseOrCreateDate", getFormattedReleaseOrCreateDate()); } From 7832088986f79c99d78cea2ac881e369988aeeff Mon Sep 17 00:00:00 2001 From: GPortas Date: Fri, 30 Aug 2024 17:16:55 +0100 Subject: [PATCH 232/366] Fixed: search.rst json structure --- doc/sphinx-guides/source/api/search.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/api/search.rst b/doc/sphinx-guides/source/api/search.rst index 1862fbdf68f..6439656ed48 100755 --- a/doc/sphinx-guides/source/api/search.rst +++ b/doc/sphinx-guides/source/api/search.rst @@ -107,7 +107,7 @@ https://demo.dataverse.org/api/search?q=trees "publicationStatuses": [ "Published" ], - releaseOrCreateDate: "2016-05-10T12:53:39Z" + "releaseOrCreateDate": "2016-05-10T12:53:39Z" }, { "name":"Birds", From bc673f0ad69b18b8e24b467378e2b9934e4189c6 Mon Sep 17 00:00:00 2001 From: GPortas Date: Fri, 30 Aug 2024 17:28:40 +0100 Subject: [PATCH 233/366] Added: release notes for #10810 --- .../10810-search-api-payload-extensions.md | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/release-notes/10810-search-api-payload-extensions.md diff --git a/doc/release-notes/10810-search-api-payload-extensions.md b/doc/release-notes/10810-search-api-payload-extensions.md new file mode 100644 index 00000000000..870091641ce --- /dev/null +++ b/doc/release-notes/10810-search-api-payload-extensions.md @@ -0,0 +1,33 @@ +Search API (/api/search) response will now include new fields for Dataverse and DataFile entities. + +For Dataverse: + +- "affiliation" +- "parentDataverseName" +- "parentDataverseIdentifier" + +```javascript +"items": [ + { + "name": "Darwin's Finches", + ... + "affiliation": "Dataverse.org", + "parentDataverseName": "Root", + "parentDataverseIdentifier": "root" +(etc, etc) +``` + +For DataFile: + +- "releaseOrCreateDate" + +```javascript +"items": [ + { + "name": "test.txt", + ... + "releaseOrCreateDate": "2016-05-10T12:53:39Z" +(etc, etc) +``` + +The schema.xml file for Solr has been updated to include a new field called dvParentAlias for supporting the new response field "parentDataverseIdentifier". So for the next Dataverse released version, a Solr reindex will be necessary to apply the new schema.xml version. From 8e384f0ab61cdd9184b9d8c39e4965ae6906b8f9 Mon Sep 17 00:00:00 2001 From: GPortas Date: Fri, 30 Aug 2024 18:28:17 +0100 Subject: [PATCH 234/366] Added: IT test cases --- .../harvard/iq/dataverse/api/SearchIT.java | 37 +++++++++---------- .../edu/harvard/iq/dataverse/api/UtilIT.java | 20 +++++++++- 2 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java index 9fa13bb2939..c743c12c7de 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java @@ -18,21 +18,17 @@ import java.io.UnsupportedEncodingException; import java.util.Base64; import jakarta.json.JsonArray; -import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; -import static jakarta.ws.rs.core.Response.Status.OK; -import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import org.hamcrest.CoreMatchers; import edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter; import java.awt.image.BufferedImage; import java.io.IOException; import javax.imageio.ImageIO; -import static jakarta.ws.rs.core.Response.Status.CREATED; -import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; -import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; + import org.hamcrest.Matchers; import jakarta.json.JsonObjectBuilder; +import static jakarta.ws.rs.core.Response.Status.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -54,12 +50,12 @@ public static void setUpClass() { } @Test - public void testSearchPermisions() throws InterruptedException { + public void testSearchPermisions() { Response createUser1 = UtilIT.createRandomUser(); - String username1 = UtilIT.getUsernameFromResponse(createUser1); String apiToken1 = UtilIT.getApiTokenFromResponse(createUser1); + String affiliation = "testAffiliation"; - Response createDataverse1Response = UtilIT.createRandomDataverse(apiToken1); + Response createDataverse1Response = UtilIT.createRandomDataverse(apiToken1, affiliation); createDataverse1Response.prettyPrint(); assertEquals(201, createDataverse1Response.getStatusCode()); String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse1Response); @@ -69,9 +65,9 @@ public void testSearchPermisions() throws InterruptedException { createDataset1Response.then().assertThat() .statusCode(CREATED.getStatusCode()); - Integer datasetId1 = UtilIT.getDatasetIdFromResponse(createDataset1Response); + Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset1Response); - Response shouldBeVisibleToUser1 = UtilIT.search("id:dataset_" + datasetId1 + "_draft", apiToken1); + Response shouldBeVisibleToUser1 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken1); shouldBeVisibleToUser1.prettyPrint(); shouldBeVisibleToUser1.then().assertThat() .body("data.total_count", CoreMatchers.is(1)) @@ -83,7 +79,7 @@ public void testSearchPermisions() throws InterruptedException { String username2 = UtilIT.getUsernameFromResponse(createUser2); String apiToken2 = UtilIT.getApiTokenFromResponse(createUser2); - Response shouldNotBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId1 + "_draft", apiToken2); + Response shouldNotBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken2); shouldNotBeVisibleToUser2.prettyPrint(); shouldNotBeVisibleToUser2.then().assertThat() .body("data.total_count", CoreMatchers.is(0)) @@ -91,7 +87,7 @@ public void testSearchPermisions() throws InterruptedException { String nullToken = null; - Response shouldNotBeVisibleToTokenLess = UtilIT.search("id:dataset_" + datasetId1 + "_draft", nullToken); + Response shouldNotBeVisibleToTokenLess = UtilIT.search("id:dataset_" + datasetId + "_draft", nullToken); shouldNotBeVisibleToTokenLess.prettyPrint(); shouldNotBeVisibleToTokenLess.then().assertThat() .body("data.total_count", CoreMatchers.is(0)) @@ -103,10 +99,10 @@ public void testSearchPermisions() throws InterruptedException { grantUser2AccessOnDataset.prettyPrint(); assertEquals(200, grantUser2AccessOnDataset.getStatusCode()); - String searchPart = "id:dataset_" + datasetId1 + "_draft"; + String searchPart = "id:dataset_" + datasetId + "_draft"; assertTrue(UtilIT.sleepForSearch(searchPart, apiToken2, "", 1, UtilIT.MAXIMUM_INGEST_LOCK_DURATION), "Failed test if search exceeds max duration " + searchPart); - Response shouldBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId1 + "_draft", apiToken2); + Response shouldBeVisibleToUser2 = UtilIT.search("id:dataset_" + datasetId + "_draft", apiToken2); shouldBeVisibleToUser2.prettyPrint(); shouldBeVisibleToUser2.then().assertThat() .body("data.total_count", CoreMatchers.is(1)) @@ -120,17 +116,16 @@ public void testSearchPermisions() throws InterruptedException { publishDataverse.then().assertThat() .statusCode(OK.getStatusCode()); - Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId1, "major", apiToken1); + Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken1); publishDataset.prettyPrint(); publishDataset.then().assertThat() .statusCode(OK.getStatusCode()); - Response makeSureTokenlessSearchIsEnabled = UtilIT.deleteSetting(SettingsServiceBean.Key.SearchApiRequiresToken); makeSureTokenlessSearchIsEnabled.then().assertThat() .statusCode(OK.getStatusCode()); - Response publishedPublicDataShouldBeVisibleToTokenless = UtilIT.search("id:dataset_" + datasetId1, nullToken); + Response publishedPublicDataShouldBeVisibleToTokenless = UtilIT.search("id:dataset_" + datasetId, nullToken); publishedPublicDataShouldBeVisibleToTokenless.prettyPrint(); publishedPublicDataShouldBeVisibleToTokenless.then().assertThat() .body("data.total_count", CoreMatchers.is(1)) @@ -146,13 +141,15 @@ public void testSearchPermisions() throws InterruptedException { .body("data.count_in_response", CoreMatchers.is(1)) .body("data.items[0].name", CoreMatchers.is(dataverseAlias)) .body("data.items[0].type", CoreMatchers.is("dataverse")) - .body("data.items[0].identifier", CoreMatchers.is(dataverseAlias)); + .body("data.items[0].affiliation", CoreMatchers.is(affiliation)) + .body("data.items[0].parentDataverseName", CoreMatchers.is("Root")) + .body("data.items[0].parentDataverseIdentifier", CoreMatchers.is("root")); Response disableTokenlessSearch = UtilIT.setSetting(SettingsServiceBean.Key.SearchApiRequiresToken, "true"); disableTokenlessSearch.then().assertThat() .statusCode(OK.getStatusCode()); - Response dataverse47behaviorOfTokensBeingRequired = UtilIT.search("id:dataset_" + datasetId1, nullToken); + Response dataverse47behaviorOfTokensBeingRequired = UtilIT.search("id:dataset_" + datasetId, nullToken); dataverse47behaviorOfTokensBeingRequired.prettyPrint(); dataverse47behaviorOfTokensBeingRequired.then().assertThat() .body("message", CoreMatchers.equalTo(AbstractApiBean.RESPONSE_MESSAGE_AUTHENTICATED_USER_REQUIRED)) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java index 8f1fcdf57eb..84832cd579f 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java @@ -359,11 +359,19 @@ static Response createDataverse(String alias, String category, String apiToken) return createSubDataverse(alias, category, apiToken, ":root"); } + static Response createDataverse(String alias, String category, String affiliation, String apiToken) { + return createSubDataverse(alias, category, apiToken, ":root", null, null, null, affiliation); + } + static Response createSubDataverse(String alias, String category, String apiToken, String parentDV) { - return createSubDataverse(alias, category, apiToken, parentDV, null, null, null); + return createSubDataverse(alias, category, apiToken, parentDV, null, null, null, null); } static Response createSubDataverse(String alias, String category, String apiToken, String parentDV, String[] inputLevelNames, String[] facetIds, String[] metadataBlockNames) { + return createSubDataverse(alias, category, apiToken, parentDV, inputLevelNames, facetIds, metadataBlockNames, null); + } + + static Response createSubDataverse(String alias, String category, String apiToken, String parentDV, String[] inputLevelNames, String[] facetIds, String[] metadataBlockNames, String affiliation) { JsonArrayBuilder contactArrayBuilder = Json.createArrayBuilder(); contactArrayBuilder.add(Json.createObjectBuilder().add("contactEmail", getEmailFromUserName(getRandomIdentifier()))); JsonArrayBuilder subjectArrayBuilder = Json.createArrayBuilder(); @@ -376,6 +384,10 @@ static Response createSubDataverse(String alias, String category, String apiToke // don't send "dataverseType" if category is null, must be a better way .add(category != null ? "dataverseType" : "notTheKeyDataverseType", category != null ? category : "whatever"); + if (affiliation != null) { + objectBuilder.add("affiliation", affiliation); + } + JsonObjectBuilder metadataBlocksObjectBuilder = Json.createObjectBuilder(); if (inputLevelNames != null) { @@ -429,6 +441,12 @@ static Response createRandomDataverse(String apiToken) { return createDataverse(alias, category, apiToken); } + static Response createRandomDataverse(String apiToken, String affiliation) { + String alias = "dv" + getRandomIdentifier(); + String category = null; + return createDataverse(alias, category, affiliation, apiToken); + } + /** * A convenience method for creating a random collection and getting its * alias in one step. From 59b676be7567aa68b1351df2b7b0bf5f16823512 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 2 Sep 2024 14:52:42 +0200 Subject: [PATCH 235/366] docs(ct): update tagging policy for base image --- .../source/container/base-image.rst | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index e364579b568..13cd393a7e2 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -28,24 +28,29 @@ This image is sourced from the main upstream code `repository of the Dataverse s Development and maintenance of the `image's code `_ happens there (again, by the community). -In our tagging, we `follow the Bitname example `_: - -- ``latest``: Rolling tag on par with whatever happens on the ``develop`` branch. (`Dockerfile `__) - Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag. - Usage is recommended for development purposes only. -- ``..--p-j``: - Rolling tag corresponding to functionality provided by the ``container-base`` module at a certain version. - Auto-released for changes on ``develop`` branch as well as scheduled maintenance for the *three* most recent Dataverse releases. - Semantic versioning applies to functionality of the base image only. - (`Dockerfile `__ or same location within tagged Dataverse releases) -- ``..--p-j-r``: - Immutable tag, otherwise same as above. - Revision is incremented for rebuilds of the base image. - Recommended for production builds and usage. - -**Note:** It is not possible to provide shorter rolling tags, as the source for a tag like ``x.y.z-jammy`` would not be unambiguous. -If the version number does not change between releases and/or the ``develop`` branch, one is going to win over another image. -If at the same time Payara or Java version change (which is independent from the module version!), it becomes unclear which version people end up using. +In our tagging, we `follow the Bitname example `_. +For the time being, the only operating system *flavors* we use and support are ``noble`` (6.4+) and ``jammy`` (pre 6.4). + +- | ``latest``: + | **Rolling tag** on par with whatever happens on the ``develop`` branch. (`Dockerfile `__) + | Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag. + Usage is recommended for **development purposes only**. +- | ``.--p-j``: + | **Rolling tag** during a development cycle of the Dataverse software (`Dockerfile `__). + | *Note 1:* No updates for tags after a development cycle ends. + Usage is recommended for **development purposes only**. + | *Note 2:* The current tag will always be 1 minor version ahead of Datavere releases. + Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway. + The rolling tag in use during the cycle will be ``6.(x+1)-ffffff-p6.202P.P-jJJ``. + See also: :doc:`release process <../developers/making-releases>`. +- | ``.-``: + | **Rolling tag** for released versions of Dataverse, will always point to latest revision (see below) of a release image. + | The **three latest releases** of the Dataverse project are supported by regular, scheduled maintenance. + Content will be fairly stable, as disruptive changes like Payara or Java version switches are extremly unlikely once released. + Expect disruptive changes in case of high risk security threats. +- | ``.--r``: + | **Immutable tag**; revision is incremented for rebuilds of the base image. + Recommended for **production builds and usage.** Image Contents ++++++++++++++ From 6567e029d996478c2e8c660bd561f4ba6827b97f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 09:43:00 +0200 Subject: [PATCH 236/366] ci: add setup-maven action Instead of repeating the same steps everywhere, use a common action under our version control. --- .github/actions/setup-maven/action.yml | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/actions/setup-maven/action.yml diff --git a/.github/actions/setup-maven/action.yml b/.github/actions/setup-maven/action.yml new file mode 100644 index 00000000000..6edbba1b1a9 --- /dev/null +++ b/.github/actions/setup-maven/action.yml @@ -0,0 +1,37 @@ +--- +name: "Setup Maven and Caches" +description: "Determine Java version and setup Maven, including necessary caches." +inputs: + git-reference: + description: 'The git reference (branch/tag) to check out' + required: true + default: 'develop' + pom-paths: + description: "List of paths to Maven POM(s) for cache dependency setup" + required: false + default: 'pom.xml' +runs: + using: composite + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ inputs.git-reference }} + - name: Determine Java version by reading the Maven property + shell: bash + run: | + echo "JAVA_VERSION=$(grep '' ${GITHUB_WORKSPACE}/modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" | tee -a ${GITHUB_ENV} + - name: Set up JDK ${{ env.JAVA_VERSION }} + id: setup-java + uses: actions/setup-java@v4 + with: + java-version: ${{ env.JAVA_VERSION }} + distribution: 'temurin' + cache: 'maven' + cache-dependency-path: ${{ inputs.pom-paths }} + - name: Download common cache on branch cache miss + if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} + uses: actions/cache/restore@v4 + with: + key: dataverse-maven-cache + path: ~/.m2/repository From 0966edaad306e123f294effc2b7be45f4491ba60 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 09:43:29 +0200 Subject: [PATCH 237/366] ci(ct): run maintenance with the new setup-maven action Testing here - might not yet work. --- .github/workflows/container_maintenance.yml | 45 ++++++++++----------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index da7d3028c3f..3baae428180 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -2,6 +2,8 @@ name: Container Images Scheduled Maintenance on: + # TODO: think about adding a (filtered) push event trigger here in case we change the patches + # --- # Allow manual workflow triggers in case we need to repair images on Docker Hub (build and replace) workflow_dispatch: inputs: @@ -57,29 +59,13 @@ jobs: #if: ${{ github.repository_owner == 'IQSS' }} steps: - - name: Checkout repository - uses: actions/checkout@v4 + - name: Checkout and Setup Maven + # TODO: change to upstream location in final PR + # Necessary as the checked out release branch might not contain the action as files + uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - ref: ${{ matrix.branch }} - - name: Determine Java version from Parent POM - run: | - echo "JAVA_VERSION=$(grep '' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV} - - - name: Set up JDK ${{ env.JAVA_VERSION }} - id: setup-java - uses: actions/setup-java@v4 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: 'temurin' - cache: 'maven' - cache-dependency-path: | - modules/container-base/pom.xml - - name: Download common cache on branch cache miss - if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} - uses: actions/cache/restore@v4 - with: - key: dataverse-maven-cache - path: ~/.m2/repository + git-reference: ${{ matrix.branch }} + pom-paths: modules/container-base/pom.xml # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and # on events in context of upstream because secrets. PRs run in context of forks by default! @@ -169,7 +155,9 @@ jobs: - name: Deploy multi-arch base container image to Docker Hub if: ${{ steps.temurin-check.outputs.newer_java_image == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} id: build - run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + run: | + mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + echo "rebuild=true" | tee -a "${GITHUB_OUTPUT}" # - if: always() # name: Save status (workaround for matrix outputs) @@ -177,6 +165,17 @@ jobs: # # steps.build.outcome is the status BEFORE continue-on-error # echo "STATUS_$( echo "${{ matrix.branch }}" | tr ".:;,-/ " "_" )=${{ steps.build.outcome }}" | tee -a "${GITHUB_ENV}" + - name: Rebuild application container + if: ${{ steps.build.outputs.rebuild }} + uses: ./.github/actions/deploy-app-container + with: + registry: "" + registry_token: "" + ref: "" + base_image: "" + base_image_tag: "" + + #push-app-img: # name: "Rebase & Publish App Image" # permissions: From 7177c32a9642ec99e1df1f802d1b567778a8c821 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 11:05:57 +0200 Subject: [PATCH 238/366] ci: add action to check for newer releases of base images Reusable action to determine if a base image has more recent updates than the creation of the derived image. --- .../actions/check-newer-base-image/action.yml | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/actions/check-newer-base-image/action.yml diff --git a/.github/actions/check-newer-base-image/action.yml b/.github/actions/check-newer-base-image/action.yml new file mode 100644 index 00000000000..d0c2e92d60a --- /dev/null +++ b/.github/actions/check-newer-base-image/action.yml @@ -0,0 +1,53 @@ +--- +name: "Check Newer Base Image" +description: "Determine if a base image is more recent than the derived." +inputs: + base: + description: 'The name and (rolling) tag of the base image to check - or - a shell command to get it' + required: true + derived: + description: 'The name and (rolling) tag of the derived image - or - a shell command to get it' + required: true +outputs: + is-more-recent: + description: "True if base image has a more recent update, false if not." + value: "${{ steps.determine.outputs.is_more_recent }}" + +runs: + using: composite + steps: + - shell: bash + id: determine + run: | + BASE_IMAGE="${{ inputs.base }}" + # Get namespace, default to "library" if not found + BASE_IMAGE_NS="${BASE_IMAGE%/*}" + if [[ "$BASE_IMAGE_NS" = "${BASE_IMAGE}" ]]; then + BASE_IMAGE_NS="library" + fi + BASE_IMAGE_REPO="${BASE_IMAGE%:*}" + BASE_IMAGE_TAG="${BASE_IMAGE#*:}" + + BASE_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${BASE_IMAGE_NS}/repositories/${BASE_IMAGE_REPO}/tags/${BASE_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$BASE_IMAGE_LAST_UPDATE" = "null" ]]; then + echo "::error title='Invalid Base Image'::Could not find ${BASE_IMAGE} in the registry" + exit 1 + fi + + DERIVED_IMAGE="${{ inputs.derived }}" + # Get namespace, default to "library" if not found + DERIVED_IMAGE_NS="${DERIVED_IMAGE%/*}" + if [[ "${DERIVED_IMAGE_NS}" = "${DERIVED_IMAGE}" ]]; then + DERIVED_IMAGE_NS="library" + fi + DERIVED_IMAGE_REPO="$( echo "${DERIVED_IMAGE%:*}" | cut -f2 -d/ )" + DERIVED_IMAGE_TAG="${DERIVED_IMAGE#*:}" + + DERIVED_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${DERIVED_IMAGE_NS}/repositories/${DERIVED_IMAGE_REPO}/tags/${DERIVED_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$DERIVED_IMAGE_LAST_UPDATE" = "null" || "$DERIVED_IMAGE_LAST_UPDATE" < "$BASE_IMAGE_LAST_UPDATE" ]]; then + echo "Base image $BASE_IMAGE has a newer release ($BASE_IMAGE_LAST_UPDATE), which is more recent than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" + echo "is_more_recent=true" >> $GITHUB_OUTPUT + else + echo "Base image $BASE_IMAGE ($BASE_IMAGE_LAST_UPDATE) is older than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" + echo "is_more_recent=false" >> $GITHUB_OUTPUT + fi From 8bc6bceff3fc365800440bedad1471f1ff382c68 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 11:05:57 +0200 Subject: [PATCH 239/366] ci: add action to check for newer releases of base images Reusable action to determine if a base image has more recent updates than the creation of the derived image. --- .../check-newer-parent-image/action.yml | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/actions/check-newer-parent-image/action.yml diff --git a/.github/actions/check-newer-parent-image/action.yml b/.github/actions/check-newer-parent-image/action.yml new file mode 100644 index 00000000000..6f8ce950cec --- /dev/null +++ b/.github/actions/check-newer-parent-image/action.yml @@ -0,0 +1,53 @@ +--- +name: "Check Newer Parent Image" +description: "Determine if a base image is more recent than the derived." +inputs: + parent: + description: 'The name and (rolling) tag of the parent image to check - or - a shell command to get it' + required: true + derived: + description: 'The name and (rolling) tag of the derived image - or - a shell command to get it' + required: true +outputs: + is-more-recent: + description: "True if base image has a more recent update, false if not." + value: "${{ steps.determine.outputs.is_more_recent }}" + +runs: + using: composite + steps: + - shell: bash + id: determine + run: | + PARENT_IMAGE="${{ inputs.parent }}" + # Get namespace, default to "library" if not found + PARENT_IMAGE_NS="${PARENT_IMAGE%/*}" + if [[ "$PARENT_IMAGE_NS" = "${PARENT_IMAGE}" ]]; then + PARENT_IMAGE_NS="library" + fi + PARENT_IMAGE_REPO="${PARENT_IMAGE%:*}" + PARENT_IMAGE_TAG="${PARENT_IMAGE#*:}" + + PARENT_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${PARENT_IMAGE_NS}/repositories/${PARENT_IMAGE_REPO}/tags/${PARENT_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$PARENT_IMAGE_LAST_UPDATE" = "null" ]]; then + echo "::error title='Invalid PARENT Image'::Could not find ${PARENT_IMAGE} in the registry" + exit 1 + fi + + DERIVED_IMAGE="${{ inputs.derived }}" + # Get namespace, default to "library" if not found + DERIVED_IMAGE_NS="${DERIVED_IMAGE%/*}" + if [[ "${DERIVED_IMAGE_NS}" = "${DERIVED_IMAGE}" ]]; then + DERIVED_IMAGE_NS="library" + fi + DERIVED_IMAGE_REPO="$( echo "${DERIVED_IMAGE%:*}" | cut -f2 -d/ )" + DERIVED_IMAGE_TAG="${DERIVED_IMAGE#*:}" + + DERIVED_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${DERIVED_IMAGE_NS}/repositories/${DERIVED_IMAGE_REPO}/tags/${DERIVED_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$DERIVED_IMAGE_LAST_UPDATE" = "null" || "$DERIVED_IMAGE_LAST_UPDATE" < "$PARENT_IMAGE_LAST_UPDATE" ]]; then + echo "Parent image $PARENT_IMAGE has a newer release ($PARENT_IMAGE_LAST_UPDATE), which is more recent than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" + echo "is_more_recent=true" >> $GITHUB_OUTPUT + else + echo "Parent image $PARENT_IMAGE ($PARENT_IMAGE_LAST_UPDATE) is older than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" + echo "is_more_recent=false" >> $GITHUB_OUTPUT + fi From 19fcf89540120d8dbb5d01ceb993868e41f2c6e6 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 11:06:26 +0200 Subject: [PATCH 240/366] ci(ct): use newer image action in maintenance workflow --- .github/workflows/container_maintenance.yml | 31 +++++---------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 3baae428180..aabfe093301 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -103,32 +103,15 @@ jobs: # Figure out if a rebuild is necessary because either there is an updated Java image or our installed packages need updates - name: Check for recent Temurin image updates id: temurin-check - run: | - JAVA_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout )" - JAVA_IMAGE_NS="library" - JAVA_IMAGE_REPO="${JAVA_IMAGE%:*}" - JAVA_IMAGE_TAG="${JAVA_IMAGE#*:}" - JAVA_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${JAVA_IMAGE_NS}/repositories/${JAVA_IMAGE_REPO}/tags/${JAVA_IMAGE_TAG}" | jq -r .last_updated )" - if [[ "$JAVA_IMAGE_LAST_UPDATE" = "null" ]]; then - echo "::error title='Invalid Java Image'::Could not find ${JAVA_IMAGE} in the registry" - exit 1 - fi - - BASE_IMAGE_NS="${BASE_IMAGE%/*}" - BASE_IMAGE_REPO="$( echo "${BASE_IMAGE%:*}" | cut -f2 -d/ )" - BASE_IMAGE_TAG="${BASE_IMAGE#*:}" - BASE_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${BASE_IMAGE_NS}/repositories/${BASE_IMAGE_REPO}/tags/${BASE_IMAGE_TAG}" | jq -r .last_updated )" - if [[ "$BASE_IMAGE_LAST_UPDATE" = "null" || "$BASE_IMAGE_LAST_UPDATE" < "$JAVA_IMAGE_LAST_UPDATE" ]]; then - echo "Java image $JAVA_IMAGE has a newer release ($JAVA_IMAGE_LAST_UPDATE), which is more recent than $BASE_IMAGE ($BASE_IMAGE_LAST_UPDATE)" - echo "newer_java_image=true" >> "${GITHUB_OUTPUT}" - else - echo "Java image $JAVA_IMAGE ($JAVA_IMAGE_LAST_UPDATE) is older than $BASE_IMAGE ($BASE_IMAGE_LAST_UPDATE)" - echo "newer_java_image=false" >> "${GITHUB_OUTPUT}" - fi + # TODO: change to upstream location in final PR + uses: gdcc/wip-dataverse-base-image/.github/actions/check-newer-parent-image@10478-version-base-img + with: + parent: "$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout )" + derived: "${{ env.BASE_IMAGE }}" # TODO: if we introduce more flavors as a matrix, we need to adapt the install command to check for updates - name: Check for package updates in base image id: package-check - if: ${{ steps.temurin-check.outputs.newer_java_image == 'false' }} + if: ${{ steps.temurin-check.outputs.is-more-recent == 'false' }} run: | PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update && apt install -s ${PKGS}" | grep "0 upgraded" ) ]]; then @@ -153,7 +136,7 @@ jobs: run: | echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" - name: Deploy multi-arch base container image to Docker Hub - if: ${{ steps.temurin-check.outputs.newer_java_image == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} + if: ${{ steps.temurin-check.outputs.is-more-recent == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} id: build run: | mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} From dbf2372da3e6a624c1e957da09551dd38563e95a Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 12:59:40 +0200 Subject: [PATCH 241/366] ci: add action to determine next image revision --- .github/actions/get-image-revision/action.yml | 78 +++++++++++++++++++ .../workflows/scripts/get_next_revision.sh | 53 ------------- 2 files changed, 78 insertions(+), 53 deletions(-) create mode 100644 .github/actions/get-image-revision/action.yml delete mode 100755 .github/workflows/scripts/get_next_revision.sh diff --git a/.github/actions/get-image-revision/action.yml b/.github/actions/get-image-revision/action.yml new file mode 100644 index 00000000000..ca9eedeabe1 --- /dev/null +++ b/.github/actions/get-image-revision/action.yml @@ -0,0 +1,78 @@ +name: "Get Incremented Revision Tag" +description: "For a pre-existing rolling tag lookup the latest immutable revision tag, increment and return" +inputs: + image-ref: + description: "The full image reference including namespace, repo and tag" + required: true + revision-separator: + description: "The separator string to use between tag and revision number. Defaults to '-r'" + required: false + default: "-r" + tag-options-prefix: + description: "A string that the revision tag will be appended to and sent to output tag-options" + required: false + default: "" +outputs: + revision-tag: + description: "The updated immutable tag, ready to use" + value: ${{ steps.extract.outputs.revision_tag }} + tag-options: + description: "A string with some command line options (may be empty)" + value: ${{ steps.extract.outputs.tag_options }} +runs: + using: composite + steps: + - shell: bash + id: extract + run: | + IMAGE="${{ inputs.image-ref }}" + IMAGE_NS_REPO="${IMAGE%:*}" + IMAGE_TAG="${IMAGE#*:}" + + if [[ "$IMAGE_TAG" = "$IMAGE_NS_REPO" ]]; then + >&2 echo "You must provide an image reference in the format [/]:" + exit 1 + fi + + case "$IMAGE_NS_REPO" in + */*) :;; # namespace/repository syntax, leave as is + *) IMAGE_NS_REPO="library/$IMAGE_NS_REPO";; # bare repository name (docker official image); must convert to namespace/repository syntax + esac + + # Without such a token we run into rate limits + token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$IMAGE_NS_REPO:pull" ) + + ALL_TAGS="$( + i=0 + while [ $? == 0 ]; do + i=$((i+1)) + RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) + if [[ $( echo "$RESULT" | jq '.message' ) != "null" ]]; then + # If we run into an error on the first attempt, that means we have a problem. + if [[ "$i" == "1" ]]; then + >&2 echo "Error when retrieving tag data: $( echo "$RESULT" | jq '.message' )" + exit 2 + # Otherwise it will just mean we reached the last page already + else + break + fi + else + echo "$RESULT" | jq -r '."results"[]["name"]' + # DEBUG: + #echo "$RESULT" | >&2 jq -r '."results"[]["name"]' + fi + done + )" + + # Note: if a former tag could not be found, it just might not exist already. Start new series with rev 0 + CURRENT=$( echo "$ALL_TAGS" | grep "${IMAGE_TAG}${{ inputs.revision-separator }}" | sed -e "s#${IMAGE_TAG}${{ inputs.revision-separator }}##" | sort -h | tail -n1 ) + if [[ "$CURRENT" ]]; then + REVISION_TAG="${IMAGE_TAG}${{ inputs.revision-separator }}$((CURRENT+1))" + else + REVISION_TAG="${IMAGE_TAG}${{ inputs.revision-separator }}0" + fi + echo "revision_tag=${REVISION_TAG}" | tee -a "$GITHUB_OUTPUT" + + if [[ -n "${{ inputs.tag-options-prefix }}" ]]; then + echo "tag_options=${{ inputs.tag-options-prefix }}${REVISION_TAG}" | tee -a "$GITHUB_OUTPUT" + fi \ No newline at end of file diff --git a/.github/workflows/scripts/get_next_revision.sh b/.github/workflows/scripts/get_next_revision.sh deleted file mode 100755 index 631f8b6f513..00000000000 --- a/.github/workflows/scripts/get_next_revision.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -# This script is used to retrieve the next revision number for a given image reference. -# The image reference must be of the form "[/]:", where the namespace will default to "library" if omitted. - -set -eu - -IMAGE=${1} -IMAGE_NS_REPO="$( echo "$IMAGE" | cut -d: -f1 )" -IMAGE_TAG="$( echo "$IMAGE" | cut -d: -f2 )" - -if [[ "$IMAGE_TAG" == "$IMAGE_NS_REPO" ]]; then - >&2 echo "You must provide an image reference in the format [/]:" - exit 1 -fi - -case "$IMAGE_NS_REPO" in - */*) :;; # namespace/repository syntax, leave as is - *) IMAGE_NS_REPO="library/$IMAGE_NS_REPO";; # bare repository name (docker official image); must convert to namespace/repository syntax -esac - -# Without such a token we run into rate limits -token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$IMAGE_NS_REPO:pull" ) - -ALL_TAGS="$( - i=0 - while [ $? == 0 ]; do - i=$((i+1)) - RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) - if [[ $( echo "$RESULT" | jq '.message' ) != "null" ]]; then - # If we run into an error on the first attempt, that means we have a problem. - if [[ "$i" == "1" ]]; then - >&2 echo "Error when retrieving tag data: $( echo "$RESULT" | jq '.message' )" - exit 2 - # Otherwise it will just mean we reached the last page already - else - break - fi - else - echo "$RESULT" | jq -r '."results"[]["name"]' - # DEBUG: - #echo "$RESULT" | >&2 jq -r '."results"[]["name"]' - fi - done -)" - -# If a former tag could not be found, it just might not exist already. Setting to -1, will be incremented to 0 to start a new series. -CURRENT=$( echo "$ALL_TAGS" | grep "${IMAGE_TAG}-r" | sed -e "s#${IMAGE_TAG}-r##" | sort -h | tail -n1 ) -if [[ "$CURRENT" ]]; then - echo "$((CURRENT+1))" -else - echo "0" -fi From 54e21cc63e526826cfcf29776ba2279d9d7dc4d8 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 13:00:02 +0200 Subject: [PATCH 242/366] ci(ct): use image revision action in maintenance workflow --- .github/workflows/container_maintenance.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index aabfe093301..692e934e9d2 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -96,7 +96,7 @@ jobs: if [[ "${{ matrix.branch }}" = "${{ env.DEVELOP_BRANCH }}" ]]; then NAME=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout ) else - NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag='${base.image.tag.release}' -q -DforceStdout ) + NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag="\${base.image.tag.release}" -q -DforceStdout ) fi echo "BASE_IMAGE=${NAME}" | tee -a "${GITHUB_ENV}" @@ -114,7 +114,7 @@ jobs: if: ${{ steps.temurin-check.outputs.is-more-recent == 'false' }} run: | PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" - if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update && apt install -s ${PKGS}" | grep "0 upgraded" ) ]]; then + if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update && apt install -s ${PKGS}" | grep -q "0 upgraded" ) ]]; then echo "Base image $BASE_IMAGE needs package updates" echo "newer_packages=true" >> "${GITHUB_OUTPUT}" else @@ -124,13 +124,12 @@ jobs: - name: Calculate revision number for immutable tag (on release branches only) if: ${{ matrix.branch != env.DEVELOP_BRANCH }} - run: | - # Get the revision logic script (not present on older releases) - curl -sSL "https://github.com/${GITHUB_REPOSITORY}/archive/${DEVELOP_BRANCH}.tar.gz" | \ - tar -zxf - -C "." --wildcards "*/.github/workflows/scripts/get_next_revision.sh" --strip-components=1 - # Now get the new revision number - REVISION_TAG="${BASE_IMAGE#*:}-r$( .github/workflows/scripts/get_next_revision.sh "${BASE_IMAGE}" )" - echo "DOCKER_TAGS=-Dbase.image.tag=\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=${REVISION_TAG}" | tee -a "${GITHUB_ENV}" + id: revision-tag + # TODO: change to upstream location in final PR + uses: gdcc/wip-dataverse-base-image/.github/actions/get-image-revision@10478-version-base-img + with: + image-ref: ${{ env.BASE_IMAGE }} + tag-options-prefix: "-Dbase.image.tag=\\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=" - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | @@ -139,7 +138,7 @@ jobs: if: ${{ steps.temurin-check.outputs.is-more-recent == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} id: build run: | - mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} -Ddocker.platforms=${{ env.PLATFORMS }} + mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${{ steps.revision-tag.outputs.tag-options }} -Ddocker.platforms=${{ env.PLATFORMS }} echo "rebuild=true" | tee -a "${GITHUB_OUTPUT}" # - if: always() From db64fdfe05e7cbc89966ca3a6744a16fc423b97e Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 3 Sep 2024 13:25:35 +0200 Subject: [PATCH 243/366] fix,ci(ct): don't grep for package updates from apt update output --- .github/workflows/container_maintenance.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 692e934e9d2..c09aad22916 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -114,11 +114,11 @@ jobs: if: ${{ steps.temurin-check.outputs.is-more-recent == 'false' }} run: | PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" - if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update && apt install -s ${PKGS}" | grep -q "0 upgraded" ) ]]; then - echo "Base image $BASE_IMAGE needs package updates" + if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update >&2 && apt install -s ${PKGS}" | grep "0 upgraded" ) ]]; then + echo "Base image $BASE_IMAGE needs updates for our custom installed packages" echo "newer_packages=true" >> "${GITHUB_OUTPUT}" else - echo "Base image $BASE_IMAGE has no package updates" + echo "Base image $BASE_IMAGE has no updates for our custom installed packages" echo "newer_packages=false" >> "${GITHUB_OUTPUT}" fi From d19e7f2cc192acdcd9bf4ef7abc5e194292a2cbe Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 3 Sep 2024 16:20:41 -0400 Subject: [PATCH 244/366] missing empty watermark entry --- src/main/java/propertyFiles/citation.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 1b65b5d391e..ad8ec326e1e 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -191,6 +191,7 @@ datasetfieldtype.topicClassValue.watermark= datasetfieldtype.topicClassVocab.watermark= datasetfieldtype.topicClassVocabURI.watermark=https:// datasetfieldtype.publication.watermark= +datasetfieldtype.publicationRelationType.watermark= datasetfieldtype.publicationCitation.watermark= datasetfieldtype.publicationIDType.watermark= datasetfieldtype.publicationIDNumber.watermark= From 5c041e448eedd5f24fe45f9d3138efe5780d975e Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 3 Sep 2024 16:44:48 -0400 Subject: [PATCH 245/366] fix capitalization --- src/main/java/propertyFiles/citation.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index ad8ec326e1e..c5c40ac66b7 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -274,12 +274,12 @@ controlledvocabulary.publicationIDType.upc=upc controlledvocabulary.publicationIDType.url=url controlledvocabulary.publicationIDType.urn=urn controlledvocabulary.publicationIDType.dash-nrs=DASH-NRS -controlledVocabulary.publicationRelationType.iscitedby=Is Cited By -controlledVocabulary.publicationRelationType.cites=Cites -controlledVocabulary.publicationRelationType.issupplementto=Is Supplement To -controlledVocabulary.publicationRelationType.issupplementedby=Is Supplemented By -controlledVocabulary.publicationRelationType.isreferencedby=Is Referenced By -controlledVocabulary.publicationRelationType.references=References +controlledvocabulary.publicationRelationType.iscitedby=Is Cited By +controlledvocabulary.publicationRelationType.cites=Cites +controlledvocabulary.publicationRelationType.issupplementto=Is Supplement To +controlledvocabulary.publicationRelationType.issupplementedby=Is Supplemented By +controlledvocabulary.publicationRelationType.isreferencedby=Is Referenced By +controlledvocabulary.publicationRelationType.references=References controlledvocabulary.contributorType.data_collector=Data Collector controlledvocabulary.contributorType.data_curator=Data Curator controlledvocabulary.contributorType.data_manager=Data Manager From 21914c2097ecb381133f8a2e9aebc2a79aee34fe Mon Sep 17 00:00:00 2001 From: GPortas Date: Wed, 4 Sep 2024 12:19:46 +0100 Subject: [PATCH 246/366] Changed: dataverse image_url Solr property set on SearchServiceBean --- .../search/SearchIncludeFragment.java | 11 +-------- .../dataverse/search/SearchServiceBean.java | 19 ++++----------- .../iq/dataverse/search/SolrSearchResult.java | 23 +++++++++++++------ 3 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java index 4f3f6e46e48..5c81f6dcccc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java @@ -1414,16 +1414,7 @@ public void setDisplayCardValues() { Set harvestedDatasetIds = null; for (SolrSearchResult result : searchResultsList) { //logger.info("checking DisplayImage for the search result " + i++); - if (result.getType().equals("dataverses")) { - /** - * @todo Someday we should probably revert this setImageUrl to - * the original meaning "image_url" to address this issue: - * `image_url` from Search API results no longer yields a - * downloadable image - - * https://github.com/IQSS/dataverse/issues/3616 - */ - result.setImageUrl(thumbnailServiceWrapper.getDataverseCardImageAsBase64Url(result)); - } else if (result.getType().equals("datasets")) { + if (result.getType().equals("datasets")) { if (result.getEntity() != null) { result.setImageUrl(thumbnailServiceWrapper.getDatasetCardImageAsUrl(result)); } diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java index 52895bd553f..c2d1250f8f3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java @@ -1,14 +1,6 @@ package edu.harvard.iq.dataverse.search; -import edu.harvard.iq.dataverse.DataFile; -import edu.harvard.iq.dataverse.DatasetFieldConstant; -import edu.harvard.iq.dataverse.DatasetFieldServiceBean; -import edu.harvard.iq.dataverse.DatasetFieldType; -import edu.harvard.iq.dataverse.DatasetVersionServiceBean; -import edu.harvard.iq.dataverse.Dataverse; -import edu.harvard.iq.dataverse.DataverseFacet; -import edu.harvard.iq.dataverse.DataverseMetadataBlockFacet; -import edu.harvard.iq.dataverse.DvObjectServiceBean; +import edu.harvard.iq.dataverse.*; import edu.harvard.iq.dataverse.authorization.groups.Group; import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean; import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser; @@ -40,6 +32,7 @@ import jakarta.ejb.EJBTransactionRolledbackException; import jakarta.ejb.Stateless; import jakarta.ejb.TransactionRolledbackLocalException; +import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.persistence.NoResultException; import org.apache.solr.client.solrj.SolrQuery; @@ -78,6 +71,8 @@ public class SearchServiceBean { SystemConfig systemConfig; @EJB SolrClientService solrClientService; + @Inject + ThumbnailServiceWrapper thumbnailServiceWrapper; /** * Import note: "onlyDatatRelatedToMe" relies on filterQueries for providing @@ -596,11 +591,7 @@ public SolrQueryResponse search( solrSearchResult.setDataverseAffiliation(dataverseAffiliation); solrSearchResult.setDataverseParentAlias(dataverseParentAlias); solrSearchResult.setDataverseParentName(dataverseParentName); - - // Do not set the ImageUrl, let the search include fragment fill in - // the thumbnail, similarly to how the dataset and datafile cards - // are handled. - //solrSearchResult.setImageUrl(baseUrl + "/api/access/dvCardImage/" + entityid); + solrSearchResult.setImageUrl(thumbnailServiceWrapper.getDataverseCardImageAsBase64Url(solrSearchResult)); /** * @todo Expose this API URL after "dvs" is changed to * "dataverses". Also, is an API token required for published diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java index 3045f141454..ea4400efbe3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java @@ -486,8 +486,11 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool // displayName = null; // testing NullSafeJsonBuilder // because we are using NullSafeJsonBuilder key/value pairs will be dropped if the value is null - NullSafeJsonBuilder nullSafeJsonBuilder = jsonObjectBuilder().add("name", displayName) - .add("type", getDisplayType(getType())).add("url", preferredUrl).add("image_url", getImageUrl()) + NullSafeJsonBuilder nullSafeJsonBuilder = jsonObjectBuilder() + .add("name", displayName) + .add("type", getDisplayType(getType())) + .add("url", preferredUrl) + .add("image_url", getImageUrl()) // .add("persistent_url", this.persistentUrl) // .add("download_url", this.downloadUrl) /** @@ -511,7 +514,8 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool /** * @todo Expose MIME Type: https://github.com/IQSS/dataverse/issues/1595 */ - .add("file_type", this.filetype).add("file_content_type", this.fileContentType) + .add("file_type", this.filetype) + .add("file_content_type", this.fileContentType) .add("size_in_bytes", getFileSizeInBytes()) /** * "md5" was the only possible value so it's hard-coded here but we might want to deprecate it someday since we now put the MD5 or SHA-1 in @@ -519,12 +523,17 @@ public JsonObjectBuilder json(boolean showRelevance, boolean showEntityIds, bool */ .add("md5", getFileMd5()) .add("checksum", JsonPrinter.getChecksumTypeAndValue(getFileChecksumType(), getFileChecksumValue())) - .add("unf", getUnf()).add("file_persistent_id", this.filePersistentId).add("dataset_name", datasetName) + .add("unf", getUnf()) + .add("file_persistent_id", this.filePersistentId) + .add("dataset_name", datasetName) .add("dataset_id", datasetId).add("publisher", publisherName) - .add("dataset_persistent_id", datasetPersistentId).add("dataset_citation", datasetCitation) - .add("deaccession_reason", this.deaccessionReason).add("citationHtml", this.citationHtml) + .add("dataset_persistent_id", datasetPersistentId) + .add("dataset_citation", datasetCitation) + .add("deaccession_reason", this.deaccessionReason) + .add("citationHtml", this.citationHtml) .add("identifier_of_dataverse", this.identifierOfDataverse) - .add("name_of_dataverse", this.nameOfDataverse).add("citation", this.citation); + .add("name_of_dataverse", this.nameOfDataverse) + .add("citation", this.citation); // Now that nullSafeJsonBuilder has been instatiated, check for null before adding to it! if (showRelevance) { nullSafeJsonBuilder.add("matches", getRelevance()); From 7527073a73dc349c3331809ba7b1b65f8737be53 Mon Sep 17 00:00:00 2001 From: GPortas Date: Wed, 4 Sep 2024 12:38:54 +0100 Subject: [PATCH 247/366] Changed: do not modify existing JSF logic --- .../iq/dataverse/search/SearchIncludeFragment.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java index 5c81f6dcccc..4f3f6e46e48 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java @@ -1414,7 +1414,16 @@ public void setDisplayCardValues() { Set harvestedDatasetIds = null; for (SolrSearchResult result : searchResultsList) { //logger.info("checking DisplayImage for the search result " + i++); - if (result.getType().equals("datasets")) { + if (result.getType().equals("dataverses")) { + /** + * @todo Someday we should probably revert this setImageUrl to + * the original meaning "image_url" to address this issue: + * `image_url` from Search API results no longer yields a + * downloadable image - + * https://github.com/IQSS/dataverse/issues/3616 + */ + result.setImageUrl(thumbnailServiceWrapper.getDataverseCardImageAsBase64Url(result)); + } else if (result.getType().equals("datasets")) { if (result.getEntity() != null) { result.setImageUrl(thumbnailServiceWrapper.getDatasetCardImageAsUrl(result)); } From 2344f2f4373bb5d7f532e7ccafa34c14eaae8f16 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 4 Sep 2024 17:20:41 -0400 Subject: [PATCH 248/366] Add logic to suppress query tool display for non-public files. --- src/main/java/edu/harvard/iq/dataverse/FilePage.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java index afede00f3eb..e2df4f5abb0 100644 --- a/src/main/java/edu/harvard/iq/dataverse/FilePage.java +++ b/src/main/java/edu/harvard/iq/dataverse/FilePage.java @@ -305,6 +305,16 @@ private void loadExternalTools() { exploreTools = exploreTools.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList()); queryTools = queryTools.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList()); toolsWithPreviews = toolsWithPreviews.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList()); + } else { + // Don't list queryTools for non-public files + // Note - this logic is not the same as isPubAliclyDownloadable which appears to be true for a draft-only file + // It is the same as in the DatasetPage.isShowQueryButton() method + if(file.isRestricted() + || !file.isReleased() + || FileUtil.isActivelyEmbargoed(file) + || FileUtil.isRetentionExpired(file)){ + queryTools = new ArrayList<>(); + } } } From 118a9d44938cfd9188aaa321eee75eaae70fb022 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 6 Sep 2024 11:21:06 -0400 Subject: [PATCH 249/366] typo --- src/main/java/edu/harvard/iq/dataverse/FilePage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java index e2df4f5abb0..5717da38f29 100644 --- a/src/main/java/edu/harvard/iq/dataverse/FilePage.java +++ b/src/main/java/edu/harvard/iq/dataverse/FilePage.java @@ -307,7 +307,7 @@ private void loadExternalTools() { toolsWithPreviews = toolsWithPreviews.stream().filter(tool ->tool.accessesAuxFiles()).collect(Collectors.toList()); } else { // Don't list queryTools for non-public files - // Note - this logic is not the same as isPubAliclyDownloadable which appears to be true for a draft-only file + // Note - this logic is not the same as isPubliclyDownloadable which appears to be true for a draft-only file // It is the same as in the DatasetPage.isShowQueryButton() method if(file.isRestricted() || !file.isReleased() From b4327789e0c14813417cb1e75c2bc618dd9651e1 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 6 Sep 2024 13:50:53 -0400 Subject: [PATCH 250/366] fix test --- .../pidproviders/doi/datacite/XmlMetadataTemplateTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java index c1bbc3bebc1..c03146904de 100644 --- a/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/XmlMetadataTemplateTest.java @@ -12,6 +12,7 @@ import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.TermsOfUseAndAccess; import edu.harvard.iq.dataverse.branding.BrandingUtil; +import edu.harvard.iq.dataverse.dataset.DatasetType; import edu.harvard.iq.dataverse.pidproviders.PidProviderFactoryBean; import edu.harvard.iq.dataverse.pidproviders.PidUtil; import edu.harvard.iq.dataverse.pidproviders.doi.DoiMetadata; @@ -129,6 +130,9 @@ public void testDataCiteXMLCreation() throws IOException { ArrayList dsvs = new ArrayList<>(); dsvs.add(0, dv); d.setVersions(dsvs); + DatasetType dType = new DatasetType(); + dType.setName(DatasetType.DATASET_TYPE_DATASET); + d.setDatasetType(dType); String xml = template.generateXML(d); System.out.println("Output is " + xml); From 268535122a98ee2078eb548e884dcd7253956d61 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 6 Sep 2024 15:11:30 -0400 Subject: [PATCH 251/366] doc tweaks for versioned base images: making releases #10827 --- .../source/developers/making-releases.rst | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/sphinx-guides/source/developers/making-releases.rst b/doc/sphinx-guides/source/developers/making-releases.rst index a403f249beb..5bd92833a6e 100755 --- a/doc/sphinx-guides/source/developers/making-releases.rst +++ b/doc/sphinx-guides/source/developers/making-releases.rst @@ -40,19 +40,24 @@ Use the GitHub issue number and the release tag for the name of the branch. (e.g Make the following changes in the release branch. -Bump Version Numbers --------------------- +Bump Version Numbers and Prepare Container Tags +----------------------------------------------- Increment the version number to the milestone (e.g. 5.10.1) in the following two files: - modules/dataverse-parent/pom.xml -> ```` -> ```` (e.g. `pom.xml commit `_) -- modules/dataverse-parent/pom.xml -> ```` -> profile "ct" -> ```` -> Set ```` as ``${revision}`` - doc/sphinx-guides/source/conf.py (two places, e.g. `conf.py commit `_) Add the version being released to the lists in the following file: - doc/sphinx-guides/source/versions.rst (e.g. `versions.rst commit `_) +Return to the parent pom and make the following change, which is necessary for proper tagging of images: + +- modules/dataverse-parent/pom.xml -> ```` -> profile "ct" -> ```` -> Set ```` to ``${revision}`` + +(Before you make this change the value should be ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}``. Later on, after cutting a release, we'll change it back to that value.) + Check in the Changes Above into a Release Branch and Merge It ------------------------------------------------------------- @@ -217,11 +222,11 @@ Note that for milestones we use just the number without the "v" (e.g. "5.10.1"). Update the Container Base Image Version Property ------------------------------------------------ -Create a new branch ``prepare-next-iteration`` and update the following files to prepare for the next development cycle: +Create a new branch (any name is fine but ``prepare-next-iteration`` is suggested) and update the following files to prepare for the next development cycle: -- modules/dataverse-parent/pom.xml -> ```` -> profile "ct" -> ```` -> Set ```` as ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}`` +- modules/dataverse-parent/pom.xml -> ```` -> profile "ct" -> ```` -> Set ```` to ``${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}`` -Now create a pull request and merge it - there is no review or QA necessary, as it is a predefined necessity. +Now create a pull request and merge it. Add the Release to the Dataverse Roadmap ---------------------------------------- From b47d09a1d1aa6cf9c394801ae3773257b495b440 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 6 Sep 2024 16:45:48 -0400 Subject: [PATCH 252/366] iterate on "supported image tags" section #10827 --- .../source/container/base-image.rst | 51 +++++++++++++------ .../source/developers/making-releases.rst | 2 + 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index 13cd393a7e2..83799397860 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -21,6 +21,8 @@ IQSS will not offer you support how to deploy or run it, please reach out to the You might be interested in taking a look at :doc:`../developers/containers`, linking you to some (community-based) efforts. +.. _base-supported-image-tags: + Supported Image Tags ++++++++++++++++++++ @@ -28,29 +30,46 @@ This image is sourced from the main upstream code `repository of the Dataverse s Development and maintenance of the `image's code `_ happens there (again, by the community). -In our tagging, we `follow the Bitname example `_. -For the time being, the only operating system *flavors* we use and support are ``noble`` (6.4+) and ``jammy`` (pre 6.4). +Our tagging is inspired by `Bitnami `_ and we offer two categories of tags: + +- rolling: images change over time +- immutable: images are fixed and never change + +In the tags below you'll see the term "flavor". This refers to flavor of Linux the container is built on. We use Ubuntu as the basis for our images and, for the time being, the only operating system flavors we use and support are ``noble`` (6.4+) and ``jammy`` (pre-6.4). + +We offer two tags for production use, a rolling tag and an immutable one: -- | ``latest``: - | **Rolling tag** on par with whatever happens on the ``develop`` branch. (`Dockerfile `__) +- | **Rolling Production** + | Definition: ``.-`` + | Example: ``6.4-noble`` + | Summary: A **rolling tag** for released versions of Dataverse that will always point to latest revision of an immutable production image (see below). + | The **three latest releases** of the Dataverse project will receive regular, scheduled updates to the image such as security patches for the underlying operating system. Content will be fairly stable as disruptive changes like Payara or Java upgrades will be handled in a new major or minor upgrade to Dataverse (a new ``.`` tag). Expect disruptive changes in case of high risk security threats. +- | **Immutable Production** + | Definition: ``.--r`` + | Example: ``6.4-noble-r1`` + | Summary: An **immutable tag** where the revision is incremented for rebuilds of the image. + | This image should be especially attractive if you want explict control over when your images are updated. + +We offer two rolling tags for developers: + +- | **Latest** + | Definition: ``latest`` + | Example: ``latest`` + | Summary: A **rolling tag** that tracks the ``develop`` branch (see also :ref:`develop-branch`). (`Dockerfile `__) | Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag. Usage is recommended for **development purposes only**. -- | ``.--p-j``: - | **Rolling tag** during a development cycle of the Dataverse software (`Dockerfile `__). +- | **Flexible Stack** + | Definition: ``.--p-j``: + | Example: ``6.4-noble-p6.2024.6-j17`` + | Summary: A **rolling tag** during a development cycle of the Dataverse software (`Dockerfile `__). | *Note 1:* No updates for tags after a development cycle ends. Usage is recommended for **development purposes only**. | *Note 2:* The current tag will always be 1 minor version ahead of Datavere releases. Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway. The rolling tag in use during the cycle will be ``6.(x+1)-ffffff-p6.202P.P-jJJ``. - See also: :doc:`release process <../developers/making-releases>`. -- | ``.-``: - | **Rolling tag** for released versions of Dataverse, will always point to latest revision (see below) of a release image. - | The **three latest releases** of the Dataverse project are supported by regular, scheduled maintenance. - Content will be fairly stable, as disruptive changes like Payara or Java version switches are extremly unlikely once released. - Expect disruptive changes in case of high risk security threats. -- | ``.--r``: - | **Immutable tag**; revision is incremented for rebuilds of the base image. - Recommended for **production builds and usage.** + See also: :doc:`/developers/making-releases`. + +You can find these tags at https://hub.docker.com/r/gdcc/base/tags Image Contents ++++++++++++++ @@ -403,4 +422,4 @@ from `run-java-sh recommendations`_. .. _MicroProfile Config Sources: https://docs.payara.fish/community/docs/Technical%20Documentation/MicroProfile/Config/Overview.html .. _run-java-sh recommendations: https://github.com/fabric8io-images/run-java-sh/blob/master/TUNING.md#recommandations .. _Domain Master Password: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/Security%20Guide/Administering%20System%20Security.html#to-change-the-master-password -.. _Payara Admin Console: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Overview.html#administration-console \ No newline at end of file +.. _Payara Admin Console: https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Overview.html#administration-console diff --git a/doc/sphinx-guides/source/developers/making-releases.rst b/doc/sphinx-guides/source/developers/making-releases.rst index 5bd92833a6e..4936e942389 100755 --- a/doc/sphinx-guides/source/developers/making-releases.rst +++ b/doc/sphinx-guides/source/developers/making-releases.rst @@ -228,6 +228,8 @@ Create a new branch (any name is fine but ``prepare-next-iteration`` is suggeste Now create a pull request and merge it. +For more background, see :ref:`base-supported-image-tags`. + Add the Release to the Dataverse Roadmap ---------------------------------------- From 29056fb15567017ff69c76eba21990783d957adf Mon Sep 17 00:00:00 2001 From: GPortas Date: Mon, 9 Sep 2024 12:44:45 +0100 Subject: [PATCH 253/366] Added: setting imageUrl in SearchServiceBean for datasets and files --- .../10810-search-api-payload-extensions.md | 25 ++++++++++++++++--- doc/sphinx-guides/source/api/search.rst | 12 +++++---- .../iq/dataverse/ThumbnailServiceWrapper.java | 4 +++ .../dataverse/search/SearchServiceBean.java | 2 ++ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/doc/release-notes/10810-search-api-payload-extensions.md b/doc/release-notes/10810-search-api-payload-extensions.md index 870091641ce..ca302d04c50 100644 --- a/doc/release-notes/10810-search-api-payload-extensions.md +++ b/doc/release-notes/10810-search-api-payload-extensions.md @@ -1,10 +1,11 @@ -Search API (/api/search) response will now include new fields for Dataverse and DataFile entities. +Search API (/api/search) response will now include new fields for the different entities. For Dataverse: - "affiliation" - "parentDataverseName" - "parentDataverseIdentifier" +- "image_url" (optional) ```javascript "items": [ @@ -13,21 +14,39 @@ For Dataverse: ... "affiliation": "Dataverse.org", "parentDataverseName": "Root", - "parentDataverseIdentifier": "root" + "parentDataverseIdentifier": "root", + "image_url":"data:image/png;base64,iVBORw0..." (etc, etc) ``` For DataFile: - "releaseOrCreateDate" +- "image_url" (optional) ```javascript "items": [ { "name": "test.txt", ... - "releaseOrCreateDate": "2016-05-10T12:53:39Z" + "releaseOrCreateDate": "2016-05-10T12:53:39Z", + "image_url":"data:image/png;base64,iVBORw0..." (etc, etc) ``` +For Dataset: + +- "image_url" (optional) + +```javascript +"items": [ + { + ... + "image_url": "http://localhost:8080/api/datasets/2/logo" + ... +(etc, etc) +``` + +The image_url field was already part of the SolrSearchResult JSON, but it wasn’t returned by the API because it was appended only after the Solr query was executed in the SearchIncludeFragment of JSF. Now, the field is set in SearchServiceBean, ensuring it is always returned by the API when an image is available. + The schema.xml file for Solr has been updated to include a new field called dvParentAlias for supporting the new response field "parentDataverseIdentifier". So for the next Dataverse released version, a Solr reindex will be necessary to apply the new schema.xml version. diff --git a/doc/sphinx-guides/source/api/search.rst b/doc/sphinx-guides/source/api/search.rst index 6439656ed48..ca592d8556a 100755 --- a/doc/sphinx-guides/source/api/search.rst +++ b/doc/sphinx-guides/source/api/search.rst @@ -61,7 +61,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"Trees", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/trees", - "image_url":"https://demo.dataverse.org/api/access/dvCardImage/7", + "image_url":"data:image/png;base64,iVBORw0...", "identifier":"trees", "description":"A tree dataverse with some birds", "published_at":"2016-05-10T12:53:38Z", @@ -76,7 +76,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"Chestnut Trees", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/chestnuttrees", - "image_url":"https://demo.dataverse.org/api/access/dvCardImage/9", + "image_url":"data:image/png;base64,iVBORw0...", "identifier":"chestnuttrees", "description":"A dataverse with chestnut trees and an oriole", "published_at":"2016-05-10T12:52:38Z", @@ -91,7 +91,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"trees.png", "type":"file", "url":"https://demo.dataverse.org/api/access/datafile/12", - "image_url":"https://demo.dataverse.org/api/access/fileCardImage/12", + "image_url":"data:image/png;base64,iVBORw0...", "file_id":"12", "description":"", "published_at":"2016-05-10T12:53:39Z", @@ -113,7 +113,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"Birds", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/birds", - "image_url":"https://demo.dataverse.org/api/access/dvCardImage/2", + "image_url":"data:image/png;base64,iVBORw0...", "identifier":"birds", "description":"A bird Dataverse collection with some trees", "published_at":"2016-05-10T12:57:27Z", @@ -173,6 +173,8 @@ https://demo.dataverse.org/api/search?q=trees } } +Note that the image_url field, if exists, will be returned as a regular URL for Datasets, while for Files and Dataverses, it will be returned as a Base64 URL. + .. _advancedsearch-example: Advanced Search Examples @@ -200,7 +202,7 @@ In this example, ``show_relevance=true`` matches per field are shown. Available "name":"Finches", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/finches", - "image_url":"https://demo.dataverse.org/api/access/dvCardImage/3", + "image_url":"data:image/png;base64,iVBORw0...", "identifier":"finches", "description":"A Dataverse collection with finches", "published_at":"2016-05-10T12:57:38Z", diff --git a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java index d31fdd4e380..c1127079da4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java +++ b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java @@ -58,6 +58,10 @@ public String getFileCardImageAsBase64Url(SolrSearchResult result) { if (result.isHarvested()) { return null; } + + if (result.getEntity() == null) { + return null; + } Long imageFileId = result.getEntity().getId(); diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java index c2d1250f8f3..fe97d2b7166 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java @@ -601,6 +601,7 @@ public SolrQueryResponse search( } else if (type.equals("datasets")) { solrSearchResult.setHtmlUrl(baseUrl + "/dataset.xhtml?globalId=" + identifier); solrSearchResult.setApiUrl(baseUrl + "/api/datasets/" + entityid); + solrSearchResult.setImageUrl(thumbnailServiceWrapper.getDatasetCardImageAsUrl(solrSearchResult)); //Image url now set via thumbnail api //solrSearchResult.setImageUrl(baseUrl + "/api/access/dsCardImage/" + datasetVersionId); // No, we don't want to set the base64 thumbnails here. @@ -648,6 +649,7 @@ public SolrQueryResponse search( } solrSearchResult.setHtmlUrl(baseUrl + "/dataset.xhtml?persistentId=" + parentGlobalId); solrSearchResult.setDownloadUrl(baseUrl + "/api/access/datafile/" + entityid); + solrSearchResult.setImageUrl(thumbnailServiceWrapper.getFileCardImageAsBase64Url(solrSearchResult)); /** * @todo We are not yet setting the API URL for files because * not all files have metadata. Only subsettable files (those From 4c908aa470e1f375f043cc77e41adc8087d2b8ed Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 9 Sep 2024 10:18:11 -0400 Subject: [PATCH 254/366] simplify now that everything is inside the try --- .../iq/dataverse/search/IndexBatchServiceBean.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java index b8b4baee2bd..3f7a7bb3363 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexBatchServiceBean.java @@ -52,12 +52,8 @@ public Future indexStatus() { logger.info("Beginning indexStatus()"); try { JsonObject contentInDatabaseButStaleInOrMissingFromSolr = getContentInDatabaseButStaleInOrMissingFromSolr().build(); - JsonObject contentInSolrButNotDatabase = null; - JsonObject permissionsInSolrButNotDatabase = null; - - contentInSolrButNotDatabase = getContentInSolrButNotDatabase().build(); - permissionsInSolrButNotDatabase = getPermissionsInSolrButNotDatabase().build(); - + JsonObject contentInSolrButNotDatabase = getContentInSolrButNotDatabase().build(); + JsonObject permissionsInSolrButNotDatabase = getPermissionsInSolrButNotDatabase().build(); JsonObject permissionsInDatabaseButStaleInOrMissingFromSolr = getPermissionsInDatabaseButStaleInOrMissingFromSolr().build(); response From 4e298a32ab43e1fef293ea80d3be8b8a01c4b09c Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 9 Sep 2024 14:55:45 -0400 Subject: [PATCH 255/366] update tests - added one field in citation block --- src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java | 2 +- .../java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java index f3c74f028e4..6fbe91c8405 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java @@ -777,7 +777,7 @@ public void testListMetadataBlocks() { // Since the included property of notesText is set to false, we should retrieve the total number of fields minus one int citationMetadataBlockIndex = geospatialMetadataBlockIndex == 0 ? 1 : 0; listMetadataBlocksResponse.then().assertThat() - .body(String.format("data[%d].fields.size()", citationMetadataBlockIndex), equalTo(78)); + .body(String.format("data[%d].fields.size()", citationMetadataBlockIndex), equalTo(79)); // Since the included property of geographicCoverage is set to false, we should retrieve the total number of fields minus one listMetadataBlocksResponse.then().assertThat() diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java index 183d687b405..186ab513681 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java @@ -42,7 +42,7 @@ void testListMetadataBlocks() { // returnDatasetFieldTypes=true listMetadataBlocksResponse = UtilIT.listMetadataBlocks(false, true); - int expectedNumberOfMetadataFields = 79; + int expectedNumberOfMetadataFields = 80; listMetadataBlocksResponse.then().assertThat() .statusCode(OK.getStatusCode()) .body("data[0].fields", not(equalTo(null))) From eec4abb288996f6e491eb37afea2a65458a6bc1e Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:20:50 -0400 Subject: [PATCH 256/366] reworked controlled vocab language keys --- scripts/api/data/metadatablocks/citation.tsv | 17 +- .../dataverse/ControlledVocabularyValue.java | 8 +- .../iq/dataverse/dataset/DatasetUtil.java | 4 +- .../harvard/iq/dataverse/util/BundleUtil.java | 17 +- .../java/propertyFiles/citation.properties | 15835 ++++++++-------- .../iq/dataverse/MetadataBlockTest.java | 48 +- tests/verify_mdb_properties.sh | 3 +- 7 files changed, 7993 insertions(+), 7939 deletions(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index b7c265f7244..70e4877781a 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -2160,7 +2160,7 @@ language Gamo gmv 2018 gmv language Gamo-Ningi bte 2019 bte language Gan Chinese gan 2020 gan - language Gana gnq 2021 gnq + language Gana gnq 2021 gnq gnk language Ganang gne 2022 gne language Ganda lug 2023 lug lg language Gane gzn 2024 gzn @@ -8051,12 +8051,11 @@ language Áncá acb 7909 acb language Ömie aom 7910 aom language Önge oon 7911 oon - language ǀGwi gwj 7912 gwj - language ǀXam xam 7913 xam - language ǁAni hnh 7914 hnh - language ǁGana gnk 7915 gnk - language ǁXegwi xeg 7916 xeg - language ǂHua huc 7917 huc - language ǂUngkue gku 7918 gku - language ǃXóõ nmn 7919 nmn + language Gwi gwj 7912 gwj + language Xam xam 7913 xam + language Ani hnh 7914 hnh + language Xegwi xeg 7916 xeg + language Hua huc 7917 huc + language Ungkue gku 7918 gku + language Xóõ nmn 7919 nmn language Not applicable 7920 diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java index 5dcce98a90f..46b5e951343 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java +++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java @@ -136,11 +136,9 @@ public String getLocaleStrValue(String language) { public static String getLocaleStrValue(String strValue, String fieldTypeName, String metadataBlockName, Locale locale, boolean sendDefault) { - String key = strValue.toLowerCase().replace(" ", "_"); - key = StringUtils.stripAccents(key); + String key = BundleUtil.getKeyFromRawString("controlledvocabulary." + fieldTypeName + "." + strValue); try { - String val = BundleUtil.getStringFromPropertyFile("controlledvocabulary." + fieldTypeName + "." + key, - metadataBlockName, locale); + String val = BundleUtil.getStringFromPropertyFile(key, metadataBlockName, locale); if (!val.isBlank()) { logger.fine("Found : " + val); return val; @@ -148,7 +146,7 @@ public static String getLocaleStrValue(String strValue, String fieldTypeName, St return sendDefault ? strValue : null; } } catch (MissingResourceException | NullPointerException e) { - logger.warning("Error finding " + "controlledvocabulary." + fieldTypeName + "." + key + " in " + ((locale==null)? "defaultLang" : locale.getLanguage()) + " : " + e.getLocalizedMessage()); + logger.warning("Error finding " + key + " in " + ((locale==null)? "defaultLang" : locale.getLanguage()) + " : " + e.getLocalizedMessage()); return sendDefault ? strValue : null; } } diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java index cacd409b365..926c578219d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java @@ -702,7 +702,7 @@ public static String getLocalizedLicenseDetails(License license,String keyPart) String localizedLicenseValue = "" ; try { if (EnumUtils.isValidEnum(LicenseOption.class, keyPart ) ){ - String key = "license." + licenseName.toLowerCase().replace(" ", "_") + "." + keyPart.toLowerCase(); + String key = BundleUtil.getKeyFromRawString("license." + licenseName + "." + keyPart); localizedLicenseValue = BundleUtil.getStringFromPropertyFile(key, "License"); } } @@ -719,7 +719,7 @@ public static String getLocalizedLicenseDetails(License license,String keyPart) public static String getLocaleExternalStatus(String status) { String localizedName = "" ; try { - localizedName = BundleUtil.getStringFromPropertyFile(status.toLowerCase().replace(" ", "_"), "CurationLabels"); + localizedName = BundleUtil.getStringFromPropertyFile(BundleUtil.getKeyFromRawString(status), "CurationLabels"); } catch (Exception e) { localizedName = status; diff --git a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java index 922e6ff5d28..2f3109a10c6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java @@ -4,15 +4,12 @@ import java.net.URL; import java.net.URLClassLoader; import java.text.MessageFormat; -import java.util.List; -import java.util.Locale; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import java.util.Map; -import java.util.HashMap; + import jakarta.faces.context.FacesContext; +import org.apache.commons.lang3.StringUtils; public class BundleUtil { @@ -198,4 +195,12 @@ public static Locale getDefaultLocale() { return Locale.getDefault(); } + /** + * Return a sanitized key by stripping out non-latin chars and spaces + * @param rawKey + * @return + */ + public static String getKeyFromRawString(String rawKey) { + return rawKey.replaceAll("[^\\x00-\\xFF]", "").trim().replace(" ", "_"); + } } diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 1e4b251b084..e2555525c9d 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -296,7918 +296,7923 @@ controlledvocabulary.authorIdentifierScheme.gnd=GND controlledvocabulary.authorIdentifierScheme.dai=DAI controlledvocabulary.authorIdentifierScheme.researcherid=ResearcherID controlledvocabulary.authorIdentifierScheme.scopusid=ScopusID -controlledvocabulary.language.'are'are='Are'are -controlledvocabulary.language.'auhelawa='Auhelawa -controlledvocabulary.language.a'ou=A'ou -controlledvocabulary.language.a-pucikwar=A-Pucikwar -controlledvocabulary.language.aari=Aari -controlledvocabulary.language.aasax=Aasáx -controlledvocabulary.language.abadi=Abadi -controlledvocabulary.language.abaga=Abaga -controlledvocabulary.language.abai_sungai=Abai Sungai -controlledvocabulary.language.abanyom=Abanyom -controlledvocabulary.language.abar=Abar -controlledvocabulary.language.abau=Abau -controlledvocabulary.language.abaza=Abaza -controlledvocabulary.language.abellen_ayta=Abellen Ayta -controlledvocabulary.language.abidji=Abidji -controlledvocabulary.language.abinomn=Abinomn -controlledvocabulary.language.abipon=Abipon -controlledvocabulary.language.abishira=Abishira -controlledvocabulary.language.abkhaz,_abkhazian=Abkhaz, Abkhazian -controlledvocabulary.language.abom=Abom -controlledvocabulary.language.abon=Abon -controlledvocabulary.language.abron=Abron -controlledvocabulary.language.abu=Abu -controlledvocabulary.language.abu'_arapesh=Abu' Arapesh -controlledvocabulary.language.abua=Abua -controlledvocabulary.language.abui=Abui -controlledvocabulary.language.abun=Abun -controlledvocabulary.language.abure=Abure -controlledvocabulary.language.abureni=Abureni -controlledvocabulary.language.abe=Abé -controlledvocabulary.language.acatepec_me'phaa=Acatepec Me'phaa -controlledvocabulary.language.achagua=Achagua -controlledvocabulary.language.achang=Achang -controlledvocabulary.language.ache=Ache -controlledvocabulary.language.acheron=Acheron -controlledvocabulary.language.achi=Achi -controlledvocabulary.language.achinese=Achinese -controlledvocabulary.language.achterhoeks=Achterhoeks -controlledvocabulary.language.achuar-shiwiar=Achuar-Shiwiar -controlledvocabulary.language.achumawi=Achumawi -controlledvocabulary.language.acoli=Acoli -controlledvocabulary.language.acroa=Acroá -controlledvocabulary.language.adai=Adai -controlledvocabulary.language.adamawa_fulfulde=Adamawa Fulfulde -controlledvocabulary.language.adamorobe_sign_language=Adamorobe Sign Language -controlledvocabulary.language.adang=Adang -controlledvocabulary.language.adangbe=Adangbe -controlledvocabulary.language.adangme=Adangme -controlledvocabulary.language.adara=Adara -controlledvocabulary.language.adasen=Adasen -controlledvocabulary.language.adele=Adele -controlledvocabulary.language.adhola=Adhola -controlledvocabulary.language.adi=Adi -controlledvocabulary.language.adilabad_gondi=Adilabad Gondi -controlledvocabulary.language.adioukrou=Adioukrou -controlledvocabulary.language.adithinngithigh=Adithinngithigh -controlledvocabulary.language.adivasi_oriya=Adivasi Oriya -controlledvocabulary.language.adiwasi_garasia=Adiwasi Garasia -controlledvocabulary.language.adnyamathanha=Adnyamathanha -controlledvocabulary.language.adonara=Adonara -controlledvocabulary.language.aduge=Aduge -controlledvocabulary.language.adyghe=Adyghe -controlledvocabulary.language.adzera=Adzera -controlledvocabulary.language.aeka=Aeka -controlledvocabulary.language.aekyom=Aekyom -controlledvocabulary.language.aequian=Aequian -controlledvocabulary.language.aer=Aer -controlledvocabulary.language.afade=Afade -controlledvocabulary.language.afar=Afar -controlledvocabulary.language.afghan_sign_language=Afghan Sign Language -controlledvocabulary.language.afitti=Afitti -controlledvocabulary.language.afrihili=Afrihili -controlledvocabulary.language.afrikaans=Afrikaans -controlledvocabulary.language.afro-seminole_creole=Afro-Seminole Creole -controlledvocabulary.language.agarabi=Agarabi -controlledvocabulary.language.agariya=Agariya -controlledvocabulary.language.agatu=Agatu -controlledvocabulary.language.agavotaguerra=Agavotaguerra -controlledvocabulary.language.aghem=Aghem -controlledvocabulary.language.aghu=Aghu -controlledvocabulary.language.aghu-tharnggala=Aghu-Tharnggala -controlledvocabulary.language.aghul=Aghul -controlledvocabulary.language.aghwan=Aghwan -controlledvocabulary.language.agi=Agi -controlledvocabulary.language.agob=Agob -controlledvocabulary.language.agoi=Agoi -controlledvocabulary.language.aguacateco=Aguacateco -controlledvocabulary.language.aguano=Aguano -controlledvocabulary.language.aguaruna=Aguaruna -controlledvocabulary.language.aguna=Aguna -controlledvocabulary.language.agusan_manobo=Agusan Manobo -controlledvocabulary.language.agutaynen=Agutaynen -controlledvocabulary.language.agwagwune=Agwagwune -controlledvocabulary.language.ahanta=Ahanta -controlledvocabulary.language.aheri_gondi=Aheri Gondi -controlledvocabulary.language.aheu=Aheu -controlledvocabulary.language.ahirani=Ahirani -controlledvocabulary.language.ahom=Ahom -controlledvocabulary.language.ahtena=Ahtena -controlledvocabulary.language.ahwai=Ahwai -controlledvocabulary.language.ai-cham=Ai-Cham -controlledvocabulary.language.aighon=Aighon -controlledvocabulary.language.aikana=Aikanã -controlledvocabulary.language.aiklep=Aiklep -controlledvocabulary.language.aimaq=Aimaq -controlledvocabulary.language.aimele=Aimele -controlledvocabulary.language.aimol=Aimol -controlledvocabulary.language.ainbai=Ainbai -controlledvocabulary.language.ainu_(china)=Ainu (China) -controlledvocabulary.language.ainu_(japan)=Ainu (Japan) -controlledvocabulary.language.aiome=Aiome -controlledvocabulary.language.airoran=Airoran -controlledvocabulary.language.aiton=Aiton -controlledvocabulary.language.aja_(benin)=Aja (Benin) -controlledvocabulary.language.aja_(south_sudan)=Aja (South Sudan) -controlledvocabulary.language.ajawa=Ajawa -controlledvocabulary.language.ajie=Ajië -controlledvocabulary.language.ajumbu=Ajumbu -controlledvocabulary.language.ajyininka_apurucayali=Ajyíninka Apurucayali -controlledvocabulary.language.ak=Ak -controlledvocabulary.language.aka=Aka -controlledvocabulary.language.aka-bea=Aka-Bea -controlledvocabulary.language.aka-bo=Aka-Bo -controlledvocabulary.language.aka-cari=Aka-Cari -controlledvocabulary.language.aka-jeru=Aka-Jeru -controlledvocabulary.language.aka-kede=Aka-Kede -controlledvocabulary.language.aka-kol=Aka-Kol -controlledvocabulary.language.aka-kora=Aka-Kora -controlledvocabulary.language.akan=Akan -controlledvocabulary.language.akar-bale=Akar-Bale -controlledvocabulary.language.akaselem=Akaselem -controlledvocabulary.language.akawaio=Akawaio -controlledvocabulary.language.ake=Ake -controlledvocabulary.language.akebu=Akebu -controlledvocabulary.language.akei=Akei -controlledvocabulary.language.akeu=Akeu -controlledvocabulary.language.akha=Akha -controlledvocabulary.language.akhvakh=Akhvakh -controlledvocabulary.language.akkadian=Akkadian -controlledvocabulary.language.akkala_sami=Akkala Sami -controlledvocabulary.language.aklanon=Aklanon -controlledvocabulary.language.akolet=Akolet -controlledvocabulary.language.akoose=Akoose -controlledvocabulary.language.akoye=Akoye -controlledvocabulary.language.akpa=Akpa -controlledvocabulary.language.akpes=Akpes -controlledvocabulary.language.akrukay=Akrukay -controlledvocabulary.language.akukem=Akukem -controlledvocabulary.language.akuku=Akuku -controlledvocabulary.language.akum=Akum -controlledvocabulary.language.akuntsu=Akuntsu -controlledvocabulary.language.akurio=Akurio -controlledvocabulary.language.akwa=Akwa -controlledvocabulary.language.akyaung_ari_naga=Akyaung Ari Naga -controlledvocabulary.language.al-sayyid_bedouin_sign_language=Al-Sayyid Bedouin Sign Language -controlledvocabulary.language.alaba-k’abeena=Alaba-K’abeena -controlledvocabulary.language.alabama=Alabama -controlledvocabulary.language.alabat_island_agta=Alabat Island Agta -controlledvocabulary.language.alacatlatzala_mixtec=Alacatlatzala Mixtec -controlledvocabulary.language.alago=Alago -controlledvocabulary.language.alagwa=Alagwa -controlledvocabulary.language.alak=Alak -controlledvocabulary.language.alamblak=Alamblak -controlledvocabulary.language.alangan=Alangan -controlledvocabulary.language.alanic=Alanic -controlledvocabulary.language.alapmunte=Alapmunte -controlledvocabulary.language.alawa=Alawa -controlledvocabulary.language.albanian=Albanian -controlledvocabulary.language.albanian_sign_language=Albanian Sign Language -controlledvocabulary.language.albarradas_sign_language=Albarradas Sign Language -controlledvocabulary.language.alcozauca_mixtec=Alcozauca Mixtec -controlledvocabulary.language.alege=Alege -controlledvocabulary.language.alekano=Alekano -controlledvocabulary.language.aleut=Aleut -controlledvocabulary.language.algerian_arabic=Algerian Arabic -controlledvocabulary.language.algerian_jewish_sign_language=Algerian Jewish Sign Language -controlledvocabulary.language.algerian_saharan_arabic=Algerian Saharan Arabic -controlledvocabulary.language.algerian_sign_language=Algerian Sign Language -controlledvocabulary.language.algonquin=Algonquin -controlledvocabulary.language.ali=Ali -controlledvocabulary.language.alladian=Alladian -controlledvocabulary.language.allar=Allar -controlledvocabulary.language.alngith=Alngith -controlledvocabulary.language.alo_phola=Alo Phola -controlledvocabulary.language.alor=Alor -controlledvocabulary.language.aloapam_zapotec=Aloápam Zapotec -controlledvocabulary.language.alsea=Alsea -controlledvocabulary.language.alu_kurumba=Alu Kurumba -controlledvocabulary.language.alugu=Alugu -controlledvocabulary.language.alumu-tesu=Alumu-Tesu -controlledvocabulary.language.alune=Alune -controlledvocabulary.language.aluo=Aluo -controlledvocabulary.language.alur=Alur -controlledvocabulary.language.alutor=Alutor -controlledvocabulary.language.alviri-vidari=Alviri-Vidari -controlledvocabulary.language.alyawarr=Alyawarr -controlledvocabulary.language.ama_(papua_new_guinea)=Ama (Papua New Guinea) -controlledvocabulary.language.ama_(sudan)=Ama (Sudan) -controlledvocabulary.language.amahai=Amahai -controlledvocabulary.language.amahuaca=Amahuaca -controlledvocabulary.language.amaimon=Amaimon -controlledvocabulary.language.amal=Amal -controlledvocabulary.language.amami_koniya_sign_language=Amami Koniya Sign Language -controlledvocabulary.language.amanab=Amanab -controlledvocabulary.language.amanaye=Amanayé -controlledvocabulary.language.amara=Amara -controlledvocabulary.language.amarakaeri=Amarakaeri -controlledvocabulary.language.amarasi=Amarasi -controlledvocabulary.language.amatlan_zapotec=Amatlán Zapotec -controlledvocabulary.language.amba_(solomon_islands)=Amba (Solomon Islands) -controlledvocabulary.language.amba_(uganda)=Amba (Uganda) -controlledvocabulary.language.ambai=Ambai -controlledvocabulary.language.ambakich=Ambakich -controlledvocabulary.language.ambala_ayta=Ambala Ayta -controlledvocabulary.language.ambelau=Ambelau -controlledvocabulary.language.ambele=Ambele -controlledvocabulary.language.amblong=Amblong -controlledvocabulary.language.ambo=Ambo -controlledvocabulary.language.ambo-pasco_quechua=Ambo-Pasco Quechua -controlledvocabulary.language.ambonese_malay=Ambonese Malay -controlledvocabulary.language.ambrak=Ambrak -controlledvocabulary.language.ambul=Ambul -controlledvocabulary.language.ambulas=Ambulas -controlledvocabulary.language.amdang=Amdang -controlledvocabulary.language.amdo_tibetan=Amdo Tibetan -controlledvocabulary.language.amele=Amele -controlledvocabulary.language.american_sign_language=American Sign Language -controlledvocabulary.language.amganad_ifugao=Amganad Ifugao -controlledvocabulary.language.amharic=Amharic -controlledvocabulary.language.ami=Ami -controlledvocabulary.language.amis=Amis -controlledvocabulary.language.amo=Amo -controlledvocabulary.language.amol=Amol -controlledvocabulary.language.amoltepec_mixtec=Amoltepec Mixtec -controlledvocabulary.language.ampanang=Ampanang -controlledvocabulary.language.ampari_dogon=Ampari Dogon -controlledvocabulary.language.amri_karbi=Amri Karbi -controlledvocabulary.language.amto=Amto -controlledvocabulary.language.amundava=Amundava -controlledvocabulary.language.amurdak=Amurdak -controlledvocabulary.language.ana_tinga_dogon=Ana Tinga Dogon -controlledvocabulary.language.anaang=Anaang -controlledvocabulary.language.anakalangu=Anakalangu -controlledvocabulary.language.anal=Anal -controlledvocabulary.language.anam=Anam -controlledvocabulary.language.anambe=Anambé -controlledvocabulary.language.anamgura=Anamgura -controlledvocabulary.language.anasi=Anasi -controlledvocabulary.language.ancient_greek_(to_1453)=Ancient Greek (to 1453) -controlledvocabulary.language.ancient_hebrew=Ancient Hebrew -controlledvocabulary.language.ancient_macedonian=Ancient Macedonian -controlledvocabulary.language.ancient_north_arabian=Ancient North Arabian -controlledvocabulary.language.ancient_zapotec=Ancient Zapotec -controlledvocabulary.language.andaandi=Andaandi -controlledvocabulary.language.andai=Andai -controlledvocabulary.language.andajin=Andajin -controlledvocabulary.language.andalusian_arabic=Andalusian Arabic -controlledvocabulary.language.andaman_creole_hindi=Andaman Creole Hindi -controlledvocabulary.language.andaqui=Andaqui -controlledvocabulary.language.andarum=Andarum -controlledvocabulary.language.andegerebinha=Andegerebinha -controlledvocabulary.language.andh=Andh -controlledvocabulary.language.andi=Andi -controlledvocabulary.language.andio=Andio -controlledvocabulary.language.andoa=Andoa -controlledvocabulary.language.andoque=Andoque -controlledvocabulary.language.andra-hus=Andra-Hus -controlledvocabulary.language.aneityum=Aneityum -controlledvocabulary.language.anem=Anem -controlledvocabulary.language.aneme_wake=Aneme Wake -controlledvocabulary.language.anfillo=Anfillo -controlledvocabulary.language.angaataha=Angaataha -controlledvocabulary.language.angaite=Angaité -controlledvocabulary.language.angal=Angal -controlledvocabulary.language.angal_enen=Angal Enen -controlledvocabulary.language.angal_heneng=Angal Heneng -controlledvocabulary.language.angami_naga=Angami Naga -controlledvocabulary.language.angguruk_yali=Angguruk Yali -controlledvocabulary.language.angika=Angika -controlledvocabulary.language.angkamuthi=Angkamuthi -controlledvocabulary.language.anglo-norman=Anglo-Norman -controlledvocabulary.language.angloromani=Angloromani -controlledvocabulary.language.angolar=Angolar -controlledvocabulary.language.angor=Angor -controlledvocabulary.language.angoram=Angoram -controlledvocabulary.language.angosturas_tunebo=Angosturas Tunebo -controlledvocabulary.language.anguthimri=Anguthimri -controlledvocabulary.language.ani_phowa=Ani Phowa -controlledvocabulary.language.anii=Anii -controlledvocabulary.language.animere=Animere -controlledvocabulary.language.anindilyakwa=Anindilyakwa -controlledvocabulary.language.aninka=Aninka -controlledvocabulary.language.anjam=Anjam -controlledvocabulary.language.ankave=Ankave -controlledvocabulary.language.anmatyerre=Anmatyerre -controlledvocabulary.language.anong=Anong -controlledvocabulary.language.anor=Anor -controlledvocabulary.language.anserma=Anserma -controlledvocabulary.language.ansus=Ansus -controlledvocabulary.language.antakarinya=Antakarinya -controlledvocabulary.language.antankarana_malagasy=Antankarana Malagasy -controlledvocabulary.language.antigua_and_barbuda_creole_english=Antigua and Barbuda Creole English -controlledvocabulary.language.anu-hkongso_chin=Anu-Hkongso Chin -controlledvocabulary.language.anuak=Anuak -controlledvocabulary.language.anufo=Anufo -controlledvocabulary.language.anuki=Anuki -controlledvocabulary.language.anus=Anus -controlledvocabulary.language.anuta=Anuta -controlledvocabulary.language.anyin=Anyin -controlledvocabulary.language.anyin_morofo=Anyin Morofo -controlledvocabulary.language.ao_naga=Ao Naga -controlledvocabulary.language.aoheng=Aoheng -controlledvocabulary.language.aore=Aore -controlledvocabulary.language.ap_ma=Ap Ma -controlledvocabulary.language.apalachee=Apalachee -controlledvocabulary.language.apalai=Apalaí -controlledvocabulary.language.apali=Apali -controlledvocabulary.language.apasco-apoala_mixtec=Apasco-Apoala Mixtec -controlledvocabulary.language.apatani=Apatani -controlledvocabulary.language.apiaka=Apiaká -controlledvocabulary.language.apinaye=Apinayé -controlledvocabulary.language.apma=Apma -controlledvocabulary.language.aproumu_aizi=Aproumu Aizi -controlledvocabulary.language.apurina=Apurinã -controlledvocabulary.language.aputai=Aputai -controlledvocabulary.language.aquitanian=Aquitanian -controlledvocabulary.language.arabana=Arabana -controlledvocabulary.language.arabela=Arabela -controlledvocabulary.language.arabic=Arabic -controlledvocabulary.language.aragonese=Aragonese -controlledvocabulary.language.araki=Araki -controlledvocabulary.language.arakwal=Arakwal -controlledvocabulary.language.aralle-tabulahan=Aralle-Tabulahan -controlledvocabulary.language.arammba=Arammba -controlledvocabulary.language.aranadan=Aranadan -controlledvocabulary.language.aranama-tamique=Aranama-Tamique -controlledvocabulary.language.arandai=Arandai -controlledvocabulary.language.araona=Araona -controlledvocabulary.language.arapaho=Arapaho -controlledvocabulary.language.arapaso=Arapaso -controlledvocabulary.language.ararandewara=Ararandewára -controlledvocabulary.language.arawak=Arawak -controlledvocabulary.language.arawete=Araweté -controlledvocabulary.language.arawum=Arawum -controlledvocabulary.language.arbore=Arbore -controlledvocabulary.language.arbereshe_albanian=Arbëreshë Albanian -controlledvocabulary.language.archi=Archi -controlledvocabulary.language.ardhamagadhi_prakrit=Ardhamāgadhī Prākrit -controlledvocabulary.language.are=Are -controlledvocabulary.language.areba=Areba -controlledvocabulary.language.arem=Arem -controlledvocabulary.language.arequipa-la_union_quechua=Arequipa-La Unión Quechua -controlledvocabulary.language.argentine_sign_language=Argentine Sign Language -controlledvocabulary.language.argobba=Argobba -controlledvocabulary.language.arguni=Arguni -controlledvocabulary.language.arhuaco=Arhuaco -controlledvocabulary.language.arha=Arhâ -controlledvocabulary.language.arho=Arhö -controlledvocabulary.language.ari=Ari -controlledvocabulary.language.aribwatsa=Aribwatsa -controlledvocabulary.language.aribwaung=Aribwaung -controlledvocabulary.language.arifama-miniafia=Arifama-Miniafia -controlledvocabulary.language.arigidi=Arigidi -controlledvocabulary.language.arikapu=Arikapú -controlledvocabulary.language.arikara=Arikara -controlledvocabulary.language.arikem=Arikem -controlledvocabulary.language.arin=Arin -controlledvocabulary.language.aringa=Aringa -controlledvocabulary.language.armazic=Armazic -controlledvocabulary.language.armenian=Armenian -controlledvocabulary.language.armenian_sign_language=Armenian Sign Language -controlledvocabulary.language.arop-lokep=Arop-Lokep -controlledvocabulary.language.arop-sissano=Arop-Sissano -controlledvocabulary.language.arosi=Arosi -controlledvocabulary.language.arpitan=Arpitan -controlledvocabulary.language.arritinngithigh=Arritinngithigh -controlledvocabulary.language.arta=Arta -controlledvocabulary.language.aruamu=Aruamu -controlledvocabulary.language.aruek=Aruek -controlledvocabulary.language.aruop=Aruop -controlledvocabulary.language.arutani=Arutani -controlledvocabulary.language.arua_(amazonas_state)=Aruá (Amazonas State) -controlledvocabulary.language.arua_(rodonia_state)=Aruá (Rodonia State) -controlledvocabulary.language.arvanitika_albanian=Arvanitika Albanian -controlledvocabulary.language.as=As -controlledvocabulary.language.asaro'o=Asaro'o -controlledvocabulary.language.ashe=Ashe -controlledvocabulary.language.ashkun=Ashkun -controlledvocabulary.language.asho_chin=Asho Chin -controlledvocabulary.language.ashtiani=Ashtiani -controlledvocabulary.language.ashaninka=Asháninka -controlledvocabulary.language.asheninka_pajonal=Ashéninka Pajonal -controlledvocabulary.language.asheninka_perene=Ashéninka Perené -controlledvocabulary.language.asilulu=Asilulu -controlledvocabulary.language.askopan=Askopan -controlledvocabulary.language.asoa=Asoa -controlledvocabulary.language.assamese=Assamese -controlledvocabulary.language.assangori=Assangori -controlledvocabulary.language.assiniboine=Assiniboine -controlledvocabulary.language.assyrian_neo-aramaic=Assyrian Neo-Aramaic -controlledvocabulary.language.asturian=Asturian -controlledvocabulary.language.asu_(nigeria)=Asu (Nigeria) -controlledvocabulary.language.asu_(tanzania)=Asu (Tanzania) -controlledvocabulary.language.asue_awyu=Asue Awyu -controlledvocabulary.language.asumboa=Asumboa -controlledvocabulary.language.asuncion_mixtepec_zapotec=Asunción Mixtepec Zapotec -controlledvocabulary.language.asuri=Asuri -controlledvocabulary.language.ata=Ata -controlledvocabulary.language.ata_manobo=Ata Manobo -controlledvocabulary.language.atakapa=Atakapa -controlledvocabulary.language.atampaya=Atampaya -controlledvocabulary.language.atatlahuca_mixtec=Atatláhuca Mixtec -controlledvocabulary.language.atauran=Atauran -controlledvocabulary.language.atayal=Atayal -controlledvocabulary.language.atemble=Atemble -controlledvocabulary.language.athpariya=Athpariya -controlledvocabulary.language.ati=Ati -controlledvocabulary.language.atikamekw=Atikamekw -controlledvocabulary.language.atohwaim=Atohwaim -controlledvocabulary.language.atong_(cameroon)=Atong (Cameroon) -controlledvocabulary.language.atong_(india)=Atong (India) -controlledvocabulary.language.atorada=Atorada -controlledvocabulary.language.atsahuaca=Atsahuaca -controlledvocabulary.language.atsam=Atsam -controlledvocabulary.language.atsugewi=Atsugewi -controlledvocabulary.language.attapady_kurumba=Attapady Kurumba -controlledvocabulary.language.attie=Attié -controlledvocabulary.language.atzingo_matlatzinca=Atzingo Matlatzinca -controlledvocabulary.language.au=Au -controlledvocabulary.language.aulua=Aulua -controlledvocabulary.language.aura=Aurá -controlledvocabulary.language.aushi=Aushi -controlledvocabulary.language.aushiri=Aushiri -controlledvocabulary.language.auslan=Auslan -controlledvocabulary.language.austral=Austral -controlledvocabulary.language.australian_aborigines_sign_language=Australian Aborigines Sign Language -controlledvocabulary.language.austrian_sign_language=Austrian Sign Language -controlledvocabulary.language.auwe=Auwe -controlledvocabulary.language.auye=Auye -controlledvocabulary.language.auyokawa=Auyokawa -controlledvocabulary.language.avaric=Avaric -controlledvocabulary.language.avatime=Avatime -controlledvocabulary.language.avau=Avau -controlledvocabulary.language.avestan=Avestan -controlledvocabulary.language.avikam=Avikam -controlledvocabulary.language.avokaya=Avokaya -controlledvocabulary.language.ava-canoeiro=Avá-Canoeiro -controlledvocabulary.language.awa_(china)=Awa (China) -controlledvocabulary.language.awa_(papua_new_guinea)=Awa (Papua New Guinea) -controlledvocabulary.language.awa-cuaiquer=Awa-Cuaiquer -controlledvocabulary.language.awabakal=Awabakal -controlledvocabulary.language.awad_bing=Awad Bing -controlledvocabulary.language.awadhi=Awadhi -controlledvocabulary.language.awak=Awak -controlledvocabulary.language.awar=Awar -controlledvocabulary.language.awara=Awara -controlledvocabulary.language.awbono=Awbono -controlledvocabulary.language.aweer=Aweer -controlledvocabulary.language.awera=Awera -controlledvocabulary.language.aweti=Awetí -controlledvocabulary.language.awing=Awing -controlledvocabulary.language.awiyaana=Awiyaana -controlledvocabulary.language.awjilah=Awjilah -controlledvocabulary.language.awngi=Awngi -controlledvocabulary.language.awngthim=Awngthim -controlledvocabulary.language.awtuw=Awtuw -controlledvocabulary.language.awu=Awu -controlledvocabulary.language.awun=Awun -controlledvocabulary.language.awutu=Awutu -controlledvocabulary.language.awyi=Awyi -controlledvocabulary.language.axamb=Axamb -controlledvocabulary.language.axi_yi=Axi Yi -controlledvocabulary.language.ayabadhu=Ayabadhu -controlledvocabulary.language.ayacucho_quechua=Ayacucho Quechua -controlledvocabulary.language.ayautla_mazatec=Ayautla Mazatec -controlledvocabulary.language.ayere=Ayere -controlledvocabulary.language.ayerrerenge=Ayerrerenge -controlledvocabulary.language.ayi_(papua_new_guinea)=Ayi (Papua New Guinea) -controlledvocabulary.language.ayiwo=Ayiwo -controlledvocabulary.language.ayizi=Ayizi -controlledvocabulary.language.ayizo_gbe=Ayizo Gbe -controlledvocabulary.language.aymara=Aymara -controlledvocabulary.language.ayoquesco_zapotec=Ayoquesco Zapotec -controlledvocabulary.language.ayoreo=Ayoreo -controlledvocabulary.language.ayu=Ayu -controlledvocabulary.language.ayutla_mixtec=Ayutla Mixtec -controlledvocabulary.language.azerbaijani=Azerbaijani -controlledvocabulary.language.azha=Azha -controlledvocabulary.language.azhe=Azhe -controlledvocabulary.language.azoyu_me'phaa=Azoyú Me'phaa -controlledvocabulary.language.baan=Baan -controlledvocabulary.language.baangi=Baangi -controlledvocabulary.language.baatonum=Baatonum -controlledvocabulary.language.baba=Baba -controlledvocabulary.language.baba_malay=Baba Malay -controlledvocabulary.language.babango=Babango -controlledvocabulary.language.babanki=Babanki -controlledvocabulary.language.babatana=Babatana -controlledvocabulary.language.babine=Babine -controlledvocabulary.language.babuza=Babuza -controlledvocabulary.language.bacama=Bacama -controlledvocabulary.language.bacanese_malay=Bacanese Malay -controlledvocabulary.language.bactrian=Bactrian -controlledvocabulary.language.bada_(indonesia)=Bada (Indonesia) -controlledvocabulary.language.bada_(nigeria)=Bada (Nigeria) -controlledvocabulary.language.badaga=Badaga -controlledvocabulary.language.bade=Bade -controlledvocabulary.language.badeshi=Badeshi -controlledvocabulary.language.badimaya=Badimaya -controlledvocabulary.language.badjiri=Badjiri -controlledvocabulary.language.badui=Badui -controlledvocabulary.language.badyara=Badyara -controlledvocabulary.language.baeggu=Baeggu -controlledvocabulary.language.baelelea=Baelelea -controlledvocabulary.language.baetora=Baetora -controlledvocabulary.language.bafanji=Bafanji -controlledvocabulary.language.bafaw-balong=Bafaw-Balong -controlledvocabulary.language.bafia=Bafia -controlledvocabulary.language.bafut=Bafut -controlledvocabulary.language.baga_kaloum=Baga Kaloum -controlledvocabulary.language.baga_koga=Baga Koga -controlledvocabulary.language.baga_manduri=Baga Manduri -controlledvocabulary.language.baga_pokur=Baga Pokur -controlledvocabulary.language.baga_sitemu=Baga Sitemu -controlledvocabulary.language.baga_sobane=Baga Sobané -controlledvocabulary.language.bagheli=Bagheli -controlledvocabulary.language.bagirmi=Bagirmi -controlledvocabulary.language.bagirmi_fulfulde=Bagirmi Fulfulde -controlledvocabulary.language.bago-kusuntu=Bago-Kusuntu -controlledvocabulary.language.bagri=Bagri -controlledvocabulary.language.bagupi=Bagupi -controlledvocabulary.language.bagusa=Bagusa -controlledvocabulary.language.bagvalal=Bagvalal -controlledvocabulary.language.baha_buyang=Baha Buyang -controlledvocabulary.language.baham=Baham -controlledvocabulary.language.bahamas_creole_english=Bahamas Creole English -controlledvocabulary.language.baharna_arabic=Baharna Arabic -controlledvocabulary.language.bahau=Bahau -controlledvocabulary.language.bahinemo=Bahinemo -controlledvocabulary.language.bahing=Bahing -controlledvocabulary.language.bahnar=Bahnar -controlledvocabulary.language.bahonsuai=Bahonsuai -controlledvocabulary.language.bai_(south_sudan)=Bai (South Sudan) -controlledvocabulary.language.baibai=Baibai -controlledvocabulary.language.baikeno=Baikeno -controlledvocabulary.language.baima=Baima -controlledvocabulary.language.baimak=Baimak -controlledvocabulary.language.bainouk-gunyaamolo=Bainouk-Gunyaamolo -controlledvocabulary.language.bainouk-gunyuno=Bainouk-Gunyuño -controlledvocabulary.language.bainouk-samik=Bainouk-Samik -controlledvocabulary.language.baiso=Baiso -controlledvocabulary.language.baissa_fali=Baissa Fali -controlledvocabulary.language.bajan=Bajan -controlledvocabulary.language.bajelani=Bajelani -controlledvocabulary.language.bajjika=Bajjika -controlledvocabulary.language.baka_(cameroon)=Baka (Cameroon) -controlledvocabulary.language.baka_(south_sudan)=Baka (South Sudan) -controlledvocabulary.language.bakairi=Bakairí -controlledvocabulary.language.bakaka=Bakaka -controlledvocabulary.language.bakhtiari=Bakhtiari -controlledvocabulary.language.baki=Baki -controlledvocabulary.language.bakoko=Bakoko -controlledvocabulary.language.bakole=Bakole -controlledvocabulary.language.bakpinka=Bakpinka -controlledvocabulary.language.bakumpai=Bakumpai -controlledvocabulary.language.bakwe=Bakwé -controlledvocabulary.language.balaesang=Balaesang -controlledvocabulary.language.balaibalan=Balaibalan -controlledvocabulary.language.balangao=Balangao -controlledvocabulary.language.balangingi=Balangingi -controlledvocabulary.language.balanta-ganja=Balanta-Ganja -controlledvocabulary.language.balanta-kentohe=Balanta-Kentohe -controlledvocabulary.language.balantak=Balantak -controlledvocabulary.language.baldemu=Baldemu -controlledvocabulary.language.bali_(democratic_republic_of_congo)=Bali (Democratic Republic of Congo) -controlledvocabulary.language.bali_(nigeria)=Bali (Nigeria) -controlledvocabulary.language.balinese=Balinese -controlledvocabulary.language.balinese_malay=Balinese Malay -controlledvocabulary.language.balkan_gagauz_turkish=Balkan Gagauz Turkish -controlledvocabulary.language.balkan_romani=Balkan Romani -controlledvocabulary.language.balo=Balo -controlledvocabulary.language.baloi=Baloi -controlledvocabulary.language.balti=Balti -controlledvocabulary.language.baltic_romani=Baltic Romani -controlledvocabulary.language.baluan-pam=Baluan-Pam -controlledvocabulary.language.baluchi=Baluchi -controlledvocabulary.language.bamako_sign_language=Bamako Sign Language -controlledvocabulary.language.bamali=Bamali -controlledvocabulary.language.bambalang=Bambalang -controlledvocabulary.language.bambam=Bambam -controlledvocabulary.language.bambara=Bambara -controlledvocabulary.language.bambassi=Bambassi -controlledvocabulary.language.bambili-bambui=Bambili-Bambui -controlledvocabulary.language.bamenyam=Bamenyam -controlledvocabulary.language.bamu=Bamu -controlledvocabulary.language.bamukumbit=Bamukumbit -controlledvocabulary.language.bamun=Bamun -controlledvocabulary.language.bamunka=Bamunka -controlledvocabulary.language.bamwe=Bamwe -controlledvocabulary.language.ban_khor_sign_language=Ban Khor Sign Language -controlledvocabulary.language.bana=Bana -controlledvocabulary.language.banao_itneg=Banao Itneg -controlledvocabulary.language.banaro=Banaro -controlledvocabulary.language.banda_(indonesia)=Banda (Indonesia) -controlledvocabulary.language.banda_malay=Banda Malay -controlledvocabulary.language.banda-bambari=Banda-Bambari -controlledvocabulary.language.banda-banda=Banda-Banda -controlledvocabulary.language.banda-mbres=Banda-Mbrès -controlledvocabulary.language.banda-ndele=Banda-Ndélé -controlledvocabulary.language.banda-yangere=Banda-Yangere -controlledvocabulary.language.bandi=Bandi -controlledvocabulary.language.bandial=Bandial -controlledvocabulary.language.bandjalang=Bandjalang -controlledvocabulary.language.bangala=Bangala -controlledvocabulary.language.bangandu=Bangandu -controlledvocabulary.language.bangba=Bangba -controlledvocabulary.language.banggai=Banggai -controlledvocabulary.language.banggarla=Banggarla -controlledvocabulary.language.bangi=Bangi -controlledvocabulary.language.bangime=Bangime -controlledvocabulary.language.bangka=Bangka -controlledvocabulary.language.bangolan=Bangolan -controlledvocabulary.language.bangubangu=Bangubangu -controlledvocabulary.language.bangwinji=Bangwinji -controlledvocabulary.language.baniva=Baniva -controlledvocabulary.language.baniwa=Baniwa -controlledvocabulary.language.banjar=Banjar -controlledvocabulary.language.bankagooma=Bankagooma -controlledvocabulary.language.bankal=Bankal -controlledvocabulary.language.bankan_tey_dogon=Bankan Tey Dogon -controlledvocabulary.language.bankon=Bankon -controlledvocabulary.language.bannoni=Bannoni -controlledvocabulary.language.bantawa=Bantawa -controlledvocabulary.language.bantayanon=Bantayanon -controlledvocabulary.language.bantik=Bantik -controlledvocabulary.language.bantoanon=Bantoanon -controlledvocabulary.language.banyjima=Banyjima -controlledvocabulary.language.baoule=Baoulé -controlledvocabulary.language.bara_malagasy=Bara Malagasy -controlledvocabulary.language.baraamu=Baraamu -controlledvocabulary.language.barababaraba=Barababaraba -controlledvocabulary.language.barai=Barai -controlledvocabulary.language.barakai=Barakai -controlledvocabulary.language.baram_kayan=Baram Kayan -controlledvocabulary.language.barama=Barama -controlledvocabulary.language.barambu=Barambu -controlledvocabulary.language.baramu=Baramu -controlledvocabulary.language.barapasi=Barapasi -controlledvocabulary.language.baras=Baras -controlledvocabulary.language.barasana-eduria=Barasana-Eduria -controlledvocabulary.language.barbaram=Barbaram -controlledvocabulary.language.barbareno=Barbareño -controlledvocabulary.language.barclayville_grebo=Barclayville Grebo -controlledvocabulary.language.bardi=Bardi -controlledvocabulary.language.barein=Barein -controlledvocabulary.language.bargam=Bargam -controlledvocabulary.language.bari=Bari -controlledvocabulary.language.bariai=Bariai -controlledvocabulary.language.bariji=Bariji -controlledvocabulary.language.barikanchi=Barikanchi -controlledvocabulary.language.barikewa=Barikewa -controlledvocabulary.language.barok=Barok -controlledvocabulary.language.barombi=Barombi -controlledvocabulary.language.barro_negro_tunebo=Barro Negro Tunebo -controlledvocabulary.language.barrow_point=Barrow Point -controlledvocabulary.language.baruga=Baruga -controlledvocabulary.language.baruya=Baruya -controlledvocabulary.language.barwe=Barwe -controlledvocabulary.language.barzani_jewish_neo-aramaic=Barzani Jewish Neo-Aramaic -controlledvocabulary.language.bare=Baré -controlledvocabulary.language.basa_(cameroon)=Basa (Cameroon) -controlledvocabulary.language.basa_(nigeria)=Basa (Nigeria) -controlledvocabulary.language.basa-gumna=Basa-Gumna -controlledvocabulary.language.basa-gurmana=Basa-Gurmana -controlledvocabulary.language.basap=Basap -controlledvocabulary.language.basay=Basay -controlledvocabulary.language.bashkardi=Bashkardi -controlledvocabulary.language.bashkir=Bashkir -controlledvocabulary.language.basketo=Basketo -controlledvocabulary.language.basque=Basque -controlledvocabulary.language.bassa=Bassa -controlledvocabulary.language.bassa-kontagora=Bassa-Kontagora -controlledvocabulary.language.bassari=Bassari -controlledvocabulary.language.bassossi=Bassossi -controlledvocabulary.language.bata=Bata -controlledvocabulary.language.batad_ifugao=Batad Ifugao -controlledvocabulary.language.batak=Batak -controlledvocabulary.language.batak_alas-kluet=Batak Alas-Kluet -controlledvocabulary.language.batak_angkola=Batak Angkola -controlledvocabulary.language.batak_dairi=Batak Dairi -controlledvocabulary.language.batak_karo=Batak Karo -controlledvocabulary.language.batak_mandailing=Batak Mandailing -controlledvocabulary.language.batak_simalungun=Batak Simalungun -controlledvocabulary.language.batak_toba=Batak Toba -controlledvocabulary.language.batanga=Batanga -controlledvocabulary.language.batek=Batek -controlledvocabulary.language.bateri=Bateri -controlledvocabulary.language.bathari=Bathari -controlledvocabulary.language.bati_(cameroon)=Bati (Cameroon) -controlledvocabulary.language.bati_(indonesia)=Bati (Indonesia) -controlledvocabulary.language.batjala=Batjala -controlledvocabulary.language.bats=Bats -controlledvocabulary.language.batu=Batu -controlledvocabulary.language.batui=Batui -controlledvocabulary.language.batuley=Batuley -controlledvocabulary.language.bau=Bau -controlledvocabulary.language.bau_bidayuh=Bau Bidayuh -controlledvocabulary.language.bauchi=Bauchi -controlledvocabulary.language.bauni=Bauni -controlledvocabulary.language.baure=Baure -controlledvocabulary.language.bauria=Bauria -controlledvocabulary.language.bauwaki=Bauwaki -controlledvocabulary.language.bauzi=Bauzi -controlledvocabulary.language.bavarian=Bavarian -controlledvocabulary.language.bawm_chin=Bawm Chin -controlledvocabulary.language.bay_miwok=Bay Miwok -controlledvocabulary.language.bayali=Bayali -controlledvocabulary.language.baybayanon=Baybayanon -controlledvocabulary.language.baygo=Baygo -controlledvocabulary.language.bayono=Bayono -controlledvocabulary.language.bayot=Bayot -controlledvocabulary.language.bayungu=Bayungu -controlledvocabulary.language.bazigar=Bazigar -controlledvocabulary.language.beami=Beami -controlledvocabulary.language.beaver=Beaver -controlledvocabulary.language.beba=Beba -controlledvocabulary.language.bebele=Bebele -controlledvocabulary.language.bebeli=Bebeli -controlledvocabulary.language.bebil=Bebil -controlledvocabulary.language.bedjond=Bedjond -controlledvocabulary.language.bedoanas=Bedoanas -controlledvocabulary.language.beeke=Beeke -controlledvocabulary.language.beele=Beele -controlledvocabulary.language.beembe=Beembe -controlledvocabulary.language.beezen=Beezen -controlledvocabulary.language.befang=Befang -controlledvocabulary.language.beginci=Beginci -controlledvocabulary.language.beja=Beja -controlledvocabulary.language.bekati'=Bekati' -controlledvocabulary.language.bekwarra=Bekwarra -controlledvocabulary.language.bekwel=Bekwel -controlledvocabulary.language.belait=Belait -controlledvocabulary.language.belanda_bor=Belanda Bor -controlledvocabulary.language.belanda_viri=Belanda Viri -controlledvocabulary.language.belarusian=Belarusian -controlledvocabulary.language.belhariya=Belhariya -controlledvocabulary.language.beli_(papua_new_guinea)=Beli (Papua New Guinea) -controlledvocabulary.language.beli_(south_sudan)=Beli (South Sudan) -controlledvocabulary.language.belize_kriol_english=Belize Kriol English -controlledvocabulary.language.bella_coola=Bella Coola -controlledvocabulary.language.bellari=Bellari -controlledvocabulary.language.belning=Belning -controlledvocabulary.language.bemba_(zambia)=Bemba (Zambia) -controlledvocabulary.language.bembe=Bembe -controlledvocabulary.language.ben_tey_dogon=Ben Tey Dogon -controlledvocabulary.language.bena_(nigeria)=Bena (Nigeria) -controlledvocabulary.language.bena_(tanzania)=Bena (Tanzania) -controlledvocabulary.language.benabena=Benabena -controlledvocabulary.language.benamanga=Benamanga -controlledvocabulary.language.bench=Bench -controlledvocabulary.language.bende=Bende -controlledvocabulary.language.bendi=Bendi -controlledvocabulary.language.beng=Beng -controlledvocabulary.language.benga=Benga -controlledvocabulary.language.bengali,_bangla=Bengali, Bangla -controlledvocabulary.language.benggoi=Benggoi -controlledvocabulary.language.bengkala_sign_language=Bengkala Sign Language -controlledvocabulary.language.bentong=Bentong -controlledvocabulary.language.benyadu'=Benyadu' -controlledvocabulary.language.beothuk=Beothuk -controlledvocabulary.language.bepour=Bepour -controlledvocabulary.language.berakou=Berakou -controlledvocabulary.language.berau_malay=Berau Malay -controlledvocabulary.language.berbice_creole_dutch=Berbice Creole Dutch -controlledvocabulary.language.berik=Berik -controlledvocabulary.language.berinomo=Berinomo -controlledvocabulary.language.berom=Berom -controlledvocabulary.language.berta=Berta -controlledvocabulary.language.berti=Berti -controlledvocabulary.language.besisi=Besisi -controlledvocabulary.language.besme=Besme -controlledvocabulary.language.besoa=Besoa -controlledvocabulary.language.betaf=Betaf -controlledvocabulary.language.betawi=Betawi -controlledvocabulary.language.bete=Bete -controlledvocabulary.language.bete-bendi=Bete-Bendi -controlledvocabulary.language.beti_(cote_d'ivoire)=Beti (Côte d'Ivoire) -controlledvocabulary.language.betta_kurumba=Betta Kurumba -controlledvocabulary.language.bezhta=Bezhta -controlledvocabulary.language.bhadrawahi=Bhadrawahi -controlledvocabulary.language.bhalay=Bhalay -controlledvocabulary.language.bharia=Bharia -controlledvocabulary.language.bhatri=Bhatri -controlledvocabulary.language.bhattiyali=Bhattiyali -controlledvocabulary.language.bhaya=Bhaya -controlledvocabulary.language.bhele=Bhele -controlledvocabulary.language.bhilali=Bhilali -controlledvocabulary.language.bhili=Bhili -controlledvocabulary.language.bhojpuri=Bhojpuri -controlledvocabulary.language.bhoti_kinnauri=Bhoti Kinnauri -controlledvocabulary.language.bhujel=Bhujel -controlledvocabulary.language.bhunjia=Bhunjia -controlledvocabulary.language.biafada=Biafada -controlledvocabulary.language.biage=Biage -controlledvocabulary.language.biak=Biak -controlledvocabulary.language.biali=Biali -controlledvocabulary.language.bian_marind=Bian Marind -controlledvocabulary.language.biangai=Biangai -controlledvocabulary.language.biao=Biao -controlledvocabulary.language.biao_mon=Biao Mon -controlledvocabulary.language.biao-jiao_mien=Biao-Jiao Mien -controlledvocabulary.language.biatah_bidayuh=Biatah Bidayuh -controlledvocabulary.language.bibbulman=Bibbulman -controlledvocabulary.language.bidhawal=Bidhawal -controlledvocabulary.language.bidiyo=Bidiyo -controlledvocabulary.language.bidjara=Bidjara -controlledvocabulary.language.bidyogo=Bidyogo -controlledvocabulary.language.biem=Biem -controlledvocabulary.language.bierebo=Bierebo -controlledvocabulary.language.bieria=Bieria -controlledvocabulary.language.biete=Biete -controlledvocabulary.language.big_nambas=Big Nambas -controlledvocabulary.language.biga=Biga -controlledvocabulary.language.bigambal=Bigambal -controlledvocabulary.language.bih=Bih -controlledvocabulary.language.bihari=Bihari -controlledvocabulary.language.bijim=Bijim -controlledvocabulary.language.bijori=Bijori -controlledvocabulary.language.bikol=Bikol -controlledvocabulary.language.bikya=Bikya -controlledvocabulary.language.bila=Bila -controlledvocabulary.language.bilakura=Bilakura -controlledvocabulary.language.bilaspuri=Bilaspuri -controlledvocabulary.language.bilba=Bilba -controlledvocabulary.language.bilbil=Bilbil -controlledvocabulary.language.bile=Bile -controlledvocabulary.language.bilin=Bilin -controlledvocabulary.language.bilma_kanuri=Bilma Kanuri -controlledvocabulary.language.biloxi=Biloxi -controlledvocabulary.language.bilua=Bilua -controlledvocabulary.language.bilur=Bilur -controlledvocabulary.language.bima=Bima -controlledvocabulary.language.bimin=Bimin -controlledvocabulary.language.bimoba=Bimoba -controlledvocabulary.language.bina_(nigeria)=Bina (Nigeria) -controlledvocabulary.language.bina_(papua_new_guinea)=Bina (Papua New Guinea) -controlledvocabulary.language.binahari=Binahari -controlledvocabulary.language.binandere=Binandere -controlledvocabulary.language.bindal=Bindal -controlledvocabulary.language.bine=Bine -controlledvocabulary.language.bini=Bini -controlledvocabulary.language.binji=Binji -controlledvocabulary.language.binongan_itneg=Binongan Itneg -controlledvocabulary.language.bintauna=Bintauna -controlledvocabulary.language.bintulu=Bintulu -controlledvocabulary.language.binukid=Binukid -controlledvocabulary.language.binumarien=Binumarien -controlledvocabulary.language.bipi=Bipi -controlledvocabulary.language.bira=Bira -controlledvocabulary.language.birale=Birale -controlledvocabulary.language.birao=Birao -controlledvocabulary.language.birgit=Birgit -controlledvocabulary.language.birhor=Birhor -controlledvocabulary.language.biri=Biri -controlledvocabulary.language.biritai=Biritai -controlledvocabulary.language.birked=Birked -controlledvocabulary.language.birri=Birri -controlledvocabulary.language.birrpayi=Birrpayi -controlledvocabulary.language.birwa=Birwa -controlledvocabulary.language.biseni=Biseni -controlledvocabulary.language.bishnupriya=Bishnupriya -controlledvocabulary.language.bishuo=Bishuo -controlledvocabulary.language.bisis=Bisis -controlledvocabulary.language.bislama=Bislama -controlledvocabulary.language.bisorio=Bisorio -controlledvocabulary.language.bissa=Bissa -controlledvocabulary.language.bisu=Bisu -controlledvocabulary.language.bit=Bit -controlledvocabulary.language.bitare=Bitare -controlledvocabulary.language.bitur=Bitur -controlledvocabulary.language.biwat=Biwat -controlledvocabulary.language.biyo=Biyo -controlledvocabulary.language.biyom=Biyom -controlledvocabulary.language.blablanga=Blablanga -controlledvocabulary.language.blafe=Blafe -controlledvocabulary.language.blagar=Blagar -controlledvocabulary.language.blang=Blang -controlledvocabulary.language.blissymbols=Blissymbols -controlledvocabulary.language.bo_(laos)=Bo (Laos) -controlledvocabulary.language.bo_(papua_new_guinea)=Bo (Papua New Guinea) -controlledvocabulary.language.bo-rukul=Bo-Rukul -controlledvocabulary.language.bo-ung=Bo-Ung -controlledvocabulary.language.boano_(maluku)=Boano (Maluku) -controlledvocabulary.language.boano_(sulawesi)=Boano (Sulawesi) -controlledvocabulary.language.bobongko=Bobongko -controlledvocabulary.language.bobot=Bobot -controlledvocabulary.language.bodo_(central_african_republic)=Bodo (Central African Republic) -controlledvocabulary.language.bodo_(india)=Bodo (India) -controlledvocabulary.language.bodo_gadaba=Bodo Gadaba -controlledvocabulary.language.bodo_parja=Bodo Parja -controlledvocabulary.language.bofi=Bofi -controlledvocabulary.language.boga=Boga -controlledvocabulary.language.bogaya=Bogaya -controlledvocabulary.language.boghom=Boghom -controlledvocabulary.language.boguru=Boguru -controlledvocabulary.language.bohtan_neo-aramaic=Bohtan Neo-Aramaic -controlledvocabulary.language.boikin=Boikin -controlledvocabulary.language.bokha=Bokha -controlledvocabulary.language.boko_(benin)=Boko (Benin) -controlledvocabulary.language.boko_(democratic_republic_of_congo)=Boko (Democratic Republic of Congo) -controlledvocabulary.language.bokobaru=Bokobaru -controlledvocabulary.language.bokoto=Bokoto -controlledvocabulary.language.bokyi=Bokyi -controlledvocabulary.language.bola=Bola -controlledvocabulary.language.bolango=Bolango -controlledvocabulary.language.bole=Bole -controlledvocabulary.language.bolgarian=Bolgarian -controlledvocabulary.language.bolgo=Bolgo -controlledvocabulary.language.bolia=Bolia -controlledvocabulary.language.bolinao=Bolinao -controlledvocabulary.language.bolivian_sign_language=Bolivian Sign Language -controlledvocabulary.language.boloki=Boloki -controlledvocabulary.language.bolon=Bolon -controlledvocabulary.language.bolondo=Bolondo -controlledvocabulary.language.bolongan=Bolongan -controlledvocabulary.language.bolyu=Bolyu -controlledvocabulary.language.bom-kim=Bom-Kim -controlledvocabulary.language.boma=Boma -controlledvocabulary.language.bomboli=Bomboli -controlledvocabulary.language.bomboma=Bomboma -controlledvocabulary.language.bomitaba=Bomitaba -controlledvocabulary.language.bomu=Bomu -controlledvocabulary.language.bomwali=Bomwali -controlledvocabulary.language.bon_gula=Bon Gula -controlledvocabulary.language.bonan=Bonan -controlledvocabulary.language.bondei=Bondei -controlledvocabulary.language.bondo=Bondo -controlledvocabulary.language.bondoukou_kulango=Bondoukou Kulango -controlledvocabulary.language.bondum_dom_dogon=Bondum Dom Dogon -controlledvocabulary.language.bonerate=Bonerate -controlledvocabulary.language.bonerif=Bonerif -controlledvocabulary.language.bonggi=Bonggi -controlledvocabulary.language.bonggo=Bonggo -controlledvocabulary.language.bongili=Bongili -controlledvocabulary.language.bongo=Bongo -controlledvocabulary.language.bongu=Bongu -controlledvocabulary.language.bonjo=Bonjo -controlledvocabulary.language.bonkeng=Bonkeng -controlledvocabulary.language.bonkiman=Bonkiman -controlledvocabulary.language.bontok=Bontok -controlledvocabulary.language.bookan=Bookan -controlledvocabulary.language.boon=Boon -controlledvocabulary.language.boor=Boor -controlledvocabulary.language.bora=Bora -controlledvocabulary.language.borana-arsi-guji_oromo=Borana-Arsi-Guji Oromo -controlledvocabulary.language.border_kuna=Border Kuna -controlledvocabulary.language.borei=Borei -controlledvocabulary.language.borgu_fulfulde=Borgu Fulfulde -controlledvocabulary.language.boro_(ethiopia)=Boro (Ethiopia) -controlledvocabulary.language.boro_(ghana)=Boro (Ghana) -controlledvocabulary.language.borong=Borong -controlledvocabulary.language.boruca=Boruca -controlledvocabulary.language.bororo=Borôro -controlledvocabulary.language.boselewa=Boselewa -controlledvocabulary.language.bosngun=Bosngun -controlledvocabulary.language.bosnian=Bosnian -controlledvocabulary.language.bote-majhi=Bote-Majhi -controlledvocabulary.language.botlikh=Botlikh -controlledvocabulary.language.botolan_sambal=Botolan Sambal -controlledvocabulary.language.bouna_kulango=Bouna Kulango -controlledvocabulary.language.bouni=Bouni -controlledvocabulary.language.bouyei=Bouyei -controlledvocabulary.language.bozaba=Bozaba -controlledvocabulary.language.bragat=Bragat -controlledvocabulary.language.brahui=Brahui -controlledvocabulary.language.braj=Braj -controlledvocabulary.language.brao=Brao -controlledvocabulary.language.brazilian_sign_language=Brazilian Sign Language -controlledvocabulary.language.brem=Brem -controlledvocabulary.language.breri=Breri -controlledvocabulary.language.breton=Breton -controlledvocabulary.language.bribri=Bribri -controlledvocabulary.language.bribri_sign_language=Bribri Sign Language -controlledvocabulary.language.brithenig=Brithenig -controlledvocabulary.language.british_sign_language=British Sign Language -controlledvocabulary.language.brokkat=Brokkat -controlledvocabulary.language.brokpake=Brokpake -controlledvocabulary.language.brokskat=Brokskat -controlledvocabulary.language.brooke's_point_palawano=Brooke's Point Palawano -controlledvocabulary.language.broome_pearling_lugger_pidgin=Broome Pearling Lugger Pidgin -controlledvocabulary.language.brunca_sign_language=Brunca Sign Language -controlledvocabulary.language.brunei=Brunei -controlledvocabulary.language.brunei_bisaya=Brunei Bisaya -controlledvocabulary.language.bruny_island_tasmanian=Bruny Island Tasmanian -controlledvocabulary.language.bu_(bauchi_state)=Bu (Bauchi State) -controlledvocabulary.language.bu_(kaduna_state)=Bu (Kaduna State) -controlledvocabulary.language.bu-nao_bunu=Bu-Nao Bunu -controlledvocabulary.language.bua=Bua -controlledvocabulary.language.bualkhaw_chin=Bualkhaw Chin -controlledvocabulary.language.buamu=Buamu -controlledvocabulary.language.bube=Bube -controlledvocabulary.language.bubi=Bubi -controlledvocabulary.language.bubia=Bubia -controlledvocabulary.language.budeh_stieng=Budeh Stieng -controlledvocabulary.language.budibud=Budibud -controlledvocabulary.language.budong-budong=Budong-Budong -controlledvocabulary.language.budu=Budu -controlledvocabulary.language.budukh=Budukh -controlledvocabulary.language.buduma=Buduma -controlledvocabulary.language.budza=Budza -controlledvocabulary.language.bugan=Bugan -controlledvocabulary.language.bugawac=Bugawac -controlledvocabulary.language.bughotu=Bughotu -controlledvocabulary.language.buginese=Buginese -controlledvocabulary.language.buglere=Buglere -controlledvocabulary.language.bugun=Bugun -controlledvocabulary.language.buhi'non_bikol=Buhi'non Bikol -controlledvocabulary.language.buhid=Buhid -controlledvocabulary.language.buhutu=Buhutu -controlledvocabulary.language.bukar-sadung_bidayuh=Bukar-Sadung Bidayuh -controlledvocabulary.language.bukat=Bukat -controlledvocabulary.language.bukharic=Bukharic -controlledvocabulary.language.bukit_malay=Bukit Malay -controlledvocabulary.language.bukitan=Bukitan -controlledvocabulary.language.bukiyip=Bukiyip -controlledvocabulary.language.buksa=Buksa -controlledvocabulary.language.bukusu=Bukusu -controlledvocabulary.language.bukwen=Bukwen -controlledvocabulary.language.bulgarian=Bulgarian -controlledvocabulary.language.bulgarian_sign_language=Bulgarian Sign Language -controlledvocabulary.language.bulgebi=Bulgebi -controlledvocabulary.language.buli=Buli -controlledvocabulary.language.buli_(ghana)=Buli (Ghana) -controlledvocabulary.language.buli_(indonesia)=Buli (Indonesia) -controlledvocabulary.language.bullom_so=Bullom So -controlledvocabulary.language.bulo_stieng=Bulo Stieng -controlledvocabulary.language.bulu_(cameroon)=Bulu (Cameroon) -controlledvocabulary.language.bulu_(papua_new_guinea)=Bulu (Papua New Guinea) -controlledvocabulary.language.bum=Bum -controlledvocabulary.language.bumaji=Bumaji -controlledvocabulary.language.bumang=Bumang -controlledvocabulary.language.bumbita_arapesh=Bumbita Arapesh -controlledvocabulary.language.bumthangkha=Bumthangkha -controlledvocabulary.language.bun=Bun -controlledvocabulary.language.buna=Buna -controlledvocabulary.language.bunak=Bunak -controlledvocabulary.language.bunama=Bunama -controlledvocabulary.language.bundeli=Bundeli -controlledvocabulary.language.bung=Bung -controlledvocabulary.language.bungain=Bungain -controlledvocabulary.language.bunganditj=Bunganditj -controlledvocabulary.language.bungku=Bungku -controlledvocabulary.language.bungu=Bungu -controlledvocabulary.language.bunoge_dogon=Bunoge Dogon -controlledvocabulary.language.bunuba=Bunuba -controlledvocabulary.language.bunun=Bunun -controlledvocabulary.language.buol=Buol -controlledvocabulary.language.bura-pabir=Bura-Pabir -controlledvocabulary.language.burak=Burak -controlledvocabulary.language.buraka=Buraka -controlledvocabulary.language.burarra=Burarra -controlledvocabulary.language.burate=Burate -controlledvocabulary.language.burduna=Burduna -controlledvocabulary.language.bure=Bure -controlledvocabulary.language.buriat=Buriat -controlledvocabulary.language.burji=Burji -controlledvocabulary.language.burmbar=Burmbar -controlledvocabulary.language.burmese=Burmese -controlledvocabulary.language.burmeso=Burmeso -controlledvocabulary.language.buru_(indonesia)=Buru (Indonesia) -controlledvocabulary.language.buru_(nigeria)=Buru (Nigeria) -controlledvocabulary.language.burui=Burui -controlledvocabulary.language.burumakok=Burumakok -controlledvocabulary.language.burun=Burun -controlledvocabulary.language.burundian_sign_language=Burundian Sign Language -controlledvocabulary.language.burunge=Burunge -controlledvocabulary.language.burushaski=Burushaski -controlledvocabulary.language.burusu=Burusu -controlledvocabulary.language.buruwai=Buruwai -controlledvocabulary.language.busa=Busa -controlledvocabulary.language.busam=Busam -controlledvocabulary.language.busami=Busami -controlledvocabulary.language.busang_kayan=Busang Kayan -controlledvocabulary.language.bushi=Bushi -controlledvocabulary.language.bushoong=Bushoong -controlledvocabulary.language.buso=Buso -controlledvocabulary.language.busoa=Busoa -controlledvocabulary.language.bussa=Bussa -controlledvocabulary.language.busuu=Busuu -controlledvocabulary.language.butbut_kalinga=Butbut Kalinga -controlledvocabulary.language.butmas-tur=Butmas-Tur -controlledvocabulary.language.butuanon=Butuanon -controlledvocabulary.language.buwal=Buwal -controlledvocabulary.language.buyu=Buyu -controlledvocabulary.language.buyuan_jinuo=Buyuan Jinuo -controlledvocabulary.language.bwa=Bwa -controlledvocabulary.language.bwaidoka=Bwaidoka -controlledvocabulary.language.bwanabwana=Bwanabwana -controlledvocabulary.language.bwatoo=Bwatoo -controlledvocabulary.language.bwe_karen=Bwe Karen -controlledvocabulary.language.bwela=Bwela -controlledvocabulary.language.bwile=Bwile -controlledvocabulary.language.bwisi=Bwisi -controlledvocabulary.language.byangsi=Byangsi -controlledvocabulary.language.byep=Byep -controlledvocabulary.language.badi_kanum=Bädi Kanum -controlledvocabulary.language.c'lela=C'Lela -controlledvocabulary.language.caac=Caac -controlledvocabulary.language.cabiyari=Cabiyarí -controlledvocabulary.language.cabecar=Cabécar -controlledvocabulary.language.cacaloxtepec_mixtec=Cacaloxtepec Mixtec -controlledvocabulary.language.cacaopera=Cacaopera -controlledvocabulary.language.cacgia_roglai=Cacgia Roglai -controlledvocabulary.language.cacua=Cacua -controlledvocabulary.language.caddo=Caddo -controlledvocabulary.language.cafundo_creole=Cafundo Creole -controlledvocabulary.language.cahuarano=Cahuarano -controlledvocabulary.language.cahuilla=Cahuilla -controlledvocabulary.language.cajamarca_quechua=Cajamarca Quechua -controlledvocabulary.language.cajatambo_north_lima_quechua=Cajatambo North Lima Quechua -controlledvocabulary.language.cajonos_zapotec=Cajonos Zapotec -controlledvocabulary.language.cajun_french=Cajun French -controlledvocabulary.language.caka=Caka -controlledvocabulary.language.cakchiquel-quiche_mixed_language=Cakchiquel-Quiché Mixed Language -controlledvocabulary.language.cakfem-mushere=Cakfem-Mushere -controlledvocabulary.language.calamian_tagbanwa=Calamian Tagbanwa -controlledvocabulary.language.calderon_highland_quichua=Calderón Highland Quichua -controlledvocabulary.language.callawalla=Callawalla -controlledvocabulary.language.caluyanun=Caluyanun -controlledvocabulary.language.calo=Caló -controlledvocabulary.language.cambodian_sign_language=Cambodian Sign Language -controlledvocabulary.language.cameroon_mambila=Cameroon Mambila -controlledvocabulary.language.cameroon_pidgin=Cameroon Pidgin -controlledvocabulary.language.camling=Camling -controlledvocabulary.language.campalagian=Campalagian -controlledvocabulary.language.campidanese_sardinian=Campidanese Sardinian -controlledvocabulary.language.camsa=Camsá -controlledvocabulary.language.camtho=Camtho -controlledvocabulary.language.camunic=Camunic -controlledvocabulary.language.candoshi-shapra=Candoshi-Shapra -controlledvocabulary.language.canela=Canela -controlledvocabulary.language.canichana=Canichana -controlledvocabulary.language.cao_lan=Cao Lan -controlledvocabulary.language.cao_miao=Cao Miao -controlledvocabulary.language.capanahua=Capanahua -controlledvocabulary.language.capiznon=Capiznon -controlledvocabulary.language.cappadocian_greek=Cappadocian Greek -controlledvocabulary.language.caquinte=Caquinte -controlledvocabulary.language.car_nicobarese=Car Nicobarese -controlledvocabulary.language.cara=Cara -controlledvocabulary.language.carabayo=Carabayo -controlledvocabulary.language.caramanta=Caramanta -controlledvocabulary.language.carapana=Carapana -controlledvocabulary.language.carian=Carian -controlledvocabulary.language.caribbean_hindustani=Caribbean Hindustani -controlledvocabulary.language.caribbean_javanese=Caribbean Javanese -controlledvocabulary.language.carijona=Carijona -controlledvocabulary.language.carolina_algonquian=Carolina Algonquian -controlledvocabulary.language.carolinian=Carolinian -controlledvocabulary.language.carpathian_romani=Carpathian Romani -controlledvocabulary.language.carrier=Carrier -controlledvocabulary.language.cashibo-cacataibo=Cashibo-Cacataibo -controlledvocabulary.language.cashinahua=Cashinahua -controlledvocabulary.language.casiguran_dumagat_agta=Casiguran Dumagat Agta -controlledvocabulary.language.castilian,_spanish=Castilian, Spanish -controlledvocabulary.language.casuarina_coast_asmat=Casuarina Coast Asmat -controlledvocabulary.language.catalan_sign_language=Catalan Sign Language -controlledvocabulary.language.catalan,_valencian=Catalan, Valencian -controlledvocabulary.language.catawba=Catawba -controlledvocabulary.language.cavinena=Cavineña -controlledvocabulary.language.cayubaba=Cayubaba -controlledvocabulary.language.cayuga=Cayuga -controlledvocabulary.language.cayuse=Cayuse -controlledvocabulary.language.canar_highland_quichua=Cañar Highland Quichua -controlledvocabulary.language.cahungwarya=Ca̱hungwa̱rya̱ -controlledvocabulary.language.cebaara_senoufo=Cebaara Senoufo -controlledvocabulary.language.cebuano=Cebuano -controlledvocabulary.language.celtiberian=Celtiberian -controlledvocabulary.language.cemuhi=Cemuhî -controlledvocabulary.language.cen=Cen -controlledvocabulary.language.central_asmat=Central Asmat -controlledvocabulary.language.central_atlas_tamazight=Central Atlas Tamazight -controlledvocabulary.language.central_awyu=Central Awyu -controlledvocabulary.language.central_aymara=Central Aymara -controlledvocabulary.language.central_bai=Central Bai -controlledvocabulary.language.central_berawan=Central Berawan -controlledvocabulary.language.central_bikol=Central Bikol -controlledvocabulary.language.central_bontok=Central Bontok -controlledvocabulary.language.central_cagayan_agta=Central Cagayan Agta -controlledvocabulary.language.central_grebo=Central Grebo -controlledvocabulary.language.central_hongshuihe_zhuang=Central Hongshuihe Zhuang -controlledvocabulary.language.central_huasteca_nahuatl=Central Huasteca Nahuatl -controlledvocabulary.language.central_huishui_hmong=Central Huishui Hmong -controlledvocabulary.language.central_kanuri=Central Kanuri -controlledvocabulary.language.central_kurdish=Central Kurdish -controlledvocabulary.language.central_maewo=Central Maewo -controlledvocabulary.language.central_malay=Central Malay -controlledvocabulary.language.central_masela=Central Masela -controlledvocabulary.language.central_mashan_hmong=Central Mashan Hmong -controlledvocabulary.language.central_mazahua=Central Mazahua -controlledvocabulary.language.central_melanau=Central Melanau -controlledvocabulary.language.central_mnong=Central Mnong -controlledvocabulary.language.central_nahuatl=Central Nahuatl -controlledvocabulary.language.central_nicobarese=Central Nicobarese -controlledvocabulary.language.central_ojibwa=Central Ojibwa -controlledvocabulary.language.central_okinawan=Central Okinawan -controlledvocabulary.language.central_palawano=Central Palawano -controlledvocabulary.language.central_pame=Central Pame -controlledvocabulary.language.central_pashto=Central Pashto -controlledvocabulary.language.central_pomo=Central Pomo -controlledvocabulary.language.central_puebla_nahuatl=Central Puebla Nahuatl -controlledvocabulary.language.central_sama=Central Sama -controlledvocabulary.language.central_siberian_yupik=Central Siberian Yupik -controlledvocabulary.language.central_sierra_miwok=Central Sierra Miwok -controlledvocabulary.language.central_subanen=Central Subanen -controlledvocabulary.language.central_tagbanwa=Central Tagbanwa -controlledvocabulary.language.central_tarahumara=Central Tarahumara -controlledvocabulary.language.central_tunebo=Central Tunebo -controlledvocabulary.language.central_yupik=Central Yupik -controlledvocabulary.language.central-eastern_niger_fulfulde=Central-Eastern Niger Fulfulde -controlledvocabulary.language.centuum=Centúúm -controlledvocabulary.language.cerma=Cerma -controlledvocabulary.language.cha'ari=Cha'ari -controlledvocabulary.language.chabu=Chabu -controlledvocabulary.language.chachapoyas_quechua=Chachapoyas Quechua -controlledvocabulary.language.chachi=Chachi -controlledvocabulary.language.chadian_arabic=Chadian Arabic -controlledvocabulary.language.chadian_sign_language=Chadian Sign Language -controlledvocabulary.language.chadong=Chadong -controlledvocabulary.language.chagatai=Chagatai -controlledvocabulary.language.chaima=Chaima -controlledvocabulary.language.chak=Chak -controlledvocabulary.language.chakali=Chakali -controlledvocabulary.language.chakavian=Chakavian -controlledvocabulary.language.chakma=Chakma -controlledvocabulary.language.chala=Chala -controlledvocabulary.language.chaldean_neo-aramaic=Chaldean Neo-Aramaic -controlledvocabulary.language.chalikha=Chalikha -controlledvocabulary.language.chamacoco=Chamacoco -controlledvocabulary.language.chamalal=Chamalal -controlledvocabulary.language.chambeali=Chambeali -controlledvocabulary.language.chambri=Chambri -controlledvocabulary.language.chamicuro=Chamicuro -controlledvocabulary.language.chamorro=Chamorro -controlledvocabulary.language.chang_naga=Chang Naga -controlledvocabulary.language.changriwa=Changriwa -controlledvocabulary.language.changthang=Changthang -controlledvocabulary.language.chantyal=Chantyal -controlledvocabulary.language.chane=Chané -controlledvocabulary.language.chara=Chara -controlledvocabulary.language.chaudangsi=Chaudangsi -controlledvocabulary.language.chaura=Chaura -controlledvocabulary.language.chavacano=Chavacano -controlledvocabulary.language.chayahuita=Chayahuita -controlledvocabulary.language.chayuco_mixtec=Chayuco Mixtec -controlledvocabulary.language.chazumba_mixtec=Chazumba Mixtec -controlledvocabulary.language.che=Che -controlledvocabulary.language.chechen=Chechen -controlledvocabulary.language.cheke_holo=Cheke Holo -controlledvocabulary.language.chemakum=Chemakum -controlledvocabulary.language.chenapian=Chenapian -controlledvocabulary.language.chenchu=Chenchu -controlledvocabulary.language.chenoua=Chenoua -controlledvocabulary.language.chepang=Chepang -controlledvocabulary.language.chepya=Chepya -controlledvocabulary.language.cherepon=Cherepon -controlledvocabulary.language.cherokee=Cherokee -controlledvocabulary.language.chesu=Chesu -controlledvocabulary.language.chetco=Chetco -controlledvocabulary.language.chewong=Chewong -controlledvocabulary.language.cheyenne=Cheyenne -controlledvocabulary.language.chhattisgarhi=Chhattisgarhi -controlledvocabulary.language.chhintange=Chhintange -controlledvocabulary.language.chhulung=Chhulung -controlledvocabulary.language.chiangmai_sign_language=Chiangmai Sign Language -controlledvocabulary.language.chiapanec=Chiapanec -controlledvocabulary.language.chibcha=Chibcha -controlledvocabulary.language.chicahuaxtla_triqui=Chicahuaxtla Triqui -controlledvocabulary.language.chichewa,_chewa,_nyanja=Chichewa, Chewa, Nyanja -controlledvocabulary.language.chichicapan_zapotec=Chichicapan Zapotec -controlledvocabulary.language.chichimeca-jonaz=Chichimeca-Jonaz -controlledvocabulary.language.chickasaw=Chickasaw -controlledvocabulary.language.chicomuceltec=Chicomuceltec -controlledvocabulary.language.chiga=Chiga -controlledvocabulary.language.chigmecatitlan_mixtec=Chigmecatitlán Mixtec -controlledvocabulary.language.chilcotin=Chilcotin -controlledvocabulary.language.chilean_sign_language=Chilean Sign Language -controlledvocabulary.language.chilisso=Chilisso -controlledvocabulary.language.chiltepec_chinantec=Chiltepec Chinantec -controlledvocabulary.language.chimalapa_zoque=Chimalapa Zoque -controlledvocabulary.language.chimariko=Chimariko -controlledvocabulary.language.chimborazo_highland_quichua=Chimborazo Highland Quichua -controlledvocabulary.language.chimila=Chimila -controlledvocabulary.language.china_buriat=China Buriat -controlledvocabulary.language.chinali=Chinali -controlledvocabulary.language.chinbon_chin=Chinbon Chin -controlledvocabulary.language.chincha_quechua=Chincha Quechua -controlledvocabulary.language.chinese=Chinese -controlledvocabulary.language.chinese_pidgin_english=Chinese Pidgin English -controlledvocabulary.language.chinese_sign_language=Chinese Sign Language -controlledvocabulary.language.chinook=Chinook -controlledvocabulary.language.chinook_jargon=Chinook jargon -controlledvocabulary.language.chipaya=Chipaya -controlledvocabulary.language.chipewyan=Chipewyan -controlledvocabulary.language.chippewa=Chippewa -controlledvocabulary.language.chiquihuitlan_mazatec=Chiquihuitlán Mazatec -controlledvocabulary.language.chiquitano=Chiquitano -controlledvocabulary.language.chiquian_ancash_quechua=Chiquián Ancash Quechua -controlledvocabulary.language.chiripa=Chiripá -controlledvocabulary.language.chiru=Chiru -controlledvocabulary.language.chitimacha=Chitimacha -controlledvocabulary.language.chitkuli_kinnauri=Chitkuli Kinnauri -controlledvocabulary.language.chittagonian=Chittagonian -controlledvocabulary.language.chitwania_tharu=Chitwania Tharu -controlledvocabulary.language.choapan_zapotec=Choapan Zapotec -controlledvocabulary.language.chocangacakha=Chocangacakha -controlledvocabulary.language.chochotec=Chochotec -controlledvocabulary.language.choctaw=Choctaw -controlledvocabulary.language.chodri=Chodri -controlledvocabulary.language.chokri_naga=Chokri Naga -controlledvocabulary.language.chokwe=Chokwe -controlledvocabulary.language.chol=Chol -controlledvocabulary.language.cholon=Cholón -controlledvocabulary.language.chong=Chong -controlledvocabulary.language.choni=Choni -controlledvocabulary.language.chonyi-dzihana-kauma=Chonyi-Dzihana-Kauma -controlledvocabulary.language.chopi=Chopi -controlledvocabulary.language.chorasmian=Chorasmian -controlledvocabulary.language.chorti=Chortí -controlledvocabulary.language.chothe_naga=Chothe Naga -controlledvocabulary.language.chrau=Chrau -controlledvocabulary.language.chru=Chru -controlledvocabulary.language.chuanqiandian_cluster_miao=Chuanqiandian Cluster Miao -controlledvocabulary.language.chuave=Chuave -controlledvocabulary.language.chug=Chug -controlledvocabulary.language.chuj=Chuj -controlledvocabulary.language.chuka=Chuka -controlledvocabulary.language.chukot=Chukot -controlledvocabulary.language.chukwa=Chukwa -controlledvocabulary.language.chulym=Chulym -controlledvocabulary.language.chumburung=Chumburung -controlledvocabulary.language.chung=Chung -controlledvocabulary.language.churahi=Churahi -controlledvocabulary.language.church_slavonic,_church_slavic,_old_church_slavonic,_old_bulgarian=Church Slavonic, Church Slavic, Old Church Slavonic, Old Bulgarian -controlledvocabulary.language.chut=Chut -controlledvocabulary.language.chuukese=Chuukese -controlledvocabulary.language.chuvantsy=Chuvantsy -controlledvocabulary.language.chuvash=Chuvash -controlledvocabulary.language.chuwabu=Chuwabu -controlledvocabulary.language.chacobo=Chácobo -controlledvocabulary.language.ci_gbe=Ci Gbe -controlledvocabulary.language.cia-cia=Cia-Cia -controlledvocabulary.language.cibak=Cibak -controlledvocabulary.language.cicipu=Cicipu -controlledvocabulary.language.cimbrian=Cimbrian -controlledvocabulary.language.cinda-regi-tiyal=Cinda-Regi-Tiyal -controlledvocabulary.language.cineni=Cineni -controlledvocabulary.language.cinta_larga=Cinta Larga -controlledvocabulary.language.cisalpine_gaulish=Cisalpine Gaulish -controlledvocabulary.language.cishingini=Cishingini -controlledvocabulary.language.citak=Citak -controlledvocabulary.language.ciwogai=Ciwogai -controlledvocabulary.language.clallam=Clallam -controlledvocabulary.language.classical_armenian=Classical Armenian -controlledvocabulary.language.classical_mandaic=Classical Mandaic -controlledvocabulary.language.classical_mongolian=Classical Mongolian -controlledvocabulary.language.classical_nahuatl=Classical Nahuatl -controlledvocabulary.language.classical_newari=Classical Newari -controlledvocabulary.language.classical_quechua=Classical Quechua -controlledvocabulary.language.classical_sanskrit=Classical Sanskrit -controlledvocabulary.language.classical_syriac=Classical Syriac -controlledvocabulary.language.classical_tibetan=Classical Tibetan -controlledvocabulary.language.coahuilteco=Coahuilteco -controlledvocabulary.language.coast_miwok=Coast Miwok -controlledvocabulary.language.coastal_konjo=Coastal Konjo -controlledvocabulary.language.coatecas_altas_zapotec=Coatecas Altas Zapotec -controlledvocabulary.language.coatepec_nahuatl=Coatepec Nahuatl -controlledvocabulary.language.coatlan_mixe=Coatlán Mixe -controlledvocabulary.language.coatlan_zapotec=Coatlán Zapotec -controlledvocabulary.language.coatzospan_mixtec=Coatzospan Mixtec -controlledvocabulary.language.cocama-cocamilla=Cocama-Cocamilla -controlledvocabulary.language.cochimi=Cochimi -controlledvocabulary.language.cocopa=Cocopa -controlledvocabulary.language.cocos_islands_malay=Cocos Islands Malay -controlledvocabulary.language.coeur_d'alene=Coeur d'Alene -controlledvocabulary.language.cofan=Cofán -controlledvocabulary.language.cogui=Cogui -controlledvocabulary.language.col=Col -controlledvocabulary.language.colombian_sign_language=Colombian Sign Language -controlledvocabulary.language.colonia_tovar_german=Colonia Tovar German -controlledvocabulary.language.colorado=Colorado -controlledvocabulary.language.columbia-wenatchi=Columbia-Wenatchi -controlledvocabulary.language.comaltepec_chinantec=Comaltepec Chinantec -controlledvocabulary.language.comanche=Comanche -controlledvocabulary.language.comecrudo=Comecrudo -controlledvocabulary.language.como_karim=Como Karim -controlledvocabulary.language.comox=Comox -controlledvocabulary.language.con=Con -controlledvocabulary.language.congo_swahili=Congo Swahili -controlledvocabulary.language.coos=Coos -controlledvocabulary.language.copainala_zoque=Copainalá Zoque -controlledvocabulary.language.copala_triqui=Copala Triqui -controlledvocabulary.language.coptic=Coptic -controlledvocabulary.language.coquille=Coquille -controlledvocabulary.language.cori=Cori -controlledvocabulary.language.cornish=Cornish -controlledvocabulary.language.corongo_ancash_quechua=Corongo Ancash Quechua -controlledvocabulary.language.corsican=Corsican -controlledvocabulary.language.costa_rican_sign_language=Costa Rican Sign Language -controlledvocabulary.language.cotabato_manobo=Cotabato Manobo -controlledvocabulary.language.cotoname=Cotoname -controlledvocabulary.language.cowlitz=Cowlitz -controlledvocabulary.language.coyotepec_popoloca=Coyotepec Popoloca -controlledvocabulary.language.coyutla_totonac=Coyutla Totonac -controlledvocabulary.language.cree=Cree -controlledvocabulary.language.creek=Creek -controlledvocabulary.language.crimean_tatar=Crimean Tatar -controlledvocabulary.language.croatia_sign_language=Croatia Sign Language -controlledvocabulary.language.cross_river_mbembe=Cross River Mbembe -controlledvocabulary.language.crow=Crow -controlledvocabulary.language.cruzeno=Cruzeño -controlledvocabulary.language.cua=Cua -controlledvocabulary.language.cuba_sign_language=Cuba Sign Language -controlledvocabulary.language.cubeo=Cubeo -controlledvocabulary.language.cuiba=Cuiba -controlledvocabulary.language.cuitlatec=Cuitlatec -controlledvocabulary.language.culina=Culina -controlledvocabulary.language.cumanagoto=Cumanagoto -controlledvocabulary.language.cumbric=Cumbric -controlledvocabulary.language.cun=Cun -controlledvocabulary.language.cuneiform_luwian=Cuneiform Luwian -controlledvocabulary.language.cupeno=Cupeño -controlledvocabulary.language.curonian=Curonian -controlledvocabulary.language.curripaco=Curripaco -controlledvocabulary.language.cusco_quechua=Cusco Quechua -controlledvocabulary.language.cutchi-swahili=Cutchi-Swahili -controlledvocabulary.language.cuvok=Cuvok -controlledvocabulary.language.cuyamecalco_mixtec=Cuyamecalco Mixtec -controlledvocabulary.language.cuyonon=Cuyonon -controlledvocabulary.language.cwi_bwamu=Cwi Bwamu -controlledvocabulary.language.cypriot_arabic=Cypriot Arabic -controlledvocabulary.language.czech=Czech -controlledvocabulary.language.czech_sign_language=Czech Sign Language -controlledvocabulary.language.coong=Côông -controlledvocabulary.language.da'a_kaili=Da'a Kaili -controlledvocabulary.language.daai_chin=Daai Chin -controlledvocabulary.language.daakaka=Daakaka -controlledvocabulary.language.daantanai'=Daantanai' -controlledvocabulary.language.daasanach=Daasanach -controlledvocabulary.language.daatsʼiin=Daatsʼíin -controlledvocabulary.language.daba=Daba -controlledvocabulary.language.dabarre=Dabarre -controlledvocabulary.language.dabe=Dabe -controlledvocabulary.language.dacian=Dacian -controlledvocabulary.language.dadi_dadi=Dadi Dadi -controlledvocabulary.language.dadibi=Dadibi -controlledvocabulary.language.dadiya=Dadiya -controlledvocabulary.language.daga=Daga -controlledvocabulary.language.dagaari_dioula=Dagaari Dioula -controlledvocabulary.language.dagba=Dagba -controlledvocabulary.language.dagbani=Dagbani -controlledvocabulary.language.dagik=Dagik -controlledvocabulary.language.dagoman=Dagoman -controlledvocabulary.language.dahalik=Dahalik -controlledvocabulary.language.dahalo=Dahalo -controlledvocabulary.language.daho-doo=Daho-Doo -controlledvocabulary.language.dai=Dai -controlledvocabulary.language.dai_zhuang=Dai Zhuang -controlledvocabulary.language.dair=Dair -controlledvocabulary.language.dakka=Dakka -controlledvocabulary.language.dakota=Dakota -controlledvocabulary.language.dakpakha=Dakpakha -controlledvocabulary.language.dalabon=Dalabon -controlledvocabulary.language.dalmatian=Dalmatian -controlledvocabulary.language.daloa_bete=Daloa Bété -controlledvocabulary.language.dama=Dama -controlledvocabulary.language.damakawa=Damakawa -controlledvocabulary.language.damal=Damal -controlledvocabulary.language.dambi=Dambi -controlledvocabulary.language.dameli=Dameli -controlledvocabulary.language.dampelas=Dampelas -controlledvocabulary.language.dan=Dan -controlledvocabulary.language.danaru=Danaru -controlledvocabulary.language.danau=Danau -controlledvocabulary.language.dandami_maria=Dandami Maria -controlledvocabulary.language.dangaleat=Dangaléat -controlledvocabulary.language.dangaura_tharu=Dangaura Tharu -controlledvocabulary.language.danish=Danish -controlledvocabulary.language.danish_sign_language=Danish Sign Language -controlledvocabulary.language.dano=Dano -controlledvocabulary.language.danu=Danu -controlledvocabulary.language.dao=Dao -controlledvocabulary.language.daonda=Daonda -controlledvocabulary.language.dar_daju_daju=Dar Daju Daju -controlledvocabulary.language.dar_fur_daju=Dar Fur Daju -controlledvocabulary.language.dar_sila_daju=Dar Sila Daju -controlledvocabulary.language.darai=Darai -controlledvocabulary.language.dargwa=Dargwa -controlledvocabulary.language.dari=Dari -controlledvocabulary.language.darkinyung=Darkinyung -controlledvocabulary.language.darlong=Darlong -controlledvocabulary.language.darmiya=Darmiya -controlledvocabulary.language.daro-matu_melanau=Daro-Matu Melanau -controlledvocabulary.language.dass=Dass -controlledvocabulary.language.datooga=Datooga -controlledvocabulary.language.daungwurrung=Daungwurrung -controlledvocabulary.language.daur=Daur -controlledvocabulary.language.davawenyo=Davawenyo -controlledvocabulary.language.dawawa=Dawawa -controlledvocabulary.language.dawera-daweloor=Dawera-Daweloor -controlledvocabulary.language.dawik_kui=Dawik Kui -controlledvocabulary.language.dawro=Dawro -controlledvocabulary.language.day=Day -controlledvocabulary.language.dayi=Dayi -controlledvocabulary.language.daza=Daza -controlledvocabulary.language.dazaga=Dazaga -controlledvocabulary.language.deccan=Deccan -controlledvocabulary.language.dedua=Dedua -controlledvocabulary.language.defaka=Defaka -controlledvocabulary.language.defi_gbe=Defi Gbe -controlledvocabulary.language.deg=Deg -controlledvocabulary.language.degema=Degema -controlledvocabulary.language.degenan=Degenan -controlledvocabulary.language.degexit'an=Degexit'an -controlledvocabulary.language.dehu=Dehu -controlledvocabulary.language.dehwari=Dehwari -controlledvocabulary.language.dek=Dek -controlledvocabulary.language.dela-oenale=Dela-Oenale -controlledvocabulary.language.delaware=Delaware -controlledvocabulary.language.delo=Delo -controlledvocabulary.language.dem=Dem -controlledvocabulary.language.dema=Dema -controlledvocabulary.language.demisa=Demisa -controlledvocabulary.language.demta=Demta -controlledvocabulary.language.dendi_(benin)=Dendi (Benin) -controlledvocabulary.language.dendi_(central_african_republic)=Dendi (Central African Republic) -controlledvocabulary.language.dengese=Dengese -controlledvocabulary.language.dengka=Dengka -controlledvocabulary.language.deno=Deno -controlledvocabulary.language.denya=Denya -controlledvocabulary.language.deni=Dení -controlledvocabulary.language.deori=Deori -controlledvocabulary.language.dera_(indonesia)=Dera (Indonesia) -controlledvocabulary.language.dera_(nigeria)=Dera (Nigeria) -controlledvocabulary.language.desano=Desano -controlledvocabulary.language.desiya=Desiya -controlledvocabulary.language.dewas_rai=Dewas Rai -controlledvocabulary.language.dewoin=Dewoin -controlledvocabulary.language.dezfuli=Dezfuli -controlledvocabulary.language.dghwede=Dghwede -controlledvocabulary.language.dhaiso=Dhaiso -controlledvocabulary.language.dhalandji=Dhalandji -controlledvocabulary.language.dhangu-djangu=Dhangu-Djangu -controlledvocabulary.language.dhanki=Dhanki -controlledvocabulary.language.dhanwar_(nepal)=Dhanwar (Nepal) -controlledvocabulary.language.dhao=Dhao -controlledvocabulary.language.dharawal=Dharawal -controlledvocabulary.language.dhargari=Dhargari -controlledvocabulary.language.dharuk=Dharuk -controlledvocabulary.language.dharumbal=Dharumbal -controlledvocabulary.language.dhatki=Dhatki -controlledvocabulary.language.dhimal=Dhimal -controlledvocabulary.language.dhodia=Dhodia -controlledvocabulary.language.dhofari_arabic=Dhofari Arabic -controlledvocabulary.language.dhudhuroa=Dhudhuroa -controlledvocabulary.language.dhundari=Dhundari -controlledvocabulary.language.dhungaloo=Dhungaloo -controlledvocabulary.language.dhurga=Dhurga -controlledvocabulary.language.dhuwal=Dhuwal -controlledvocabulary.language.dhuwaya=Dhuwaya -controlledvocabulary.language.dia=Dia -controlledvocabulary.language.dibabawon_manobo=Dibabawon Manobo -controlledvocabulary.language.dibiyaso=Dibiyaso -controlledvocabulary.language.dibo=Dibo -controlledvocabulary.language.dibole=Dibole -controlledvocabulary.language.dicamay_agta=Dicamay Agta -controlledvocabulary.language.didinga=Didinga -controlledvocabulary.language.dido=Dido -controlledvocabulary.language.dieri=Dieri -controlledvocabulary.language.digaro-mishmi=Digaro-Mishmi -controlledvocabulary.language.digo=Digo -controlledvocabulary.language.dii=Dii -controlledvocabulary.language.dijim-bwilim=Dijim-Bwilim -controlledvocabulary.language.dilling=Dilling -controlledvocabulary.language.dima=Dima -controlledvocabulary.language.dimasa=Dimasa -controlledvocabulary.language.dimbong=Dimbong -controlledvocabulary.language.dime=Dime -controlledvocabulary.language.dimli_(individual_language)=Dimli (individual language) -controlledvocabulary.language.ding=Ding -controlledvocabulary.language.dinka=Dinka -controlledvocabulary.language.dir-nyamzak-mbarimi=Dir-Nyamzak-Mbarimi -controlledvocabulary.language.dirasha=Dirasha -controlledvocabulary.language.diri=Diri -controlledvocabulary.language.diriku=Diriku -controlledvocabulary.language.dirim=Dirim -controlledvocabulary.language.disa=Disa -controlledvocabulary.language.ditammari=Ditammari -controlledvocabulary.language.ditidaht=Ditidaht -controlledvocabulary.language.diuwe=Diuwe -controlledvocabulary.language.diuxi-tilantongo_mixtec=Diuxi-Tilantongo Mixtec -controlledvocabulary.language.dixon_reef=Dixon Reef -controlledvocabulary.language.dizin=Dizin -controlledvocabulary.language.djabugay=Djabugay -controlledvocabulary.language.djabwurrung=Djabwurrung -controlledvocabulary.language.djadjawurrung=Djadjawurrung -controlledvocabulary.language.djambarrpuyngu=Djambarrpuyngu -controlledvocabulary.language.djamindjung=Djamindjung -controlledvocabulary.language.djangun=Djangun -controlledvocabulary.language.djawi=Djawi -controlledvocabulary.language.djeebbana=Djeebbana -controlledvocabulary.language.djimini_senoufo=Djimini Senoufo -controlledvocabulary.language.djinang=Djinang -controlledvocabulary.language.djinba=Djinba -controlledvocabulary.language.djiwarli=Djiwarli -controlledvocabulary.language.dobel=Dobel -controlledvocabulary.language.dobu=Dobu -controlledvocabulary.language.doe=Doe -controlledvocabulary.language.doga=Doga -controlledvocabulary.language.doghoro=Doghoro -controlledvocabulary.language.dogoso=Dogoso -controlledvocabulary.language.dogose=Dogosé -controlledvocabulary.language.dogri_(individual_language)=Dogri (individual language) -controlledvocabulary.language.dogri_(macrolanguage)=Dogri (macrolanguage) -controlledvocabulary.language.dogul_dom_dogon=Dogul Dom Dogon -controlledvocabulary.language.doka=Doka -controlledvocabulary.language.doko-uyanga=Doko-Uyanga -controlledvocabulary.language.dokshi=Dokshi -controlledvocabulary.language.dolgan=Dolgan -controlledvocabulary.language.dolpo=Dolpo -controlledvocabulary.language.dom=Dom -controlledvocabulary.language.domaaki=Domaaki -controlledvocabulary.language.domari=Domari -controlledvocabulary.language.dombe=Dombe -controlledvocabulary.language.dominican_sign_language=Dominican Sign Language -controlledvocabulary.language.dompo=Dompo -controlledvocabulary.language.domu=Domu -controlledvocabulary.language.domung=Domung -controlledvocabulary.language.dondo=Dondo -controlledvocabulary.language.dong=Dong -controlledvocabulary.language.dongo=Dongo -controlledvocabulary.language.dongotono=Dongotono -controlledvocabulary.language.dongshanba_lalo=Dongshanba Lalo -controlledvocabulary.language.dongxiang=Dongxiang -controlledvocabulary.language.donno_so_dogon=Donno So Dogon -controlledvocabulary.language.doondo=Doondo -controlledvocabulary.language.dori'o=Dori'o -controlledvocabulary.language.doromu-koki=Doromu-Koki -controlledvocabulary.language.dorze=Dorze -controlledvocabulary.language.doso=Doso -controlledvocabulary.language.dotyali=Dotyali -controlledvocabulary.language.doutai=Doutai -controlledvocabulary.language.doyayo=Doyayo -controlledvocabulary.language.drents=Drents -controlledvocabulary.language.drung=Drung -controlledvocabulary.language.duala=Duala -controlledvocabulary.language.duano=Duano -controlledvocabulary.language.duau=Duau -controlledvocabulary.language.dubli=Dubli -controlledvocabulary.language.dubu=Dubu -controlledvocabulary.language.dugun=Dugun -controlledvocabulary.language.duguri=Duguri -controlledvocabulary.language.dugwor=Dugwor -controlledvocabulary.language.duhwa=Duhwa -controlledvocabulary.language.duke=Duke -controlledvocabulary.language.dulbu=Dulbu -controlledvocabulary.language.duli-gey=Duli-Gey -controlledvocabulary.language.duma=Duma -controlledvocabulary.language.dumbea=Dumbea -controlledvocabulary.language.dumi=Dumi -controlledvocabulary.language.dumpas=Dumpas -controlledvocabulary.language.dumun=Dumun -controlledvocabulary.language.duna=Duna -controlledvocabulary.language.dungan=Dungan -controlledvocabulary.language.dungmali=Dungmali -controlledvocabulary.language.dungra_bhil=Dungra Bhil -controlledvocabulary.language.dungu=Dungu -controlledvocabulary.language.dupaninan_agta=Dupaninan Agta -controlledvocabulary.language.dura=Dura -controlledvocabulary.language.duri=Duri -controlledvocabulary.language.duriankere=Duriankere -controlledvocabulary.language.durop=Durop -controlledvocabulary.language.duruma=Duruma -controlledvocabulary.language.duruwa=Duruwa -controlledvocabulary.language.dusner=Dusner -controlledvocabulary.language.dusun_deyah=Dusun Deyah -controlledvocabulary.language.dusun_malang=Dusun Malang -controlledvocabulary.language.dusun_witu=Dusun Witu -controlledvocabulary.language.dutch=Dutch -controlledvocabulary.language.dutch_sign_language=Dutch Sign Language -controlledvocabulary.language.dutton_world_speedwords=Dutton World Speedwords -controlledvocabulary.language.duungooma=Duungooma -controlledvocabulary.language.duupa=Duupa -controlledvocabulary.language.duvle=Duvle -controlledvocabulary.language.duwai=Duwai -controlledvocabulary.language.duwet=Duwet -controlledvocabulary.language.duya=Dũya -controlledvocabulary.language.dwang=Dwang -controlledvocabulary.language.dyaberdyaber=Dyaberdyaber -controlledvocabulary.language.dyan=Dyan -controlledvocabulary.language.dyangadi=Dyangadi -controlledvocabulary.language.dyarim=Dyarim -controlledvocabulary.language.dyirbal=Dyirbal -controlledvocabulary.language.dyugun=Dyugun -controlledvocabulary.language.dyula=Dyula -controlledvocabulary.language.dza=Dza -controlledvocabulary.language.dzalakha=Dzalakha -controlledvocabulary.language.dzando=Dzando -controlledvocabulary.language.dzao_min=Dzao Min -controlledvocabulary.language.dzongkha=Dzongkha -controlledvocabulary.language.dzuungoo=Dzùùngoo -controlledvocabulary.language.daw=Dâw -controlledvocabulary.language.e=E -controlledvocabulary.language.e'ma_buyang=E'ma Buyang -controlledvocabulary.language.e'napa_woromaipu=E'ñapa Woromaipu -controlledvocabulary.language.early_tripuri=Early Tripuri -controlledvocabulary.language.east_ambae=East Ambae -controlledvocabulary.language.east_berawan=East Berawan -controlledvocabulary.language.east_damar=East Damar -controlledvocabulary.language.east_futuna=East Futuna -controlledvocabulary.language.east_kewa=East Kewa -controlledvocabulary.language.east_limba=East Limba -controlledvocabulary.language.east_makian=East Makian -controlledvocabulary.language.east_masela=East Masela -controlledvocabulary.language.east_nyala=East Nyala -controlledvocabulary.language.east_tarangan=East Tarangan -controlledvocabulary.language.east_yugur=East Yugur -controlledvocabulary.language.eastern_abnaki=Eastern Abnaki -controlledvocabulary.language.eastern_acipa=Eastern Acipa -controlledvocabulary.language.eastern_apurimac_quechua=Eastern Apurímac Quechua -controlledvocabulary.language.eastern_arrernte=Eastern Arrernte -controlledvocabulary.language.eastern_balochi=Eastern Balochi -controlledvocabulary.language.eastern_bolivian_guarani=Eastern Bolivian Guaraní -controlledvocabulary.language.eastern_bontok=Eastern Bontok -controlledvocabulary.language.eastern_bru=Eastern Bru -controlledvocabulary.language.eastern_canadian_inuktitut=Eastern Canadian Inuktitut -controlledvocabulary.language.eastern_cham=Eastern Cham -controlledvocabulary.language.eastern_durango_nahuatl=Eastern Durango Nahuatl -controlledvocabulary.language.eastern_egyptian_bedawi_arabic=Eastern Egyptian Bedawi Arabic -controlledvocabulary.language.eastern_frisian=Eastern Frisian -controlledvocabulary.language.eastern_gorkha_tamang=Eastern Gorkha Tamang -controlledvocabulary.language.eastern_highland_chatino=Eastern Highland Chatino -controlledvocabulary.language.eastern_highland_otomi=Eastern Highland Otomi -controlledvocabulary.language.eastern_hongshuihe_zhuang=Eastern Hongshuihe Zhuang -controlledvocabulary.language.eastern_huasteca_nahuatl=Eastern Huasteca Nahuatl -controlledvocabulary.language.eastern_huishui_hmong=Eastern Huishui Hmong -controlledvocabulary.language.eastern_karaboro=Eastern Karaboro -controlledvocabulary.language.eastern_katu=Eastern Katu -controlledvocabulary.language.eastern_kayah=Eastern Kayah -controlledvocabulary.language.eastern_keres=Eastern Keres -controlledvocabulary.language.eastern_khumi_chin=Eastern Khumi Chin -controlledvocabulary.language.eastern_krahn=Eastern Krahn -controlledvocabulary.language.eastern_lalu=Eastern Lalu -controlledvocabulary.language.eastern_lawa=Eastern Lawa -controlledvocabulary.language.eastern_magar=Eastern Magar -controlledvocabulary.language.eastern_maninkakan=Eastern Maninkakan -controlledvocabulary.language.eastern_mari=Eastern Mari -controlledvocabulary.language.eastern_maroon_creole=Eastern Maroon Creole -controlledvocabulary.language.eastern_meohang=Eastern Meohang -controlledvocabulary.language.eastern_minyag=Eastern Minyag -controlledvocabulary.language.eastern_mnong=Eastern Mnong -controlledvocabulary.language.eastern_muria=Eastern Muria -controlledvocabulary.language.eastern_ngad'a=Eastern Ngad'a -controlledvocabulary.language.eastern_nisu=Eastern Nisu -controlledvocabulary.language.eastern_ojibwa=Eastern Ojibwa -controlledvocabulary.language.eastern_oromo=Eastern Oromo -controlledvocabulary.language.eastern_parbate_kham=Eastern Parbate Kham -controlledvocabulary.language.eastern_penan=Eastern Penan -controlledvocabulary.language.eastern_pomo=Eastern Pomo -controlledvocabulary.language.eastern_qiandong_miao=Eastern Qiandong Miao -controlledvocabulary.language.eastern_subanen=Eastern Subanen -controlledvocabulary.language.eastern_tamang=Eastern Tamang -controlledvocabulary.language.eastern_tawbuid=Eastern Tawbuid -controlledvocabulary.language.eastern_xiangxi_miao=Eastern Xiangxi Miao -controlledvocabulary.language.eastern_xwla_gbe=Eastern Xwla Gbe -controlledvocabulary.language.eastern_yiddish=Eastern Yiddish -controlledvocabulary.language.ebira=Ebira -controlledvocabulary.language.eblan=Eblan -controlledvocabulary.language.ebrie=Ebrié -controlledvocabulary.language.ebughu=Ebughu -controlledvocabulary.language.ecuadorian_sign_language=Ecuadorian Sign Language -controlledvocabulary.language.ede_cabe=Ede Cabe -controlledvocabulary.language.ede_ica=Ede Ica -controlledvocabulary.language.ede_idaca=Ede Idaca -controlledvocabulary.language.ede_ije=Ede Ije -controlledvocabulary.language.edera_awyu=Edera Awyu -controlledvocabulary.language.edolo=Edolo -controlledvocabulary.language.edomite=Edomite -controlledvocabulary.language.edopi=Edopi -controlledvocabulary.language.efai=Efai -controlledvocabulary.language.efe=Efe -controlledvocabulary.language.efik=Efik -controlledvocabulary.language.efutop=Efutop -controlledvocabulary.language.ega=Ega -controlledvocabulary.language.eggon=Eggon -controlledvocabulary.language.egypt_sign_language=Egypt Sign Language -controlledvocabulary.language.egyptian_(ancient)=Egyptian (Ancient) -controlledvocabulary.language.egyptian_arabic=Egyptian Arabic -controlledvocabulary.language.ehueun=Ehueun -controlledvocabulary.language.eipomek=Eipomek -controlledvocabulary.language.eitiep=Eitiep -controlledvocabulary.language.ejagham=Ejagham -controlledvocabulary.language.ejamat=Ejamat -controlledvocabulary.language.ekai_chin=Ekai Chin -controlledvocabulary.language.ekajuk=Ekajuk -controlledvocabulary.language.ekari=Ekari -controlledvocabulary.language.eki=Eki -controlledvocabulary.language.ekit=Ekit -controlledvocabulary.language.ekpeye=Ekpeye -controlledvocabulary.language.el_alto_zapotec=El Alto Zapotec -controlledvocabulary.language.el_hugeirat=El Hugeirat -controlledvocabulary.language.el_molo=El Molo -controlledvocabulary.language.el_nayar_cora=El Nayar Cora -controlledvocabulary.language.elamite=Elamite -controlledvocabulary.language.eleme=Eleme -controlledvocabulary.language.elepi=Elepi -controlledvocabulary.language.elfdalian=Elfdalian -controlledvocabulary.language.elip=Elip -controlledvocabulary.language.elkei=Elkei -controlledvocabulary.language.elotepec_zapotec=Elotepec Zapotec -controlledvocabulary.language.eloyi=Eloyi -controlledvocabulary.language.elseng=Elseng -controlledvocabulary.language.elu=Elu -controlledvocabulary.language.elymian=Elymian -controlledvocabulary.language.emae=Emae -controlledvocabulary.language.emai-iuleha-ora=Emai-Iuleha-Ora -controlledvocabulary.language.eman=Eman -controlledvocabulary.language.embaloh=Embaloh -controlledvocabulary.language.embera-baudo=Emberá-Baudó -controlledvocabulary.language.embera-catio=Emberá-Catío -controlledvocabulary.language.embera-chami=Emberá-Chamí -controlledvocabulary.language.embera-tado=Emberá-Tadó -controlledvocabulary.language.embu=Embu -controlledvocabulary.language.emerillon=Emerillon -controlledvocabulary.language.emilian=Emilian -controlledvocabulary.language.emplawas=Emplawas -controlledvocabulary.language.emumu=Emumu -controlledvocabulary.language.en=En -controlledvocabulary.language.enawene-nawe=Enawené-Nawé -controlledvocabulary.language.ende=Ende -controlledvocabulary.language.enga=Enga -controlledvocabulary.language.engdewu=Engdewu -controlledvocabulary.language.engenni=Engenni -controlledvocabulary.language.enggano=Enggano -controlledvocabulary.language.english=English -controlledvocabulary.language.enlhet=Enlhet -controlledvocabulary.language.enrekang=Enrekang -controlledvocabulary.language.enu=Enu -controlledvocabulary.language.enwan_(akwa_ibom_state)=Enwan (Akwa Ibom State) -controlledvocabulary.language.enwan_(edo_state)=Enwan (Edo State) -controlledvocabulary.language.enxet=Enxet -controlledvocabulary.language.enya=Enya -controlledvocabulary.language.epena=Epena -controlledvocabulary.language.epi-olmec=Epi-Olmec -controlledvocabulary.language.epie=Epie -controlledvocabulary.language.epigraphic_mayan=Epigraphic Mayan -controlledvocabulary.language.eravallan=Eravallan -controlledvocabulary.language.erave=Erave -controlledvocabulary.language.ere=Ere -controlledvocabulary.language.eritai=Eritai -controlledvocabulary.language.erokwanas=Erokwanas -controlledvocabulary.language.erre=Erre -controlledvocabulary.language.erromintxela=Erromintxela -controlledvocabulary.language.ersu=Ersu -controlledvocabulary.language.eruwa=Eruwa -controlledvocabulary.language.erzya=Erzya -controlledvocabulary.language.esan=Esan -controlledvocabulary.language.ese=Ese -controlledvocabulary.language.ese_ejja=Ese Ejja -controlledvocabulary.language.eshtehardi=Eshtehardi -controlledvocabulary.language.esimbi=Esimbi -controlledvocabulary.language.eskayan=Eskayan -controlledvocabulary.language.esperanto=Esperanto -controlledvocabulary.language.esselen=Esselen -controlledvocabulary.language.estado_de_mexico_otomi=Estado de México Otomi -controlledvocabulary.language.estonian=Estonian -controlledvocabulary.language.estonian_sign_language=Estonian Sign Language -controlledvocabulary.language.esuma=Esuma -controlledvocabulary.language.etchemin=Etchemin -controlledvocabulary.language.etebi=Etebi -controlledvocabulary.language.eten=Eten -controlledvocabulary.language.eteocretan=Eteocretan -controlledvocabulary.language.eteocypriot=Eteocypriot -controlledvocabulary.language.ethiopian_sign_language=Ethiopian Sign Language -controlledvocabulary.language.etkywan=Etkywan -controlledvocabulary.language.eton_(cameroon)=Eton (Cameroon) -controlledvocabulary.language.eton_(vanuatu)=Eton (Vanuatu) -controlledvocabulary.language.etruscan=Etruscan -controlledvocabulary.language.etulo=Etulo -controlledvocabulary.language.eudeve=Eudeve -controlledvocabulary.language.evant=Evant -controlledvocabulary.language.even=Even -controlledvocabulary.language.evenki=Evenki -controlledvocabulary.language.eviya=Eviya -controlledvocabulary.language.ewage-notu=Ewage-Notu -controlledvocabulary.language.ewe=Ewe -controlledvocabulary.language.ewondo=Ewondo -controlledvocabulary.language.extremaduran=Extremaduran -controlledvocabulary.language.eyak=Eyak -controlledvocabulary.language.ezaa=Ezaa -controlledvocabulary.language.fa_d'ambu=Fa d'Ambu -controlledvocabulary.language.fagani=Fagani -controlledvocabulary.language.faifi=Faifi -controlledvocabulary.language.faire_atta=Faire Atta -controlledvocabulary.language.faita=Faita -controlledvocabulary.language.faiwol=Faiwol -controlledvocabulary.language.fala=Fala -controlledvocabulary.language.falam_chin=Falam Chin -controlledvocabulary.language.fali=Fali -controlledvocabulary.language.faliscan=Faliscan -controlledvocabulary.language.fam=Fam -controlledvocabulary.language.fanagalo=Fanagalo -controlledvocabulary.language.fanamaket=Fanamaket -controlledvocabulary.language.fanbak=Fanbak -controlledvocabulary.language.fang_(cameroon)=Fang (Cameroon) -controlledvocabulary.language.fang_(equatorial_guinea)=Fang (Equatorial Guinea) -controlledvocabulary.language.fania=Fania -controlledvocabulary.language.fanti=Fanti -controlledvocabulary.language.far_western_muria=Far Western Muria -controlledvocabulary.language.farefare=Farefare -controlledvocabulary.language.faroese=Faroese -controlledvocabulary.language.fas=Fas -controlledvocabulary.language.fasu=Fasu -controlledvocabulary.language.fataleka=Fataleka -controlledvocabulary.language.fataluku=Fataluku -controlledvocabulary.language.fayu=Fayu -controlledvocabulary.language.fe'fe'=Fe'fe' -controlledvocabulary.language.fembe=Fembe -controlledvocabulary.language.fernando_po_creole_english=Fernando Po Creole English -controlledvocabulary.language.feroge=Feroge -controlledvocabulary.language.fiji_hindi=Fiji Hindi -controlledvocabulary.language.fijian=Fijian -controlledvocabulary.language.filipino=Filipino -controlledvocabulary.language.filomena_mata-coahuitlan_totonac=Filomena Mata-Coahuitlán Totonac -controlledvocabulary.language.finland-swedish_sign_language=Finland-Swedish Sign Language -controlledvocabulary.language.finnish=Finnish -controlledvocabulary.language.finnish_sign_language=Finnish Sign Language -controlledvocabulary.language.finongan=Finongan -controlledvocabulary.language.fipa=Fipa -controlledvocabulary.language.firan=Firan -controlledvocabulary.language.fiwaga=Fiwaga -controlledvocabulary.language.flaaitaal=Flaaitaal -controlledvocabulary.language.flinders_island=Flinders Island -controlledvocabulary.language.foau=Foau -controlledvocabulary.language.foi=Foi -controlledvocabulary.language.foia_foia=Foia Foia -controlledvocabulary.language.folopa=Folopa -controlledvocabulary.language.foma=Foma -controlledvocabulary.language.fon=Fon -controlledvocabulary.language.fongoro=Fongoro -controlledvocabulary.language.foodo=Foodo -controlledvocabulary.language.forak=Forak -controlledvocabulary.language.fordata=Fordata -controlledvocabulary.language.fore=Fore -controlledvocabulary.language.forest_enets=Forest Enets -controlledvocabulary.language.fortsenal=Fortsenal -controlledvocabulary.language.francisco_leon_zoque=Francisco León Zoque -controlledvocabulary.language.frankish=Frankish -controlledvocabulary.language.french=French -controlledvocabulary.language.french_sign_language=French Sign Language -controlledvocabulary.language.friulian=Friulian -controlledvocabulary.language.fula,_fulah=Fula, Fulah -controlledvocabulary.language.fuliiru=Fuliiru -controlledvocabulary.language.fulnio=Fulniô -controlledvocabulary.language.fum=Fum -controlledvocabulary.language.fungwa=Fungwa -controlledvocabulary.language.fur=Fur -controlledvocabulary.language.furu=Furu -controlledvocabulary.language.futuna-aniwa=Futuna-Aniwa -controlledvocabulary.language.fuyug=Fuyug -controlledvocabulary.language.fwe=Fwe -controlledvocabulary.language.fwai=Fwâi -controlledvocabulary.language.fyam=Fyam -controlledvocabulary.language.fyer=Fyer -controlledvocabulary.language.ga=Ga -controlledvocabulary.language.ga'anda=Ga'anda -controlledvocabulary.language.ga'dang=Ga'dang -controlledvocabulary.language.gaa=Gaa -controlledvocabulary.language.gaam=Gaam -controlledvocabulary.language.gabi-gabi=Gabi-Gabi -controlledvocabulary.language.gabri=Gabri -controlledvocabulary.language.gabrielino-fernandeno=Gabrielino-Fernandeño -controlledvocabulary.language.gadang=Gadang -controlledvocabulary.language.gaddang=Gaddang -controlledvocabulary.language.gaddi=Gaddi -controlledvocabulary.language.gade=Gade -controlledvocabulary.language.gade_lohar=Gade Lohar -controlledvocabulary.language.gadjerawang=Gadjerawang -controlledvocabulary.language.gadsup=Gadsup -controlledvocabulary.language.gaelic,_scottish_gaelic=Gaelic, Scottish Gaelic -controlledvocabulary.language.gafat=Gafat -controlledvocabulary.language.gagadu=Gagadu -controlledvocabulary.language.gagauz=Gagauz -controlledvocabulary.language.gagnoa_bete=Gagnoa Bété -controlledvocabulary.language.gagu=Gagu -controlledvocabulary.language.gahri=Gahri -controlledvocabulary.language.gaikundi=Gaikundi -controlledvocabulary.language.gail=Gail -controlledvocabulary.language.gaina=Gaina -controlledvocabulary.language.gal=Gal -controlledvocabulary.language.galambu=Galambu -controlledvocabulary.language.galatian=Galatian -controlledvocabulary.language.galela=Galela -controlledvocabulary.language.galeya=Galeya -controlledvocabulary.language.galibi_carib=Galibi Carib -controlledvocabulary.language.galice=Galice -controlledvocabulary.language.galician=Galician -controlledvocabulary.language.galindan=Galindan -controlledvocabulary.language.gallurese_sardinian=Gallurese Sardinian -controlledvocabulary.language.galo=Galo -controlledvocabulary.language.galolen=Galolen -controlledvocabulary.language.gamale_kham=Gamale Kham -controlledvocabulary.language.gambera=Gambera -controlledvocabulary.language.gambian_wolof=Gambian Wolof -controlledvocabulary.language.gamilaraay=Gamilaraay -controlledvocabulary.language.gamit=Gamit -controlledvocabulary.language.gamkonora=Gamkonora -controlledvocabulary.language.gamo=Gamo -controlledvocabulary.language.gamo-ningi=Gamo-Ningi -controlledvocabulary.language.gan_chinese=Gan Chinese -controlledvocabulary.language.gana=Gana -controlledvocabulary.language.ganang=Ganang -controlledvocabulary.language.ganda=Ganda -controlledvocabulary.language.gane=Gane -controlledvocabulary.language.ganggalida=Ganggalida -controlledvocabulary.language.ganglau=Ganglau -controlledvocabulary.language.gangte=Gangte -controlledvocabulary.language.gangulu=Gangulu -controlledvocabulary.language.gants=Gants -controlledvocabulary.language.ganza=Ganza -controlledvocabulary.language.ganzi=Ganzi -controlledvocabulary.language.gao=Gao -controlledvocabulary.language.gapapaiwa=Gapapaiwa -controlledvocabulary.language.garhwali=Garhwali -controlledvocabulary.language.garifuna=Garifuna -controlledvocabulary.language.garig-ilgar=Garig-Ilgar -controlledvocabulary.language.garingbal=Garingbal -controlledvocabulary.language.garlali=Garlali -controlledvocabulary.language.garo=Garo -controlledvocabulary.language.garre=Garre -controlledvocabulary.language.garrwa=Garrwa -controlledvocabulary.language.garus=Garus -controlledvocabulary.language.garza=Garza -controlledvocabulary.language.gata'=Gata' -controlledvocabulary.language.gavak=Gavak -controlledvocabulary.language.gavar=Gavar -controlledvocabulary.language.gaviao_do_jiparana=Gavião Do Jiparaná -controlledvocabulary.language.gawar-bati=Gawar-Bati -controlledvocabulary.language.gawri=Gawri -controlledvocabulary.language.gawwada=Gawwada -controlledvocabulary.language.gayil=Gayil -controlledvocabulary.language.gayo=Gayo -controlledvocabulary.language.gazi=Gazi -controlledvocabulary.language.gaɓogbo=Gaɓogbo -controlledvocabulary.language.gbagyi=Gbagyi -controlledvocabulary.language.gbanu=Gbanu -controlledvocabulary.language.gbanziri=Gbanziri -controlledvocabulary.language.gbari=Gbari -controlledvocabulary.language.gbaya_(central_african_republic)=Gbaya (Central African Republic) -controlledvocabulary.language.gbaya_(sudan)=Gbaya (Sudan) -controlledvocabulary.language.gbaya-bossangoa=Gbaya-Bossangoa -controlledvocabulary.language.gbaya-bozoum=Gbaya-Bozoum -controlledvocabulary.language.gbaya-mbodomo=Gbaya-Mbodomo -controlledvocabulary.language.gbayi=Gbayi -controlledvocabulary.language.gbesi_gbe=Gbesi Gbe -controlledvocabulary.language.gbii=Gbii -controlledvocabulary.language.gbin=Gbin -controlledvocabulary.language.gbiri-niragu=Gbiri-Niragu -controlledvocabulary.language.gboloo_grebo=Gboloo Grebo -controlledvocabulary.language.ge=Ge -controlledvocabulary.language.geba_karen=Geba Karen -controlledvocabulary.language.gebe=Gebe -controlledvocabulary.language.gedaged=Gedaged -controlledvocabulary.language.gedeo=Gedeo -controlledvocabulary.language.geez=Geez -controlledvocabulary.language.geji=Geji -controlledvocabulary.language.geko_karen=Geko Karen -controlledvocabulary.language.gela=Gela -controlledvocabulary.language.geme=Geme -controlledvocabulary.language.gen=Gen -controlledvocabulary.language.gende=Gende -controlledvocabulary.language.gengle=Gengle -controlledvocabulary.language.georgian=Georgian -controlledvocabulary.language.gepo=Gepo -controlledvocabulary.language.gera=Gera -controlledvocabulary.language.gerai=Gerai -controlledvocabulary.language.german=German -controlledvocabulary.language.german_sign_language=German Sign Language -controlledvocabulary.language.geruma=Geruma -controlledvocabulary.language.geser-gorom=Geser-Gorom -controlledvocabulary.language.ghadames=Ghadamès -controlledvocabulary.language.ghanaian_pidgin_english=Ghanaian Pidgin English -controlledvocabulary.language.ghanaian_sign_language=Ghanaian Sign Language -controlledvocabulary.language.ghandruk_sign_language=Ghandruk Sign Language -controlledvocabulary.language.ghanongga=Ghanongga -controlledvocabulary.language.ghari=Ghari -controlledvocabulary.language.ghayavi=Ghayavi -controlledvocabulary.language.gheg_albanian=Gheg Albanian -controlledvocabulary.language.ghera=Ghera -controlledvocabulary.language.ghodoberi=Ghodoberi -controlledvocabulary.language.ghomara=Ghomara -controlledvocabulary.language.ghomala'=Ghomálá' -controlledvocabulary.language.ghotuo=Ghotuo -controlledvocabulary.language.ghulfan=Ghulfan -controlledvocabulary.language.giangan=Giangan -controlledvocabulary.language.gibanawa=Gibanawa -controlledvocabulary.language.gidar=Gidar -controlledvocabulary.language.giiwo=Giiwo -controlledvocabulary.language.gikyode=Gikyode -controlledvocabulary.language.gilaki=Gilaki -controlledvocabulary.language.gilbertese=Gilbertese -controlledvocabulary.language.gilima=Gilima -controlledvocabulary.language.gilyak=Gilyak -controlledvocabulary.language.gimi_(eastern_highlands)=Gimi (Eastern Highlands) -controlledvocabulary.language.gimi_(west_new_britain)=Gimi (West New Britain) -controlledvocabulary.language.gimme=Gimme -controlledvocabulary.language.gimnime=Gimnime -controlledvocabulary.language.ginuman=Ginuman -controlledvocabulary.language.ginyanga=Ginyanga -controlledvocabulary.language.girawa=Girawa -controlledvocabulary.language.girirra=Girirra -controlledvocabulary.language.giryama=Giryama -controlledvocabulary.language.githabul=Githabul -controlledvocabulary.language.gitonga=Gitonga -controlledvocabulary.language.gitua=Gitua -controlledvocabulary.language.gitxsan=Gitxsan -controlledvocabulary.language.giyug=Giyug -controlledvocabulary.language.gizrra=Gizrra -controlledvocabulary.language.glaro-twabo=Glaro-Twabo -controlledvocabulary.language.glavda=Glavda -controlledvocabulary.language.glio-oubi=Glio-Oubi -controlledvocabulary.language.gnau=Gnau -controlledvocabulary.language.goan_konkani=Goan Konkani -controlledvocabulary.language.goaria=Goaria -controlledvocabulary.language.gobasi=Gobasi -controlledvocabulary.language.gobu=Gobu -controlledvocabulary.language.godie=Godié -controlledvocabulary.language.godwari=Godwari -controlledvocabulary.language.goemai=Goemai -controlledvocabulary.language.gofa=Gofa -controlledvocabulary.language.gogo=Gogo -controlledvocabulary.language.gogodala=Gogodala -controlledvocabulary.language.gokana=Gokana -controlledvocabulary.language.gola=Gola -controlledvocabulary.language.golin=Golin -controlledvocabulary.language.golpa=Golpa -controlledvocabulary.language.gondi=Gondi -controlledvocabulary.language.gone_dau=Gone Dau -controlledvocabulary.language.gongduk=Gongduk -controlledvocabulary.language.gonja=Gonja -controlledvocabulary.language.goo=Goo -controlledvocabulary.language.gooniyandi=Gooniyandi -controlledvocabulary.language.gor=Gor -controlledvocabulary.language.gorakor=Gorakor -controlledvocabulary.language.gorap=Gorap -controlledvocabulary.language.goreng=Goreng -controlledvocabulary.language.gorontalo=Gorontalo -controlledvocabulary.language.gorovu=Gorovu -controlledvocabulary.language.gorowa=Gorowa -controlledvocabulary.language.gothic=Gothic -controlledvocabulary.language.goundo=Goundo -controlledvocabulary.language.gourmanchema=Gourmanchéma -controlledvocabulary.language.gowlan=Gowlan -controlledvocabulary.language.gowli=Gowli -controlledvocabulary.language.gowro=Gowro -controlledvocabulary.language.gozarkhani=Gozarkhani -controlledvocabulary.language.grangali=Grangali -controlledvocabulary.language.grass_koiari=Grass Koiari -controlledvocabulary.language.grebo=Grebo -controlledvocabulary.language.greek_sign_language=Greek Sign Language -controlledvocabulary.language.green_gelao=Green Gelao -controlledvocabulary.language.greenlandic,_kalaallisut=Greenlandic, Kalaallisut -controlledvocabulary.language.grenadian_creole_english=Grenadian Creole English -controlledvocabulary.language.gresi=Gresi -controlledvocabulary.language.groma=Groma -controlledvocabulary.language.gronings=Gronings -controlledvocabulary.language.gros_ventre=Gros Ventre -controlledvocabulary.language.gua=Gua -controlledvocabulary.language.guadeloupean_creole_french=Guadeloupean Creole French -controlledvocabulary.language.guahibo=Guahibo -controlledvocabulary.language.guajajara=Guajajára -controlledvocabulary.language.guaja=Guajá -controlledvocabulary.language.guambiano=Guambiano -controlledvocabulary.language.guana_(brazil)=Guana (Brazil) -controlledvocabulary.language.guana_(paraguay)=Guana (Paraguay) -controlledvocabulary.language.guanano=Guanano -controlledvocabulary.language.guanche=Guanche -controlledvocabulary.language.guanyinqiao=Guanyinqiao -controlledvocabulary.language.guarani,_guarani=Guarani, Guaraní -controlledvocabulary.language.guarayu=Guarayu -controlledvocabulary.language.guarequena=Guarequena -controlledvocabulary.language.guatemalan_sign_language=Guatemalan Sign Language -controlledvocabulary.language.guato=Guató -controlledvocabulary.language.guayabero=Guayabero -controlledvocabulary.language.gudang=Gudang -controlledvocabulary.language.gudanji=Gudanji -controlledvocabulary.language.gude=Gude -controlledvocabulary.language.gudu=Gudu -controlledvocabulary.language.guduf-gava=Guduf-Gava -controlledvocabulary.language.guerrero_amuzgo=Guerrero Amuzgo -controlledvocabulary.language.guerrero_nahuatl=Guerrero Nahuatl -controlledvocabulary.language.guevea_de_humboldt_zapotec=Guevea De Humboldt Zapotec -controlledvocabulary.language.gugadj=Gugadj -controlledvocabulary.language.gugu_badhun=Gugu Badhun -controlledvocabulary.language.gugu_warra=Gugu Warra -controlledvocabulary.language.gugubera=Gugubera -controlledvocabulary.language.guhu-samane=Guhu-Samane -controlledvocabulary.language.guianese_creole_french=Guianese Creole French -controlledvocabulary.language.guibei_zhuang=Guibei Zhuang -controlledvocabulary.language.guiberoua_bete=Guiberoua Béte -controlledvocabulary.language.guibian_zhuang=Guibian Zhuang -controlledvocabulary.language.guinea_kpelle=Guinea Kpelle -controlledvocabulary.language.guinea-bissau_sign_language=Guinea-Bissau Sign Language -controlledvocabulary.language.guinean_sign_language=Guinean Sign Language -controlledvocabulary.language.guiqiong=Guiqiong -controlledvocabulary.language.gujarati=Gujarati -controlledvocabulary.language.gujari=Gujari -controlledvocabulary.language.gula_(central_african_republic)=Gula (Central African Republic) -controlledvocabulary.language.gula_(chad)=Gula (Chad) -controlledvocabulary.language.gula_iro=Gula Iro -controlledvocabulary.language.gula'alaa=Gula'alaa -controlledvocabulary.language.gulay=Gulay -controlledvocabulary.language.gule=Gule -controlledvocabulary.language.gulf_arabic=Gulf Arabic -controlledvocabulary.language.gumalu=Gumalu -controlledvocabulary.language.gumatj=Gumatj -controlledvocabulary.language.gumawana=Gumawana -controlledvocabulary.language.gumuz=Gumuz -controlledvocabulary.language.gun=Gun -controlledvocabulary.language.gundi=Gundi -controlledvocabulary.language.gunditjmara=Gunditjmara -controlledvocabulary.language.gundungurra=Gundungurra -controlledvocabulary.language.gungabula=Gungabula -controlledvocabulary.language.gungu=Gungu -controlledvocabulary.language.guntai=Guntai -controlledvocabulary.language.gunwinggu=Gunwinggu -controlledvocabulary.language.gunya=Gunya -controlledvocabulary.language.gupa-abawa=Gupa-Abawa -controlledvocabulary.language.gupapuyngu=Gupapuyngu -controlledvocabulary.language.guramalum=Guramalum -controlledvocabulary.language.gurani=Gurani -controlledvocabulary.language.gurdjar=Gurdjar -controlledvocabulary.language.gureng_gureng=Gureng Gureng -controlledvocabulary.language.gurgula=Gurgula -controlledvocabulary.language.guriaso=Guriaso -controlledvocabulary.language.gurindji=Gurindji -controlledvocabulary.language.gurindji_kriol=Gurindji Kriol -controlledvocabulary.language.gurmana=Gurmana -controlledvocabulary.language.guro=Guro -controlledvocabulary.language.gurr-goni=Gurr-goni -controlledvocabulary.language.gurung=Gurung -controlledvocabulary.language.guruntum-mbaaru=Guruntum-Mbaaru -controlledvocabulary.language.gusii=Gusii -controlledvocabulary.language.gusilay=Gusilay -controlledvocabulary.language.guugu_yimidhirr=Guugu Yimidhirr -controlledvocabulary.language.guwa=Guwa -controlledvocabulary.language.guwamu=Guwamu -controlledvocabulary.language.guya=Guya -controlledvocabulary.language.guyanese_creole_english=Guyanese Creole English -controlledvocabulary.language.guyani=Guyani -controlledvocabulary.language.gvoko=Gvoko -controlledvocabulary.language.gwa=Gwa -controlledvocabulary.language.gwahatike=Gwahatike -controlledvocabulary.language.gwak=Gwak -controlledvocabulary.language.gwamhi-wuri=Gwamhi-Wuri -controlledvocabulary.language.gwandara=Gwandara -controlledvocabulary.language.gweda=Gweda -controlledvocabulary.language.gweno=Gweno -controlledvocabulary.language.gwere=Gwere -controlledvocabulary.language.gwichʼin=Gwichʼin -controlledvocabulary.language.gyalsumdo=Gyalsumdo -controlledvocabulary.language.gyele=Gyele -controlledvocabulary.language.gyem=Gyem -controlledvocabulary.language.guila_zapotec=Güilá Zapotec -controlledvocabulary.language.gandhari=Gāndhārī -controlledvocabulary.language.ha=Ha -controlledvocabulary.language.habu=Habu -controlledvocabulary.language.hadiyya=Hadiyya -controlledvocabulary.language.hadothi=Hadothi -controlledvocabulary.language.hadrami=Hadrami -controlledvocabulary.language.hadrami_arabic=Hadrami Arabic -controlledvocabulary.language.hadza=Hadza -controlledvocabulary.language.haeke=Haeke -controlledvocabulary.language.hahon=Hahon -controlledvocabulary.language.haida=Haida -controlledvocabulary.language.haigwai=Haigwai -controlledvocabulary.language.haiphong_sign_language=Haiphong Sign Language -controlledvocabulary.language.haisla=Haisla -controlledvocabulary.language.haitian_creole,_haitian=Haitian Creole, Haitian -controlledvocabulary.language.haitian_vodoun_culture_language=Haitian Vodoun Culture Language -controlledvocabulary.language.haiǁom=Haiǁom -controlledvocabulary.language.haji=Haji -controlledvocabulary.language.hajong=Hajong -controlledvocabulary.language.hakha_chin=Hakha Chin -controlledvocabulary.language.hakka_chinese=Hakka Chinese -controlledvocabulary.language.hako=Hakö -controlledvocabulary.language.halang=Halang -controlledvocabulary.language.halang_doan=Halang Doan -controlledvocabulary.language.halbi=Halbi -controlledvocabulary.language.halh_mongolian=Halh Mongolian -controlledvocabulary.language.halia=Halia -controlledvocabulary.language.halkomelem=Halkomelem -controlledvocabulary.language.hamap=Hamap -controlledvocabulary.language.hamba=Hamba -controlledvocabulary.language.hamer-banna=Hamer-Banna -controlledvocabulary.language.hamtai=Hamtai -controlledvocabulary.language.han=Han -controlledvocabulary.language.hanga=Hanga -controlledvocabulary.language.hanga_hundi=Hanga Hundi -controlledvocabulary.language.hangaza=Hangaza -controlledvocabulary.language.hani=Hani -controlledvocabulary.language.hano=Hano -controlledvocabulary.language.hanoi_sign_language=Hanoi Sign Language -controlledvocabulary.language.hanunoo=Hanunoo -controlledvocabulary.language.harami=Harami -controlledvocabulary.language.harari=Harari -controlledvocabulary.language.harijan_kinnauri=Harijan Kinnauri -controlledvocabulary.language.haroi=Haroi -controlledvocabulary.language.harsusi=Harsusi -controlledvocabulary.language.haruai=Haruai -controlledvocabulary.language.haruku=Haruku -controlledvocabulary.language.haryanvi=Haryanvi -controlledvocabulary.language.harzani=Harzani -controlledvocabulary.language.hasha=Hasha -controlledvocabulary.language.hassaniyya=Hassaniyya -controlledvocabulary.language.hatam=Hatam -controlledvocabulary.language.hattic=Hattic -controlledvocabulary.language.hausa=Hausa -controlledvocabulary.language.hausa_sign_language=Hausa Sign Language -controlledvocabulary.language.havasupai-walapai-yavapai=Havasupai-Walapai-Yavapai -controlledvocabulary.language.haveke=Haveke -controlledvocabulary.language.havu=Havu -controlledvocabulary.language.hawai'i_creole_english=Hawai'i Creole English -controlledvocabulary.language.hawai'i_sign_language_(hsl)=Hawai'i Sign Language (HSL) -controlledvocabulary.language.hawaiian=Hawaiian -controlledvocabulary.language.haya=Haya -controlledvocabulary.language.hazaragi=Hazaragi -controlledvocabulary.language.hdi=Hdi -controlledvocabulary.language.hebrew_(modern),_hebrew=Hebrew (modern), Hebrew -controlledvocabulary.language.hehe=Hehe -controlledvocabulary.language.heiban=Heiban -controlledvocabulary.language.heiltsuk=Heiltsuk -controlledvocabulary.language.helong=Helong -controlledvocabulary.language.hema=Hema -controlledvocabulary.language.hemba=Hemba -controlledvocabulary.language.herde=Herdé -controlledvocabulary.language.herero=Herero -controlledvocabulary.language.hermit=Hermit -controlledvocabulary.language.hernican=Hernican -controlledvocabulary.language.hewa=Hewa -controlledvocabulary.language.heyo=Heyo -controlledvocabulary.language.hiberno-scottish_gaelic=Hiberno-Scottish Gaelic -controlledvocabulary.language.hibito=Hibito -controlledvocabulary.language.hidatsa=Hidatsa -controlledvocabulary.language.hieroglyphic_luwian=Hieroglyphic Luwian -controlledvocabulary.language.higaonon=Higaonon -controlledvocabulary.language.highland_konjo=Highland Konjo -controlledvocabulary.language.highland_oaxaca_chontal=Highland Oaxaca Chontal -controlledvocabulary.language.highland_popoluca=Highland Popoluca -controlledvocabulary.language.highland_puebla_nahuatl=Highland Puebla Nahuatl -controlledvocabulary.language.highland_totonac=Highland Totonac -controlledvocabulary.language.hijazi_arabic=Hijazi Arabic -controlledvocabulary.language.hijuk=Hijuk -controlledvocabulary.language.hiligaynon=Hiligaynon -controlledvocabulary.language.himarima=Himarimã -controlledvocabulary.language.hindi=Hindi -controlledvocabulary.language.hinduri=Hinduri -controlledvocabulary.language.hinukh=Hinukh -controlledvocabulary.language.hiri_motu=Hiri Motu -controlledvocabulary.language.hittite=Hittite -controlledvocabulary.language.hitu=Hitu -controlledvocabulary.language.hiw=Hiw -controlledvocabulary.language.hixkaryana=Hixkaryána -controlledvocabulary.language.hlai=Hlai -controlledvocabulary.language.hlepho_phowa=Hlepho Phowa -controlledvocabulary.language.hlersu=Hlersu -controlledvocabulary.language.hmar=Hmar -controlledvocabulary.language.hmong=Hmong -controlledvocabulary.language.hmong_daw=Hmong Daw -controlledvocabulary.language.hmong_don=Hmong Don -controlledvocabulary.language.hmong_do=Hmong Dô -controlledvocabulary.language.hmong_njua=Hmong Njua -controlledvocabulary.language.hmong_shua=Hmong Shua -controlledvocabulary.language.hmwaveke=Hmwaveke -controlledvocabulary.language.ho=Ho -controlledvocabulary.language.ho_chi_minh_city_sign_language=Ho Chi Minh City Sign Language -controlledvocabulary.language.ho-chunk=Ho-Chunk -controlledvocabulary.language.hoava=Hoava -controlledvocabulary.language.hobyot=Hobyót -controlledvocabulary.language.hoia_hoia=Hoia Hoia -controlledvocabulary.language.holikachuk=Holikachuk -controlledvocabulary.language.holiya=Holiya -controlledvocabulary.language.holma=Holma -controlledvocabulary.language.holoholo=Holoholo -controlledvocabulary.language.holu=Holu -controlledvocabulary.language.homa=Homa -controlledvocabulary.language.honduras_sign_language=Honduras Sign Language -controlledvocabulary.language.hong_kong_sign_language=Hong Kong Sign Language -controlledvocabulary.language.honi=Honi -controlledvocabulary.language.hopi=Hopi -controlledvocabulary.language.horned_miao=Horned Miao -controlledvocabulary.language.horo=Horo -controlledvocabulary.language.horom=Horom -controlledvocabulary.language.horpa=Horpa -controlledvocabulary.language.hote=Hote -controlledvocabulary.language.hoti=Hoti -controlledvocabulary.language.hovongan=Hovongan -controlledvocabulary.language.hoyahoya=Hoyahoya -controlledvocabulary.language.hozo=Hozo -controlledvocabulary.language.hpon=Hpon -controlledvocabulary.language.hrangkhol=Hrangkhol -controlledvocabulary.language.hre=Hre -controlledvocabulary.language.hruso=Hruso -controlledvocabulary.language.hu=Hu -controlledvocabulary.language.huachipaeri=Huachipaeri -controlledvocabulary.language.huallaga_huanuco_quechua=Huallaga Huánuco Quechua -controlledvocabulary.language.huamalies-dos_de_mayo_huanuco_quechua=Huamalíes-Dos de Mayo Huánuco Quechua -controlledvocabulary.language.huambisa=Huambisa -controlledvocabulary.language.huarijio=Huarijio -controlledvocabulary.language.huastec=Huastec -controlledvocabulary.language.huaulu=Huaulu -controlledvocabulary.language.huautla_mazatec=Huautla Mazatec -controlledvocabulary.language.huaxcaleca_nahuatl=Huaxcaleca Nahuatl -controlledvocabulary.language.huaylas_ancash_quechua=Huaylas Ancash Quechua -controlledvocabulary.language.huaylla_wanca_quechua=Huaylla Wanca Quechua -controlledvocabulary.language.huba=Huba -controlledvocabulary.language.huehuetla_tepehua=Huehuetla Tepehua -controlledvocabulary.language.huichol=Huichol -controlledvocabulary.language.huilliche=Huilliche -controlledvocabulary.language.huitepec_mixtec=Huitepec Mixtec -controlledvocabulary.language.huizhou_chinese=Huizhou Chinese -controlledvocabulary.language.hukumina=Hukumina -controlledvocabulary.language.hula=Hula -controlledvocabulary.language.hulaula=Hulaulá -controlledvocabulary.language.huli=Huli -controlledvocabulary.language.hulung=Hulung -controlledvocabulary.language.humburi_senni_songhay=Humburi Senni Songhay -controlledvocabulary.language.humene=Humene -controlledvocabulary.language.humla=Humla -controlledvocabulary.language.hunde=Hunde -controlledvocabulary.language.hung=Hung -controlledvocabulary.language.hungana=Hungana -controlledvocabulary.language.hungarian=Hungarian -controlledvocabulary.language.hungarian_sign_language=Hungarian Sign Language -controlledvocabulary.language.hungu=Hungu -controlledvocabulary.language.hunjara-kaina_ke=Hunjara-Kaina Ke -controlledvocabulary.language.hunnic=Hunnic -controlledvocabulary.language.hunsrik=Hunsrik -controlledvocabulary.language.hunzib=Hunzib -controlledvocabulary.language.hupa=Hupa -controlledvocabulary.language.hupde=Hupdë -controlledvocabulary.language.hupla=Hupla -controlledvocabulary.language.hurrian=Hurrian -controlledvocabulary.language.hutterite_german=Hutterite German -controlledvocabulary.language.hwana=Hwana -controlledvocabulary.language.hya=Hya -controlledvocabulary.language.hyam=Hyam -controlledvocabulary.language.hyolmo=Hyolmo -controlledvocabulary.language.hertevin=Hértevin -controlledvocabulary.language.hone=Hõne -controlledvocabulary.language.i-wak=I-Wak -controlledvocabulary.language.iaai=Iaai -controlledvocabulary.language.iamalele=Iamalele -controlledvocabulary.language.iatmul=Iatmul -controlledvocabulary.language.iau=Iau -controlledvocabulary.language.ibali_teke=Ibali Teke -controlledvocabulary.language.ibaloi=Ibaloi -controlledvocabulary.language.iban=Iban -controlledvocabulary.language.ibanag=Ibanag -controlledvocabulary.language.ibani=Ibani -controlledvocabulary.language.ibatan=Ibatan -controlledvocabulary.language.iberian=Iberian -controlledvocabulary.language.ibibio=Ibibio -controlledvocabulary.language.ibino=Ibino -controlledvocabulary.language.ibu=Ibu -controlledvocabulary.language.ibuoro=Ibuoro -controlledvocabulary.language.icelandic=Icelandic -controlledvocabulary.language.icelandic_sign_language=Icelandic Sign Language -controlledvocabulary.language.iceve-maci=Iceve-Maci -controlledvocabulary.language.ida'an=Ida'an -controlledvocabulary.language.idakho-isukha-tiriki=Idakho-Isukha-Tiriki -controlledvocabulary.language.idate=Idaté -controlledvocabulary.language.idere=Idere -controlledvocabulary.language.idesa=Idesa -controlledvocabulary.language.idi=Idi -controlledvocabulary.language.ido=Ido -controlledvocabulary.language.idoma=Idoma -controlledvocabulary.language.idon=Idon -controlledvocabulary.language.idu-mishmi=Idu-Mishmi -controlledvocabulary.language.iduna=Iduna -controlledvocabulary.language.ifo=Ifo -controlledvocabulary.language.ife=Ifè -controlledvocabulary.language.igala=Igala -controlledvocabulary.language.igana=Igana -controlledvocabulary.language.igbo=Igbo -controlledvocabulary.language.igede=Igede -controlledvocabulary.language.ignaciano=Ignaciano -controlledvocabulary.language.igo=Igo -controlledvocabulary.language.iguta=Iguta -controlledvocabulary.language.igwe=Igwe -controlledvocabulary.language.iha=Iha -controlledvocabulary.language.iha_based_pidgin=Iha Based Pidgin -controlledvocabulary.language.ihievbe=Ihievbe -controlledvocabulary.language.ik=Ik -controlledvocabulary.language.ika=Ika -controlledvocabulary.language.ikaranggal=Ikaranggal -controlledvocabulary.language.ikhin-arokho=Ikhin-Arokho -controlledvocabulary.language.ikizu=Ikizu -controlledvocabulary.language.iko=Iko -controlledvocabulary.language.ikobi=Ikobi -controlledvocabulary.language.ikoma-nata-isenye=Ikoma-Nata-Isenye -controlledvocabulary.language.ikpeng=Ikpeng -controlledvocabulary.language.ikpeshi=Ikpeshi -controlledvocabulary.language.ikposo=Ikposo -controlledvocabulary.language.iku-gora-ankwa=Iku-Gora-Ankwa -controlledvocabulary.language.ikulu=Ikulu -controlledvocabulary.language.ikwere=Ikwere -controlledvocabulary.language.ikwo=Ikwo -controlledvocabulary.language.ila=Ila -controlledvocabulary.language.ile_ape=Ile Ape -controlledvocabulary.language.ili_turki=Ili Turki -controlledvocabulary.language.ili'uun=Ili'uun -controlledvocabulary.language.ilianen_manobo=Ilianen Manobo -controlledvocabulary.language.illyrian=Illyrian -controlledvocabulary.language.iloko=Iloko -controlledvocabulary.language.ilongot=Ilongot -controlledvocabulary.language.ilue=Ilue -controlledvocabulary.language.ilwana=Ilwana -controlledvocabulary.language.imbabura_highland_quichua=Imbabura Highland Quichua -controlledvocabulary.language.imbongu=Imbongu -controlledvocabulary.language.imonda=Imonda -controlledvocabulary.language.imotong=Imotong -controlledvocabulary.language.imroing=Imroing -controlledvocabulary.language.inabaknon=Inabaknon -controlledvocabulary.language.inapang=Inapang -controlledvocabulary.language.inari_sami=Inari Sami -controlledvocabulary.language.indian_sign_language=Indian Sign Language -controlledvocabulary.language.indo-portuguese=Indo-Portuguese -controlledvocabulary.language.indonesian=Indonesian -controlledvocabulary.language.indonesian_bajau=Indonesian Bajau -controlledvocabulary.language.indonesian_sign_language=Indonesian Sign Language -controlledvocabulary.language.indri=Indri -controlledvocabulary.language.indus_kohistani=Indus Kohistani -controlledvocabulary.language.indus_valley_language=Indus Valley Language -controlledvocabulary.language.inebu_one=Inebu One -controlledvocabulary.language.ineseno=Ineseño -controlledvocabulary.language.inga=Inga -controlledvocabulary.language.ingrian=Ingrian -controlledvocabulary.language.ingush=Ingush -controlledvocabulary.language.inlaod_itneg=Inlaod Itneg -controlledvocabulary.language.innu=Innu -controlledvocabulary.language.inoke-yate=Inoke-Yate -controlledvocabulary.language.inonhan=Inonhan -controlledvocabulary.language.inor=Inor -controlledvocabulary.language.inpui_naga=Inpui Naga -controlledvocabulary.language.interglossa=Interglossa -controlledvocabulary.language.interlingua,_interlingua_(international_auxiliary_language_association)=Interlingua, Interlingua (International Auxiliary Language Association) -controlledvocabulary.language.interlingue=Interlingue -controlledvocabulary.language.international_sign=International Sign -controlledvocabulary.language.interslavic=Interslavic -controlledvocabulary.language.intha=Intha -controlledvocabulary.language.inuinnaqtun=Inuinnaqtun -controlledvocabulary.language.inuit_sign_language=Inuit Sign Language -controlledvocabulary.language.inuktitut=Inuktitut -controlledvocabulary.language.inupiaq=Inupiaq -controlledvocabulary.language.iowa-oto=Iowa-Oto -controlledvocabulary.language.ipalapa_amuzgo=Ipalapa Amuzgo -controlledvocabulary.language.ipiko=Ipiko -controlledvocabulary.language.ipili=Ipili -controlledvocabulary.language.ipulo=Ipulo -controlledvocabulary.language.iquito=Iquito -controlledvocabulary.language.ir=Ir -controlledvocabulary.language.iranian_persian=Iranian Persian -controlledvocabulary.language.iranian_sign_language=Iranian Sign Language -controlledvocabulary.language.iranun_(malaysia)=Iranun (Malaysia) -controlledvocabulary.language.iranun_(philippines)=Iranun (Philippines) -controlledvocabulary.language.iraqw=Iraqw -controlledvocabulary.language.irarutu=Irarutu -controlledvocabulary.language.iraya=Iraya -controlledvocabulary.language.iresim=Iresim -controlledvocabulary.language.irish=Irish -controlledvocabulary.language.irish_sign_language=Irish Sign Language -controlledvocabulary.language.irula=Irula -controlledvocabulary.language.irantxe=Irántxe -controlledvocabulary.language.isabi=Isabi -controlledvocabulary.language.isanzu=Isanzu -controlledvocabulary.language.isarog_agta=Isarog Agta -controlledvocabulary.language.isconahua=Isconahua -controlledvocabulary.language.isebe=Isebe -controlledvocabulary.language.isekiri=Isekiri -controlledvocabulary.language.ishkashimi=Ishkashimi -controlledvocabulary.language.isinai=Isinai -controlledvocabulary.language.isirawa=Isirawa -controlledvocabulary.language.island_carib=Island Carib -controlledvocabulary.language.islander_creole_english=Islander Creole English -controlledvocabulary.language.isnag=Isnag -controlledvocabulary.language.isoko=Isoko -controlledvocabulary.language.israeli_sign_language=Israeli Sign Language -controlledvocabulary.language.isthmus_mixe=Isthmus Mixe -controlledvocabulary.language.isthmus_zapotec=Isthmus Zapotec -controlledvocabulary.language.isthmus-cosoleacaque_nahuatl=Isthmus-Cosoleacaque Nahuatl -controlledvocabulary.language.isthmus-mecayapan_nahuatl=Isthmus-Mecayapan Nahuatl -controlledvocabulary.language.isthmus-pajapan_nahuatl=Isthmus-Pajapan Nahuatl -controlledvocabulary.language.istriot=Istriot -controlledvocabulary.language.istro_romanian=Istro Romanian -controlledvocabulary.language.isu_(fako_division)=Isu (Fako Division) -controlledvocabulary.language.isu_(menchum_division)=Isu (Menchum Division) -controlledvocabulary.language.italian=Italian -controlledvocabulary.language.italian_sign_language=Italian Sign Language -controlledvocabulary.language.itawit=Itawit -controlledvocabulary.language.itelmen=Itelmen -controlledvocabulary.language.itene=Itene -controlledvocabulary.language.iteri=Iteri -controlledvocabulary.language.itik=Itik -controlledvocabulary.language.ito=Ito -controlledvocabulary.language.itonama=Itonama -controlledvocabulary.language.itu_mbon_uzo=Itu Mbon Uzo -controlledvocabulary.language.itundujia_mixtec=Itundujia Mixtec -controlledvocabulary.language.itza=Itzá -controlledvocabulary.language.iu_mien=Iu Mien -controlledvocabulary.language.ivatan=Ivatan -controlledvocabulary.language.ivbie_north-okpela-arhe=Ivbie North-Okpela-Arhe -controlledvocabulary.language.iwaidja=Iwaidja -controlledvocabulary.language.iwal=Iwal -controlledvocabulary.language.iwam=Iwam -controlledvocabulary.language.iwur=Iwur -controlledvocabulary.language.ixcatec=Ixcatec -controlledvocabulary.language.ixcatlan_mazatec=Ixcatlán Mazatec -controlledvocabulary.language.ixil=Ixil -controlledvocabulary.language.ixtayutla_mixtec=Ixtayutla Mixtec -controlledvocabulary.language.ixtenco_otomi=Ixtenco Otomi -controlledvocabulary.language.iyayu=Iyayu -controlledvocabulary.language.iyive=Iyive -controlledvocabulary.language.iyo=Iyo -controlledvocabulary.language.iyo'wujwa_chorote=Iyo'wujwa Chorote -controlledvocabulary.language.iyojwa'ja_chorote=Iyojwa'ja Chorote -controlledvocabulary.language.izere=Izere -controlledvocabulary.language.izii=Izii -controlledvocabulary.language.izon=Izon -controlledvocabulary.language.izora=Izora -controlledvocabulary.language.inapari=Iñapari -controlledvocabulary.language.jabuti=Jabutí -controlledvocabulary.language.jad=Jad -controlledvocabulary.language.jadgali=Jadgali -controlledvocabulary.language.jah_hut=Jah Hut -controlledvocabulary.language.jahanka=Jahanka -controlledvocabulary.language.jair_awyu=Jair Awyu -controlledvocabulary.language.jaitmatang=Jaitmatang -controlledvocabulary.language.jakati=Jakati -controlledvocabulary.language.jakattoe=Jakattoe -controlledvocabulary.language.jakun=Jakun -controlledvocabulary.language.jalapa_de_diaz_mazatec=Jalapa De Díaz Mazatec -controlledvocabulary.language.jalkunan=Jalkunan -controlledvocabulary.language.jamaican_country_sign_language=Jamaican Country Sign Language -controlledvocabulary.language.jamaican_creole_english=Jamaican Creole English -controlledvocabulary.language.jamaican_sign_language=Jamaican Sign Language -controlledvocabulary.language.jamamadi=Jamamadí -controlledvocabulary.language.jambi_malay=Jambi Malay -controlledvocabulary.language.jamiltepec_mixtec=Jamiltepec Mixtec -controlledvocabulary.language.jamsay_dogon=Jamsay Dogon -controlledvocabulary.language.jandai=Jandai -controlledvocabulary.language.jandavra=Jandavra -controlledvocabulary.language.jangkang=Jangkang -controlledvocabulary.language.jangshung=Jangshung -controlledvocabulary.language.janji=Janji -controlledvocabulary.language.japanese=Japanese -controlledvocabulary.language.japanese_sign_language=Japanese Sign Language -controlledvocabulary.language.japreria=Japrería -controlledvocabulary.language.jaqaru=Jaqaru -controlledvocabulary.language.jara=Jara -controlledvocabulary.language.jarai=Jarai -controlledvocabulary.language.jarawa_(india)=Jarawa (India) -controlledvocabulary.language.jaru=Jaru -controlledvocabulary.language.jauja_wanca_quechua=Jauja Wanca Quechua -controlledvocabulary.language.jaunsari=Jaunsari -controlledvocabulary.language.javanese=Javanese -controlledvocabulary.language.javindo=Javindo -controlledvocabulary.language.jawe=Jawe -controlledvocabulary.language.jawoyn=Jawoyn -controlledvocabulary.language.jaya=Jaya -controlledvocabulary.language.jebero=Jebero -controlledvocabulary.language.jeh=Jeh -controlledvocabulary.language.jehai=Jehai -controlledvocabulary.language.jejara_naga=Jejara Naga -controlledvocabulary.language.jejueo=Jejueo -controlledvocabulary.language.jemez=Jemez -controlledvocabulary.language.jenaama_bozo=Jenaama Bozo -controlledvocabulary.language.jennu_kurumba=Jennu Kurumba -controlledvocabulary.language.jere=Jere -controlledvocabulary.language.jeri_kuo=Jeri Kuo -controlledvocabulary.language.jerung=Jerung -controlledvocabulary.language.jewish_babylonian_aramaic_(ca._200-1200_ce)=Jewish Babylonian Aramaic (ca. 200-1200 CE) -controlledvocabulary.language.jewish_palestinian_aramaic=Jewish Palestinian Aramaic -controlledvocabulary.language.jhankot_sign_language=Jhankot Sign Language -controlledvocabulary.language.jiamao=Jiamao -controlledvocabulary.language.jiarong=Jiarong -controlledvocabulary.language.jiba=Jiba -controlledvocabulary.language.jibu=Jibu -controlledvocabulary.language.jicarilla_apache=Jicarilla Apache -controlledvocabulary.language.jiiddu=Jiiddu -controlledvocabulary.language.jilbe=Jilbe -controlledvocabulary.language.jilim=Jilim -controlledvocabulary.language.jimi_(cameroon)=Jimi (Cameroon) -controlledvocabulary.language.jimi_(nigeria)=Jimi (Nigeria) -controlledvocabulary.language.jina=Jina -controlledvocabulary.language.jingulu=Jingulu -controlledvocabulary.language.jinyu_chinese=Jinyu Chinese -controlledvocabulary.language.jiongnai_bunu=Jiongnai Bunu -controlledvocabulary.language.jirel=Jirel -controlledvocabulary.language.jiru=Jiru -controlledvocabulary.language.jita=Jita -controlledvocabulary.language.jju=Jju -controlledvocabulary.language.joba=Joba -controlledvocabulary.language.jofotek-bromnya=Jofotek-Bromnya -controlledvocabulary.language.jogi=Jogi -controlledvocabulary.language.jola-fonyi=Jola-Fonyi -controlledvocabulary.language.jola-kasa=Jola-Kasa -controlledvocabulary.language.jonkor_bourmataguil=Jonkor Bourmataguil -controlledvocabulary.language.jordanian_sign_language=Jordanian Sign Language -controlledvocabulary.language.jora=Jorá -controlledvocabulary.language.jowulu=Jowulu -controlledvocabulary.language.ju=Ju -controlledvocabulary.language.juang=Juang -controlledvocabulary.language.judeo-arabic=Judeo-Arabic -controlledvocabulary.language.judeo-berber=Judeo-Berber -controlledvocabulary.language.judeo-georgian=Judeo-Georgian -controlledvocabulary.language.judeo-iraqi_arabic=Judeo-Iraqi Arabic -controlledvocabulary.language.judeo-italian=Judeo-Italian -controlledvocabulary.language.judeo-moroccan_arabic=Judeo-Moroccan Arabic -controlledvocabulary.language.judeo-persian=Judeo-Persian -controlledvocabulary.language.judeo-tat=Judeo-Tat -controlledvocabulary.language.judeo-tripolitanian_arabic=Judeo-Tripolitanian Arabic -controlledvocabulary.language.judeo-yemeni_arabic=Judeo-Yemeni Arabic -controlledvocabulary.language.jukun_takum=Jukun Takum -controlledvocabulary.language.jumjum=Jumjum -controlledvocabulary.language.jumla_sign_language=Jumla Sign Language -controlledvocabulary.language.jumli=Jumli -controlledvocabulary.language.jungle_inga=Jungle Inga -controlledvocabulary.language.juquila_mixe=Juquila Mixe -controlledvocabulary.language.jur_modo=Jur Modo -controlledvocabulary.language.juray=Juray -controlledvocabulary.language.jurchen=Jurchen -controlledvocabulary.language.juruna=Jurúna -controlledvocabulary.language.jutish=Jutish -controlledvocabulary.language.juwal=Juwal -controlledvocabulary.language.juxtlahuaca_mixtec=Juxtlahuaca Mixtec -controlledvocabulary.language.juǀʼhoan=Juǀʼhoan -controlledvocabulary.language.jwira-pepesa=Jwira-Pepesa -controlledvocabulary.language.jerriais=Jèrriais -controlledvocabulary.language.juma=Júma -controlledvocabulary.language.k'iche'=K'iche' -controlledvocabulary.language.kaamba=Kaamba -controlledvocabulary.language.kaan=Kaan -controlledvocabulary.language.kaang_chin=Kaang Chin -controlledvocabulary.language.kaansa=Kaansa -controlledvocabulary.language.kaba=Kaba -controlledvocabulary.language.kabalai=Kabalai -controlledvocabulary.language.kabardian=Kabardian -controlledvocabulary.language.kabatei=Kabatei -controlledvocabulary.language.kabiye=Kabiyè -controlledvocabulary.language.kabola=Kabola -controlledvocabulary.language.kabore_one=Kabore One -controlledvocabulary.language.kabras=Kabras -controlledvocabulary.language.kaburi=Kaburi -controlledvocabulary.language.kabutra=Kabutra -controlledvocabulary.language.kabuverdianu=Kabuverdianu -controlledvocabulary.language.kabwa=Kabwa -controlledvocabulary.language.kabwari=Kabwari -controlledvocabulary.language.kabyle=Kabyle -controlledvocabulary.language.kachama-ganjule=Kachama-Ganjule -controlledvocabulary.language.kachari=Kachari -controlledvocabulary.language.kachhi=Kachhi -controlledvocabulary.language.kachi_koli=Kachi Koli -controlledvocabulary.language.kachin=Kachin -controlledvocabulary.language.kachok=Kachok -controlledvocabulary.language.kacipo-bale_suri=Kacipo-Bale Suri -controlledvocabulary.language.kadai=Kadai -controlledvocabulary.language.kadar=Kadar -controlledvocabulary.language.kadaru=Kadaru -controlledvocabulary.language.kadazan_dusun=Kadazan Dusun -controlledvocabulary.language.kadiweu=Kadiwéu -controlledvocabulary.language.kadu=Kadu -controlledvocabulary.language.kadung=Kadung -controlledvocabulary.language.kaduo=Kaduo -controlledvocabulary.language.kaeku=Kaeku -controlledvocabulary.language.kaera=Kaera -controlledvocabulary.language.kafa=Kafa -controlledvocabulary.language.kafoa=Kafoa -controlledvocabulary.language.kagan_kalagan=Kagan Kalagan -controlledvocabulary.language.kagate=Kagate -controlledvocabulary.language.kagayanen=Kagayanen -controlledvocabulary.language.kagoma=Kagoma -controlledvocabulary.language.kagoro=Kagoro -controlledvocabulary.language.kagulu=Kagulu -controlledvocabulary.language.kahe=Kahe -controlledvocabulary.language.kahua=Kahua -controlledvocabulary.language.kaian=Kaian -controlledvocabulary.language.kaibobo=Kaibobo -controlledvocabulary.language.kaidipang=Kaidipang -controlledvocabulary.language.kaiep=Kaiep -controlledvocabulary.language.kaikadi=Kaikadi -controlledvocabulary.language.kaikavian_literary_language=Kaikavian Literary Language -controlledvocabulary.language.kaike=Kaike -controlledvocabulary.language.kaimbulawa=Kaimbulawa -controlledvocabulary.language.kaimbe=Kaimbé -controlledvocabulary.language.kaingang=Kaingang -controlledvocabulary.language.kairak=Kairak -controlledvocabulary.language.kairiru=Kairiru -controlledvocabulary.language.kairui-midiki=Kairui-Midiki -controlledvocabulary.language.kais=Kais -controlledvocabulary.language.kaitag=Kaitag -controlledvocabulary.language.kaivi=Kaivi -controlledvocabulary.language.kaiwa=Kaiwá -controlledvocabulary.language.kaiy=Kaiy -controlledvocabulary.language.kajakse=Kajakse -controlledvocabulary.language.kajali=Kajali -controlledvocabulary.language.kajaman=Kajaman -controlledvocabulary.language.kakabai=Kakabai -controlledvocabulary.language.kakabe=Kakabe -controlledvocabulary.language.kakanda=Kakanda -controlledvocabulary.language.kaki_ae=Kaki Ae -controlledvocabulary.language.kako=Kako -controlledvocabulary.language.kakwa=Kakwa -controlledvocabulary.language.kala_lagaw_ya=Kala Lagaw Ya -controlledvocabulary.language.kalaamaya=Kalaamaya -controlledvocabulary.language.kalabakan=Kalabakan -controlledvocabulary.language.kalabari=Kalabari -controlledvocabulary.language.kalabra=Kalabra -controlledvocabulary.language.kalagan=Kalagan -controlledvocabulary.language.kalaktang_monpa=Kalaktang Monpa -controlledvocabulary.language.kalam=Kalam -controlledvocabulary.language.kalamse=Kalamsé -controlledvocabulary.language.kalanadi=Kalanadi -controlledvocabulary.language.kalanga=Kalanga -controlledvocabulary.language.kalanguya=Kalanguya -controlledvocabulary.language.kalao=Kalao -controlledvocabulary.language.kalapuya=Kalapuya -controlledvocabulary.language.kalarko=Kalarko -controlledvocabulary.language.kalasha=Kalasha -controlledvocabulary.language.kalenjin=Kalenjin -controlledvocabulary.language.kalispel-pend_d'oreille=Kalispel-Pend d'Oreille -controlledvocabulary.language.kalkoti=Kalkoti -controlledvocabulary.language.kalkutung=Kalkutung -controlledvocabulary.language.kalmyk=Kalmyk -controlledvocabulary.language.kalo_finnish_romani=Kalo Finnish Romani -controlledvocabulary.language.kalou=Kalou -controlledvocabulary.language.kaluli=Kaluli -controlledvocabulary.language.kalumpang=Kalumpang -controlledvocabulary.language.kam=Kam -controlledvocabulary.language.kamakan=Kamakan -controlledvocabulary.language.kamang=Kamang -controlledvocabulary.language.kamano=Kamano -controlledvocabulary.language.kamantan=Kamantan -controlledvocabulary.language.kamar=Kamar -controlledvocabulary.language.kamara=Kamara -controlledvocabulary.language.kamarian=Kamarian -controlledvocabulary.language.kamaru=Kamaru -controlledvocabulary.language.kamas=Kamas -controlledvocabulary.language.kamasa=Kamasa -controlledvocabulary.language.kamasau=Kamasau -controlledvocabulary.language.kamayo=Kamayo -controlledvocabulary.language.kamayura=Kamayurá -controlledvocabulary.language.kamba_(kenya)=Kamba (Kenya) -controlledvocabulary.language.kambaata=Kambaata -controlledvocabulary.language.kambaira=Kambaira -controlledvocabulary.language.kambera=Kambera -controlledvocabulary.language.kamberau=Kamberau -controlledvocabulary.language.kambiwa=Kambiwá -controlledvocabulary.language.kami_(nigeria)=Kami (Nigeria) -controlledvocabulary.language.kami_(tanzania)=Kami (Tanzania) -controlledvocabulary.language.kamo=Kamo -controlledvocabulary.language.kamoro=Kamoro -controlledvocabulary.language.kamu=Kamu -controlledvocabulary.language.kamula=Kamula -controlledvocabulary.language.kamviri=Kamviri -controlledvocabulary.language.kamwe=Kamwe -controlledvocabulary.language.kanakanabu=Kanakanabu -controlledvocabulary.language.kanamari=Kanamarí -controlledvocabulary.language.kanan=Kanan -controlledvocabulary.language.kanashi=Kanashi -controlledvocabulary.language.kanasi=Kanasi -controlledvocabulary.language.kanauji=Kanauji -controlledvocabulary.language.kandas=Kandas -controlledvocabulary.language.kandawo=Kandawo -controlledvocabulary.language.kande=Kande -controlledvocabulary.language.kanembu=Kanembu -controlledvocabulary.language.kang=Kang -controlledvocabulary.language.kanga=Kanga -controlledvocabulary.language.kangean=Kangean -controlledvocabulary.language.kanggape=Kanggape -controlledvocabulary.language.kangjia=Kangjia -controlledvocabulary.language.kango_(bas-uele_district)=Kango (Bas-Uélé District) -controlledvocabulary.language.kango_(tshopo_district)=Kango (Tshopo District) -controlledvocabulary.language.kangri=Kangri -controlledvocabulary.language.kaniet=Kaniet -controlledvocabulary.language.kanikkaran=Kanikkaran -controlledvocabulary.language.kaningdon-nindem=Kaningdon-Nindem -controlledvocabulary.language.kaningi=Kaningi -controlledvocabulary.language.kaningra=Kaningra -controlledvocabulary.language.kaninuwa=Kaninuwa -controlledvocabulary.language.kanite=Kanite -controlledvocabulary.language.kanjari=Kanjari -controlledvocabulary.language.kanju=Kanju -controlledvocabulary.language.kankanaey=Kankanaey -controlledvocabulary.language.kannada=Kannada -controlledvocabulary.language.kannada_kurumba=Kannada Kurumba -controlledvocabulary.language.kanowit-tanjong_melanau=Kanowit-Tanjong Melanau -controlledvocabulary.language.kanoe=Kanoé -controlledvocabulary.language.kansa=Kansa -controlledvocabulary.language.kantosi=Kantosi -controlledvocabulary.language.kanu=Kanu -controlledvocabulary.language.kanufi=Kanufi -controlledvocabulary.language.kanuri=Kanuri -controlledvocabulary.language.kanyok=Kanyok -controlledvocabulary.language.kao=Kao -controlledvocabulary.language.kaonde=Kaonde -controlledvocabulary.language.kap=Kap -controlledvocabulary.language.kapin=Kapin -controlledvocabulary.language.kapinawa=Kapinawá -controlledvocabulary.language.kapingamarangi=Kapingamarangi -controlledvocabulary.language.kapori=Kapori -controlledvocabulary.language.kapriman=Kapriman -controlledvocabulary.language.kaptiau=Kaptiau -controlledvocabulary.language.kapya=Kapya -controlledvocabulary.language.kaqchikel=Kaqchikel -controlledvocabulary.language.kara_(central_african_republic)=Kara (Central African Republic) -controlledvocabulary.language.kara_(korea)=Kara (Korea) -controlledvocabulary.language.kara_(papua_new_guinea)=Kara (Papua New Guinea) -controlledvocabulary.language.kara_(tanzania)=Kara (Tanzania) -controlledvocabulary.language.kara-kalpak=Kara-Kalpak -controlledvocabulary.language.karachay-balkar=Karachay-Balkar -controlledvocabulary.language.karagas=Karagas -controlledvocabulary.language.karaim=Karaim -controlledvocabulary.language.karajarri=Karajarri -controlledvocabulary.language.karaja=Karajá -controlledvocabulary.language.karakhanid=Karakhanid -controlledvocabulary.language.karami=Karami -controlledvocabulary.language.karamojong=Karamojong -controlledvocabulary.language.karang=Karang -controlledvocabulary.language.karanga=Karanga -controlledvocabulary.language.karankawa=Karankawa -controlledvocabulary.language.karao=Karao -controlledvocabulary.language.karas=Karas -controlledvocabulary.language.karata=Karata -controlledvocabulary.language.karawa=Karawa -controlledvocabulary.language.karbi=Karbi -controlledvocabulary.language.kare_(central_african_republic)=Kare (Central African Republic) -controlledvocabulary.language.kare_(papua_new_guinea)=Kare (Papua New Guinea) -controlledvocabulary.language.karekare=Karekare -controlledvocabulary.language.karelian=Karelian -controlledvocabulary.language.karenggapa=Karenggapa -controlledvocabulary.language.karey=Karey -controlledvocabulary.language.kari=Kari -controlledvocabulary.language.karingani=Karingani -controlledvocabulary.language.karipuna=Karipuna -controlledvocabulary.language.karipuna_creole_french=Karipúna Creole French -controlledvocabulary.language.kariri-xoco=Karirí-Xocó -controlledvocabulary.language.karitiana=Karitiâna -controlledvocabulary.language.kariya=Kariya -controlledvocabulary.language.kariyarra=Kariyarra -controlledvocabulary.language.karkar-yuri=Karkar-Yuri -controlledvocabulary.language.karkin=Karkin -controlledvocabulary.language.karko=Karko -controlledvocabulary.language.karnai=Karnai -controlledvocabulary.language.karo_(brazil)=Karo (Brazil) -controlledvocabulary.language.karo_(ethiopia)=Karo (Ethiopia) -controlledvocabulary.language.karok=Karok -controlledvocabulary.language.karon=Karon -controlledvocabulary.language.karon_dori=Karon Dori -controlledvocabulary.language.karore=Karore -controlledvocabulary.language.karuwali=Karuwali -controlledvocabulary.language.kasanga=Kasanga -controlledvocabulary.language.kasem=Kasem -controlledvocabulary.language.kashaya=Kashaya -controlledvocabulary.language.kashmiri=Kashmiri -controlledvocabulary.language.kashubian=Kashubian -controlledvocabulary.language.kasiguranin=Kasiguranin -controlledvocabulary.language.kaska=Kaska -controlledvocabulary.language.kaskean=Kaskean -controlledvocabulary.language.kasua=Kasua -controlledvocabulary.language.katabaga=Katabaga -controlledvocabulary.language.katawixi=Katawixi -controlledvocabulary.language.katbol=Katbol -controlledvocabulary.language.katcha-kadugli-miri=Katcha-Kadugli-Miri -controlledvocabulary.language.kathoriya_tharu=Kathoriya Tharu -controlledvocabulary.language.kathu=Kathu -controlledvocabulary.language.kati=Kati -controlledvocabulary.language.katkari=Katkari -controlledvocabulary.language.katla=Katla -controlledvocabulary.language.kato=Kato -controlledvocabulary.language.katso=Katso -controlledvocabulary.language.katua=Katua -controlledvocabulary.language.katukina=Katukína -controlledvocabulary.language.kaulong=Kaulong -controlledvocabulary.language.kaur=Kaur -controlledvocabulary.language.kaure=Kaure -controlledvocabulary.language.kaurna=Kaurna -controlledvocabulary.language.kauwera=Kauwera -controlledvocabulary.language.kavalan=Kavalan -controlledvocabulary.language.kavet=Kavet -controlledvocabulary.language.kawacha=Kawacha -controlledvocabulary.language.kawaiisu=Kawaiisu -controlledvocabulary.language.kawe=Kawe -controlledvocabulary.language.kawi=Kawi -controlledvocabulary.language.kaxarari=Kaxararí -controlledvocabulary.language.kaxuiana=Kaxuiâna -controlledvocabulary.language.kayabi=Kayabí -controlledvocabulary.language.kayagar=Kayagar -controlledvocabulary.language.kayan=Kayan -controlledvocabulary.language.kayan_mahakam=Kayan Mahakam -controlledvocabulary.language.kayan_river_kayan=Kayan River Kayan -controlledvocabulary.language.kayapo=Kayapó -controlledvocabulary.language.kayardild=Kayardild -controlledvocabulary.language.kayaw=Kayaw -controlledvocabulary.language.kayeli=Kayeli -controlledvocabulary.language.kayong=Kayong -controlledvocabulary.language.kayort=Kayort -controlledvocabulary.language.kaytetye=Kaytetye -controlledvocabulary.language.kayupulau=Kayupulau -controlledvocabulary.language.kazakh=Kazakh -controlledvocabulary.language.kazukuru=Kazukuru -controlledvocabulary.language.ke'o=Ke'o -controlledvocabulary.language.keak=Keak -controlledvocabulary.language.keapara=Keapara -controlledvocabulary.language.kedah_malay=Kedah Malay -controlledvocabulary.language.kedang=Kedang -controlledvocabulary.language.keder=Keder -controlledvocabulary.language.keerray-woorroong=Keerray-Woorroong -controlledvocabulary.language.kehu=Kehu -controlledvocabulary.language.kei=Kei -controlledvocabulary.language.keiga=Keiga -controlledvocabulary.language.kein=Kein -controlledvocabulary.language.keiyo=Keiyo -controlledvocabulary.language.kekchi=Kekchí -controlledvocabulary.language.kela_(democratic_republic_of_congo)=Kela (Democratic Republic of Congo) -controlledvocabulary.language.kela_(papua_new_guinea)=Kela (Papua New Guinea) -controlledvocabulary.language.kelabit=Kelabit -controlledvocabulary.language.kele_(democratic_republic_of_congo)=Kele (Democratic Republic of Congo) -controlledvocabulary.language.kele_(papua_new_guinea)=Kele (Papua New Guinea) -controlledvocabulary.language.keley-i_kallahan=Keley-I Kallahan -controlledvocabulary.language.keliko=Keliko -controlledvocabulary.language.kelo=Kelo -controlledvocabulary.language.kelon=Kelon -controlledvocabulary.language.kemak=Kemak -controlledvocabulary.language.kembayan=Kembayan -controlledvocabulary.language.kemberano=Kemberano -controlledvocabulary.language.kembra=Kembra -controlledvocabulary.language.kemedzung=Kemedzung -controlledvocabulary.language.kemi_sami=Kemi Sami -controlledvocabulary.language.kemiehua=Kemiehua -controlledvocabulary.language.kemtuik=Kemtuik -controlledvocabulary.language.kenaboi=Kenaboi -controlledvocabulary.language.kenati=Kenati -controlledvocabulary.language.kendayan=Kendayan -controlledvocabulary.language.kendeje=Kendeje -controlledvocabulary.language.kendem=Kendem -controlledvocabulary.language.kenga=Kenga -controlledvocabulary.language.keningau_murut=Keningau Murut -controlledvocabulary.language.keninjal=Keninjal -controlledvocabulary.language.kensiu=Kensiu -controlledvocabulary.language.kenswei_nsei=Kenswei Nsei -controlledvocabulary.language.kenyan_sign_language=Kenyan Sign Language -controlledvocabulary.language.kenyang=Kenyang -controlledvocabulary.language.kenyi=Kenyi -controlledvocabulary.language.kenzi=Kenzi -controlledvocabulary.language.keoru-ahia=Keoru-Ahia -controlledvocabulary.language.kepkiriwat=Kepkiriwát -controlledvocabulary.language.kepo'=Kepo' -controlledvocabulary.language.kera=Kera -controlledvocabulary.language.kerak=Kerak -controlledvocabulary.language.kereho=Kereho -controlledvocabulary.language.kerek=Kerek -controlledvocabulary.language.kerewe=Kerewe -controlledvocabulary.language.kerewo=Kerewo -controlledvocabulary.language.kerinci=Kerinci -controlledvocabulary.language.kesawai=Kesawai -controlledvocabulary.language.ket=Ket -controlledvocabulary.language.ketangalan=Ketangalan -controlledvocabulary.language.kete=Kete -controlledvocabulary.language.ketengban=Ketengban -controlledvocabulary.language.ketum=Ketum -controlledvocabulary.language.keyagana=Keyagana -controlledvocabulary.language.kgalagadi=Kgalagadi -controlledvocabulary.language.khah=Khah -controlledvocabulary.language.khakas=Khakas -controlledvocabulary.language.khalaj=Khalaj -controlledvocabulary.language.khaling=Khaling -controlledvocabulary.language.khamba=Khamba -controlledvocabulary.language.khamnigan_mongol=Khamnigan Mongol -controlledvocabulary.language.khams_tibetan=Khams Tibetan -controlledvocabulary.language.khamti=Khamti -controlledvocabulary.language.khamyang=Khamyang -controlledvocabulary.language.khana=Khana -controlledvocabulary.language.khandesi=Khandesi -controlledvocabulary.language.khanty=Khanty -controlledvocabulary.language.khao=Khao -controlledvocabulary.language.kharam_naga=Kharam Naga -controlledvocabulary.language.kharia=Kharia -controlledvocabulary.language.kharia_thar=Kharia Thar -controlledvocabulary.language.khasi=Khasi -controlledvocabulary.language.khayo=Khayo -controlledvocabulary.language.khazar=Khazar -controlledvocabulary.language.khe=Khe -controlledvocabulary.language.khehek=Khehek -controlledvocabulary.language.khengkha=Khengkha -controlledvocabulary.language.khetrani=Khetrani -controlledvocabulary.language.khezha_naga=Khezha Naga -controlledvocabulary.language.khiamniungan_naga=Khiamniungan Naga -controlledvocabulary.language.khinalugh=Khinalugh -controlledvocabulary.language.khirwar=Khirwar -controlledvocabulary.language.khisa=Khisa -controlledvocabulary.language.khlula=Khlula -controlledvocabulary.language.khmer=Khmer -controlledvocabulary.language.khmu=Khmu -controlledvocabulary.language.kho'ini=Kho'ini -controlledvocabulary.language.khoekhoe=Khoekhoe -controlledvocabulary.language.khoibu_naga=Khoibu Naga -controlledvocabulary.language.kholok=Kholok -controlledvocabulary.language.khorasani_turkish=Khorasani Turkish -controlledvocabulary.language.khorezmian=Khorezmian -controlledvocabulary.language.khotanese=Khotanese -controlledvocabulary.language.khowar=Khowar -controlledvocabulary.language.khua=Khua -controlledvocabulary.language.khuen=Khuen -controlledvocabulary.language.khumi_chin=Khumi Chin -controlledvocabulary.language.khunsari=Khunsari -controlledvocabulary.language.khvarshi=Khvarshi -controlledvocabulary.language.khang=Kháng -controlledvocabulary.language.khun=Khün -controlledvocabulary.language.kibala=Kibala -controlledvocabulary.language.kibet=Kibet -controlledvocabulary.language.kibiri=Kibiri -controlledvocabulary.language.kickapoo=Kickapoo -controlledvocabulary.language.kija=Kija -controlledvocabulary.language.kikai=Kikai -controlledvocabulary.language.kikuyu,_gikuyu=Kikuyu, Gikuyu -controlledvocabulary.language.kildin_sami=Kildin Sami -controlledvocabulary.language.kilivila=Kilivila -controlledvocabulary.language.kiliwa=Kiliwa -controlledvocabulary.language.kilmeri=Kilmeri -controlledvocabulary.language.kim=Kim -controlledvocabulary.language.kim_mun=Kim Mun -controlledvocabulary.language.kimaama=Kimaama -controlledvocabulary.language.kimaragang=Kimaragang -controlledvocabulary.language.kimbu=Kimbu -controlledvocabulary.language.kimbundu=Kimbundu -controlledvocabulary.language.kimki=Kimki -controlledvocabulary.language.kimre=Kimré -controlledvocabulary.language.kinabalian=Kinabalian -controlledvocabulary.language.kinalakna=Kinalakna -controlledvocabulary.language.kinamiging_manobo=Kinamiging Manobo -controlledvocabulary.language.kinaray-a=Kinaray-A -controlledvocabulary.language.kinga=Kinga -controlledvocabulary.language.kinnauri=Kinnauri -controlledvocabulary.language.kintaq=Kintaq -controlledvocabulary.language.kinuku=Kinuku -controlledvocabulary.language.kinyarwanda=Kinyarwanda -controlledvocabulary.language.kioko=Kioko -controlledvocabulary.language.kiong=Kiong -controlledvocabulary.language.kiorr=Kiorr -controlledvocabulary.language.kiowa=Kiowa -controlledvocabulary.language.kiowa_apache=Kiowa Apache -controlledvocabulary.language.kipsigis=Kipsigis -controlledvocabulary.language.kiput=Kiput -controlledvocabulary.language.kir-balar=Kir-Balar -controlledvocabulary.language.kire=Kire -controlledvocabulary.language.kirghiz,_kyrgyz=Kirghiz, Kyrgyz -controlledvocabulary.language.kirike=Kirike -controlledvocabulary.language.kirikiri=Kirikiri -controlledvocabulary.language.kirmanjki_(individual_language)=Kirmanjki (individual language) -controlledvocabulary.language.kirya-konzəl=Kirya-Konzəl -controlledvocabulary.language.kis=Kis -controlledvocabulary.language.kisa=Kisa -controlledvocabulary.language.kisan=Kisan -controlledvocabulary.language.kisankasa=Kisankasa -controlledvocabulary.language.kisar=Kisar -controlledvocabulary.language.kisi=Kisi -controlledvocabulary.language.kistane=Kistane -controlledvocabulary.language.kita_maninkakan=Kita Maninkakan -controlledvocabulary.language.kitan=Kitan -controlledvocabulary.language.kitsai=Kitsai -controlledvocabulary.language.kituba_(congo)=Kituba (Congo) -controlledvocabulary.language.kituba_(democratic_republic_of_congo)=Kituba (Democratic Republic of Congo) -controlledvocabulary.language.kiunum=Kiunum -controlledvocabulary.language.kizamani=Kizamani -controlledvocabulary.language.kla-dan=Kla-Dan -controlledvocabulary.language.klamath-modoc=Klamath-Modoc -controlledvocabulary.language.klao=Klao -controlledvocabulary.language.klias_river_kadazan=Klias River Kadazan -controlledvocabulary.language.klingon=Klingon -controlledvocabulary.language.knaanic=Knaanic -controlledvocabulary.language.ko=Ko -controlledvocabulary.language.koalib=Koalib -controlledvocabulary.language.koasati=Koasati -controlledvocabulary.language.koba=Koba -controlledvocabulary.language.kobiana=Kobiana -controlledvocabulary.language.kobo=Kobo -controlledvocabulary.language.kobol=Kobol -controlledvocabulary.language.kobon=Kobon -controlledvocabulary.language.koch=Koch -controlledvocabulary.language.kochila_tharu=Kochila Tharu -controlledvocabulary.language.koda=Koda -controlledvocabulary.language.kodaku=Kodaku -controlledvocabulary.language.kodava=Kodava -controlledvocabulary.language.kodeoha=Kodeoha -controlledvocabulary.language.kodi=Kodi -controlledvocabulary.language.kodia=Kodia -controlledvocabulary.language.koenoem=Koenoem -controlledvocabulary.language.kofa=Kofa -controlledvocabulary.language.kofei=Kofei -controlledvocabulary.language.kofyar=Kofyar -controlledvocabulary.language.koguryo=Koguryo -controlledvocabulary.language.kohin=Kohin -controlledvocabulary.language.kohistani_shina=Kohistani Shina -controlledvocabulary.language.koho=Koho -controlledvocabulary.language.kohumono=Kohumono -controlledvocabulary.language.koi=Koi -controlledvocabulary.language.koireng=Koireng -controlledvocabulary.language.koitabu=Koitabu -controlledvocabulary.language.koiwat=Koiwat -controlledvocabulary.language.kok_borok=Kok Borok -controlledvocabulary.language.kok-nar=Kok-Nar -controlledvocabulary.language.kokata=Kokata -controlledvocabulary.language.koke=Koke -controlledvocabulary.language.koki_naga=Koki Naga -controlledvocabulary.language.koko_babangk=Koko Babangk -controlledvocabulary.language.kokoda=Kokoda -controlledvocabulary.language.kokola=Kokola -controlledvocabulary.language.kokota=Kokota -controlledvocabulary.language.kol_(bangladesh)=Kol (Bangladesh) -controlledvocabulary.language.kol_(cameroon)=Kol (Cameroon) -controlledvocabulary.language.kol_(papua_new_guinea)=Kol (Papua New Guinea) -controlledvocabulary.language.kola=Kola -controlledvocabulary.language.kolbila=Kolbila -controlledvocabulary.language.kolibugan_subanon=Kolibugan Subanon -controlledvocabulary.language.koluwawa=Koluwawa -controlledvocabulary.language.kom_(cameroon)=Kom (Cameroon) -controlledvocabulary.language.kom_(india)=Kom (India) -controlledvocabulary.language.koma=Koma -controlledvocabulary.language.komba=Komba -controlledvocabulary.language.kombai=Kombai -controlledvocabulary.language.kombio=Kombio -controlledvocabulary.language.komering=Komering -controlledvocabulary.language.komi=Komi -controlledvocabulary.language.komi-permyak=Komi-Permyak -controlledvocabulary.language.komi-zyrian=Komi-Zyrian -controlledvocabulary.language.kominimung=Kominimung -controlledvocabulary.language.komo_(democratic_republic_of_congo)=Komo (Democratic Republic of Congo) -controlledvocabulary.language.komo_(sudan)=Komo (Sudan) -controlledvocabulary.language.komodo=Komodo -controlledvocabulary.language.kompane=Kompane -controlledvocabulary.language.komyandaret=Komyandaret -controlledvocabulary.language.kon_keu=Kon Keu -controlledvocabulary.language.konai=Konai -controlledvocabulary.language.konda=Konda -controlledvocabulary.language.konda-dora=Konda-Dora -controlledvocabulary.language.koneraw=Koneraw -controlledvocabulary.language.kongo=Kongo -controlledvocabulary.language.konkani_(individual_language)=Konkani (individual language) -controlledvocabulary.language.konkani_(macrolanguage)=Konkani (macrolanguage) -controlledvocabulary.language.konkomba=Konkomba -controlledvocabulary.language.konni=Konni -controlledvocabulary.language.kono_(guinea)=Kono (Guinea) -controlledvocabulary.language.kono_(nigeria)=Kono (Nigeria) -controlledvocabulary.language.kono_(sierra_leone)=Kono (Sierra Leone) -controlledvocabulary.language.konomala=Konomala -controlledvocabulary.language.konongo=Konongo -controlledvocabulary.language.konso=Konso -controlledvocabulary.language.konyak_naga=Konyak Naga -controlledvocabulary.language.konyanka_maninka=Konyanka Maninka -controlledvocabulary.language.konzo=Konzo -controlledvocabulary.language.koongo=Koongo -controlledvocabulary.language.koonzime=Koonzime -controlledvocabulary.language.koorete=Koorete -controlledvocabulary.language.kopar=Kopar -controlledvocabulary.language.kopkaka=Kopkaka -controlledvocabulary.language.korafe-yegha=Korafe-Yegha -controlledvocabulary.language.korak=Korak -controlledvocabulary.language.korana=Korana -controlledvocabulary.language.korandje=Korandje -controlledvocabulary.language.korean=Korean -controlledvocabulary.language.korean_sign_language=Korean Sign Language -controlledvocabulary.language.koreguaje=Koreguaje -controlledvocabulary.language.koresh-e_rostam=Koresh-e Rostam -controlledvocabulary.language.korku=Korku -controlledvocabulary.language.korlai_creole_portuguese=Korlai Creole Portuguese -controlledvocabulary.language.koro_(cote_d'ivoire)=Koro (Côte d'Ivoire) -controlledvocabulary.language.koro_(india)=Koro (India) -controlledvocabulary.language.koro_(papua_new_guinea)=Koro (Papua New Guinea) -controlledvocabulary.language.koro_(vanuatu)=Koro (Vanuatu) -controlledvocabulary.language.koro_nulu=Koro Nulu -controlledvocabulary.language.koro_wachi=Koro Wachi -controlledvocabulary.language.koro_zuba=Koro Zuba -controlledvocabulary.language.koromfe=Koromfé -controlledvocabulary.language.koromira=Koromira -controlledvocabulary.language.koronadal_blaan=Koronadal Blaan -controlledvocabulary.language.koroni=Koroni -controlledvocabulary.language.koropo=Koropó -controlledvocabulary.language.koroshi=Koroshi -controlledvocabulary.language.korowai=Korowai -controlledvocabulary.language.korra_koraga=Korra Koraga -controlledvocabulary.language.korubo=Korubo -controlledvocabulary.language.korupun-sela=Korupun-Sela -controlledvocabulary.language.korwa=Korwa -controlledvocabulary.language.koryak=Koryak -controlledvocabulary.language.kosadle=Kosadle -controlledvocabulary.language.kosarek_yale=Kosarek Yale -controlledvocabulary.language.kosena=Kosena -controlledvocabulary.language.koshin=Koshin -controlledvocabulary.language.kosraean=Kosraean -controlledvocabulary.language.kota_(gabon)=Kota (Gabon) -controlledvocabulary.language.kota_(india)=Kota (India) -controlledvocabulary.language.kota_bangun_kutai_malay=Kota Bangun Kutai Malay -controlledvocabulary.language.kota_marudu_talantang=Kota Marudu Talantang -controlledvocabulary.language.kotafon_gbe=Kotafon Gbe -controlledvocabulary.language.kotava=Kotava -controlledvocabulary.language.koti=Koti -controlledvocabulary.language.kott=Kott -controlledvocabulary.language.kou=Kou -controlledvocabulary.language.kouya=Kouya -controlledvocabulary.language.kovai=Kovai -controlledvocabulary.language.kove=Kove -controlledvocabulary.language.kowaki=Kowaki -controlledvocabulary.language.kowiai=Kowiai -controlledvocabulary.language.koy_sanjaq_surat=Koy Sanjaq Surat -controlledvocabulary.language.koya=Koya -controlledvocabulary.language.koyaga=Koyaga -controlledvocabulary.language.koyo=Koyo -controlledvocabulary.language.koyra_chiini_songhay=Koyra Chiini Songhay -controlledvocabulary.language.koyraboro_senni_songhai=Koyraboro Senni Songhai -controlledvocabulary.language.koyukon=Koyukon -controlledvocabulary.language.kpagua=Kpagua -controlledvocabulary.language.kpala=Kpala -controlledvocabulary.language.kpan=Kpan -controlledvocabulary.language.kpasam=Kpasam -controlledvocabulary.language.kpati=Kpati -controlledvocabulary.language.kpatili=Kpatili -controlledvocabulary.language.kpeego=Kpeego -controlledvocabulary.language.kpelle=Kpelle -controlledvocabulary.language.kpessi=Kpessi -controlledvocabulary.language.kplang=Kplang -controlledvocabulary.language.krache=Krache -controlledvocabulary.language.kraho=Krahô -controlledvocabulary.language.kraol=Kraol -controlledvocabulary.language.krenak=Krenak -controlledvocabulary.language.krevinian=Krevinian -controlledvocabulary.language.kreye=Kreye -controlledvocabulary.language.kriang=Kriang -controlledvocabulary.language.krikati-timbira=Krikati-Timbira -controlledvocabulary.language.krio=Krio -controlledvocabulary.language.kriol=Kriol -controlledvocabulary.language.krisa=Krisa -controlledvocabulary.language.krobu=Krobu -controlledvocabulary.language.krongo=Krongo -controlledvocabulary.language.krung=Krung -controlledvocabulary.language.krymchak=Krymchak -controlledvocabulary.language.kryts=Kryts -controlledvocabulary.language.kua=Kua -controlledvocabulary.language.kua-nsi=Kua-nsi -controlledvocabulary.language.kuamasi=Kuamasi -controlledvocabulary.language.kuan=Kuan -controlledvocabulary.language.kuanhua=Kuanhua -controlledvocabulary.language.kuanua=Kuanua -controlledvocabulary.language.kuanyama,_kwanyama=Kuanyama, Kwanyama -controlledvocabulary.language.kubachi=Kubachi -controlledvocabulary.language.kube=Kube -controlledvocabulary.language.kubi=Kubi -controlledvocabulary.language.kubo=Kubo -controlledvocabulary.language.kubu=Kubu -controlledvocabulary.language.kucong=Kucong -controlledvocabulary.language.kudiya=Kudiya -controlledvocabulary.language.kudmali=Kudmali -controlledvocabulary.language.kudu-camo=Kudu-Camo -controlledvocabulary.language.kufr_qassem_sign_language_(kqsl)=Kufr Qassem Sign Language (KQSL) -controlledvocabulary.language.kugama=Kugama -controlledvocabulary.language.kugbo=Kugbo -controlledvocabulary.language.kugu-muminh=Kugu-Muminh -controlledvocabulary.language.kui_(india)=Kui (India) -controlledvocabulary.language.kui_(indonesia)=Kui (Indonesia) -controlledvocabulary.language.kuijau=Kuijau -controlledvocabulary.language.kuikuro-kalapalo=Kuikúro-Kalapálo -controlledvocabulary.language.kujarge=Kujarge -controlledvocabulary.language.kuk=Kuk -controlledvocabulary.language.kukatja=Kukatja -controlledvocabulary.language.kuke=Kuke -controlledvocabulary.language.kukele=Kukele -controlledvocabulary.language.kukna=Kukna -controlledvocabulary.language.kuku=Kuku -controlledvocabulary.language.kuku-mangk=Kuku-Mangk -controlledvocabulary.language.kuku-mu'inh=Kuku-Mu'inh -controlledvocabulary.language.kuku-ugbanh=Kuku-Ugbanh -controlledvocabulary.language.kuku-uwanh=Kuku-Uwanh -controlledvocabulary.language.kuku-yalanji=Kuku-Yalanji -controlledvocabulary.language.kula=Kula -controlledvocabulary.language.kulere=Kulere -controlledvocabulary.language.kulfa=Kulfa -controlledvocabulary.language.kulina_pano=Kulina Pano -controlledvocabulary.language.kulisusu=Kulisusu -controlledvocabulary.language.kullu_pahari=Kullu Pahari -controlledvocabulary.language.kulon=Kulon -controlledvocabulary.language.kulung_(nepal)=Kulung (Nepal) -controlledvocabulary.language.kulung_(nigeria)=Kulung (Nigeria) -controlledvocabulary.language.kumalu=Kumalu -controlledvocabulary.language.kumam=Kumam -controlledvocabulary.language.kuman_(papua_new_guinea)=Kuman (Papua New Guinea) -controlledvocabulary.language.kuman_(russia)=Kuman (Russia) -controlledvocabulary.language.kumaoni=Kumaoni -controlledvocabulary.language.kumarbhag_paharia=Kumarbhag Paharia -controlledvocabulary.language.kumba=Kumba -controlledvocabulary.language.kumbainggar=Kumbainggar -controlledvocabulary.language.kumbaran=Kumbaran -controlledvocabulary.language.kumbewaha=Kumbewaha -controlledvocabulary.language.kumhali=Kumhali -controlledvocabulary.language.kumiai=Kumiai -controlledvocabulary.language.kumukio=Kumukio -controlledvocabulary.language.kumyk=Kumyk -controlledvocabulary.language.kumzari=Kumzari -controlledvocabulary.language.kunama=Kunama -controlledvocabulary.language.kunbarlang=Kunbarlang -controlledvocabulary.language.kunda=Kunda -controlledvocabulary.language.kundal_shahi=Kundal Shahi -controlledvocabulary.language.kunduvadi=Kunduvadi -controlledvocabulary.language.kung=Kung -controlledvocabulary.language.kung-ekoka=Kung-Ekoka -controlledvocabulary.language.kungarakany=Kungarakany -controlledvocabulary.language.kungardutyi=Kungardutyi -controlledvocabulary.language.kunggari=Kunggari -controlledvocabulary.language.kungkari=Kungkari -controlledvocabulary.language.kuni=Kuni -controlledvocabulary.language.kuni-boazi=Kuni-Boazi -controlledvocabulary.language.kunigami=Kunigami -controlledvocabulary.language.kunimaipa=Kunimaipa -controlledvocabulary.language.kunja=Kunja -controlledvocabulary.language.kunjen=Kunjen -controlledvocabulary.language.kunyi=Kunyi -controlledvocabulary.language.kunza=Kunza -controlledvocabulary.language.kuo=Kuo -controlledvocabulary.language.kuot=Kuot -controlledvocabulary.language.kupa=Kupa -controlledvocabulary.language.kupang_malay=Kupang Malay -controlledvocabulary.language.kupia=Kupia -controlledvocabulary.language.kupsabiny=Kupsabiny -controlledvocabulary.language.kur=Kur -controlledvocabulary.language.kura_ede_nago=Kura Ede Nago -controlledvocabulary.language.kurama=Kurama -controlledvocabulary.language.kuranko=Kuranko -controlledvocabulary.language.kurdish=Kurdish -controlledvocabulary.language.kuri=Kuri -controlledvocabulary.language.kuria=Kuria -controlledvocabulary.language.kurichiya=Kurichiya -controlledvocabulary.language.kurmukar=Kurmukar -controlledvocabulary.language.kurnai=Kurnai -controlledvocabulary.language.kurrama=Kurrama -controlledvocabulary.language.kurti=Kurti -controlledvocabulary.language.kurtokha=Kurtokha -controlledvocabulary.language.kurudu=Kurudu -controlledvocabulary.language.kurukh=Kurukh -controlledvocabulary.language.kuruaya=Kuruáya -controlledvocabulary.language.kusaal=Kusaal -controlledvocabulary.language.kusaghe=Kusaghe -controlledvocabulary.language.kushi=Kushi -controlledvocabulary.language.kusu=Kusu -controlledvocabulary.language.kusunda=Kusunda -controlledvocabulary.language.kutenai=Kutenai -controlledvocabulary.language.kutep=Kutep -controlledvocabulary.language.kuthant=Kuthant -controlledvocabulary.language.kutong=Kutong -controlledvocabulary.language.kutto=Kutto -controlledvocabulary.language.kutu=Kutu -controlledvocabulary.language.kuturmi=Kuturmi -controlledvocabulary.language.kuuk_thaayorre=Kuuk Thaayorre -controlledvocabulary.language.kuuk-yak=Kuuk-Yak -controlledvocabulary.language.kuuku-ya'u=Kuuku-Ya'u -controlledvocabulary.language.kuvale=Kuvale -controlledvocabulary.language.kuvi=Kuvi -controlledvocabulary.language.kuwaa=Kuwaa -controlledvocabulary.language.kuwaataay=Kuwaataay -controlledvocabulary.language.kuwema=Kuwema -controlledvocabulary.language.kuy=Kuy -controlledvocabulary.language.kven_finnish=Kven Finnish -controlledvocabulary.language.kw'adza=Kw'adza -controlledvocabulary.language.kwa=Kwa -controlledvocabulary.language.kwa'=Kwa' -controlledvocabulary.language.kwaami=Kwaami -controlledvocabulary.language.kwadi=Kwadi -controlledvocabulary.language.kwaio=Kwaio -controlledvocabulary.language.kwaja=Kwaja -controlledvocabulary.language.kwakiutl=Kwakiutl -controlledvocabulary.language.kwakum=Kwakum -controlledvocabulary.language.kwalhioqua-tlatskanai=Kwalhioqua-Tlatskanai -controlledvocabulary.language.kwama=Kwama -controlledvocabulary.language.kwambi=Kwambi -controlledvocabulary.language.kwamera=Kwamera -controlledvocabulary.language.kwami=Kwami -controlledvocabulary.language.kwamtim_one=Kwamtim One -controlledvocabulary.language.kwandu=Kwandu -controlledvocabulary.language.kwang=Kwang -controlledvocabulary.language.kwanga=Kwanga -controlledvocabulary.language.kwangali=Kwangali -controlledvocabulary.language.kwanja=Kwanja -controlledvocabulary.language.kwara'ae=Kwara'ae -controlledvocabulary.language.kwasio=Kwasio -controlledvocabulary.language.kwaya=Kwaya -controlledvocabulary.language.kwaza=Kwaza -controlledvocabulary.language.kwegu=Kwegu -controlledvocabulary.language.kwer=Kwer -controlledvocabulary.language.kwerba=Kwerba -controlledvocabulary.language.kwerba_mamberamo=Kwerba Mamberamo -controlledvocabulary.language.kwere=Kwere -controlledvocabulary.language.kwerisa=Kwerisa -controlledvocabulary.language.kwese=Kwese -controlledvocabulary.language.kwesten=Kwesten -controlledvocabulary.language.kwini=Kwini -controlledvocabulary.language.kwinsu=Kwinsu -controlledvocabulary.language.kwinti=Kwinti -controlledvocabulary.language.kwoma=Kwoma -controlledvocabulary.language.kwomtari=Kwomtari -controlledvocabulary.language.kxoe=Kxoe -controlledvocabulary.language.kyak=Kyak -controlledvocabulary.language.kyaka=Kyaka -controlledvocabulary.language.kyan-karyaw_naga=Kyan-Karyaw Naga -controlledvocabulary.language.kyanga=Kyanga -controlledvocabulary.language.kyenele=Kyenele -controlledvocabulary.language.kyerung=Kyerung -controlledvocabulary.language.kate=Kâte -controlledvocabulary.language.kele=Kélé -controlledvocabulary.language.kolsch=Kölsch -controlledvocabulary.language.kɛlɛngaxo_bozo=Kɛlɛngaxo Bozo -controlledvocabulary.language.la'bi=La'bi -controlledvocabulary.language.laal=Laal -controlledvocabulary.language.laari=Laari -controlledvocabulary.language.laarim=Laarim -controlledvocabulary.language.laba=Laba -controlledvocabulary.language.label=Label -controlledvocabulary.language.labir=Labir -controlledvocabulary.language.labo=Labo -controlledvocabulary.language.labo_phowa=Labo Phowa -controlledvocabulary.language.labu=Labu -controlledvocabulary.language.labuk-kinabatangan_kadazan=Labuk-Kinabatangan Kadazan -controlledvocabulary.language.lacandon=Lacandon -controlledvocabulary.language.lachi=Lachi -controlledvocabulary.language.lachiguiri_zapotec=Lachiguiri Zapotec -controlledvocabulary.language.lachixio_zapotec=Lachixío Zapotec -controlledvocabulary.language.ladakhi=Ladakhi -controlledvocabulary.language.ladin=Ladin -controlledvocabulary.language.ladino=Ladino -controlledvocabulary.language.ladji_ladji=Ladji Ladji -controlledvocabulary.language.laeko-libuat=Laeko-Libuat -controlledvocabulary.language.lafofa=Lafofa -controlledvocabulary.language.laghu=Laghu -controlledvocabulary.language.laghuu=Laghuu -controlledvocabulary.language.lagwan=Lagwan -controlledvocabulary.language.laha_(indonesia)=Laha (Indonesia) -controlledvocabulary.language.laha_(viet_nam)=Laha (Viet Nam) -controlledvocabulary.language.lahanan=Lahanan -controlledvocabulary.language.lahnda=Lahnda -controlledvocabulary.language.lahta_karen=Lahta Karen -controlledvocabulary.language.lahu=Lahu -controlledvocabulary.language.lahu_shi=Lahu Shi -controlledvocabulary.language.lahul_lohar=Lahul Lohar -controlledvocabulary.language.laimbue=Laimbue -controlledvocabulary.language.laitu_chin=Laitu Chin -controlledvocabulary.language.laiyolo=Laiyolo -controlledvocabulary.language.lak=Lak -controlledvocabulary.language.laka_(chad)=Laka (Chad) -controlledvocabulary.language.lakalei=Lakalei -controlledvocabulary.language.lake_miwok=Lake Miwok -controlledvocabulary.language.lakha=Lakha -controlledvocabulary.language.laki=Laki -controlledvocabulary.language.lakkia=Lakkia -controlledvocabulary.language.lakon=Lakon -controlledvocabulary.language.lakonde=Lakondê -controlledvocabulary.language.lakota=Lakota -controlledvocabulary.language.lakota_dida=Lakota Dida -controlledvocabulary.language.lakurumau=Lakurumau -controlledvocabulary.language.lala=Lala -controlledvocabulary.language.lala-bisa=Lala-Bisa -controlledvocabulary.language.lala-roba=Lala-Roba -controlledvocabulary.language.lalana_chinantec=Lalana Chinantec -controlledvocabulary.language.lalia=Lalia -controlledvocabulary.language.lama_(togo)=Lama (Togo) -controlledvocabulary.language.lama_bai=Lama Bai -controlledvocabulary.language.lamaholot=Lamaholot -controlledvocabulary.language.lamalama=Lamalama -controlledvocabulary.language.lamalera=Lamalera -controlledvocabulary.language.lamang=Lamang -controlledvocabulary.language.lamatuka=Lamatuka -controlledvocabulary.language.lamba=Lamba -controlledvocabulary.language.lambadi=Lambadi -controlledvocabulary.language.lambayeque_quechua=Lambayeque Quechua -controlledvocabulary.language.lambichhong=Lambichhong -controlledvocabulary.language.lamboya=Lamboya -controlledvocabulary.language.lambya=Lambya -controlledvocabulary.language.lame=Lame -controlledvocabulary.language.lamenu=Lamenu -controlledvocabulary.language.lamja-dengsa-tola=Lamja-Dengsa-Tola -controlledvocabulary.language.lamkang=Lamkang -controlledvocabulary.language.lamma=Lamma -controlledvocabulary.language.lamnso'=Lamnso' -controlledvocabulary.language.lamogai=Lamogai -controlledvocabulary.language.lampung_api=Lampung Api -controlledvocabulary.language.lampung_nyo=Lampung Nyo -controlledvocabulary.language.lamu=Lamu -controlledvocabulary.language.lanas_lobu=Lanas Lobu -controlledvocabulary.language.landoma=Landoma -controlledvocabulary.language.lang'e=Lang'e -controlledvocabulary.language.langam=Langam -controlledvocabulary.language.langbashe=Langbashe -controlledvocabulary.language.langnian_buyang=Langnian Buyang -controlledvocabulary.language.lango_(south_sudan)=Lango (South Sudan) -controlledvocabulary.language.lango_(uganda)=Lango (Uganda) -controlledvocabulary.language.langobardic=Langobardic -controlledvocabulary.language.langue_des_signes_de_belgique_francophone=Langue des signes de Belgique Francophone -controlledvocabulary.language.lanima=Lanima -controlledvocabulary.language.lanoh=Lanoh -controlledvocabulary.language.lao=Lao -controlledvocabulary.language.lao_naga=Lao Naga -controlledvocabulary.language.laomian=Laomian -controlledvocabulary.language.laopang=Laopang -controlledvocabulary.language.laos_sign_language=Laos Sign Language -controlledvocabulary.language.lapaguia-guivini_zapotec=Lapaguía-Guivini Zapotec -controlledvocabulary.language.laragia=Laragia -controlledvocabulary.language.larantuka_malay=Larantuka Malay -controlledvocabulary.language.lardil=Lardil -controlledvocabulary.language.larevat=Larevat -controlledvocabulary.language.large_flowery_miao=Large Flowery Miao -controlledvocabulary.language.lari=Lari -controlledvocabulary.language.larike-wakasihu=Larike-Wakasihu -controlledvocabulary.language.laro=Laro -controlledvocabulary.language.larteh=Larteh -controlledvocabulary.language.laru=Laru -controlledvocabulary.language.las_delicias_zapotec=Las Delicias Zapotec -controlledvocabulary.language.lasalimu=Lasalimu -controlledvocabulary.language.lasgerdi=Lasgerdi -controlledvocabulary.language.lashi=Lashi -controlledvocabulary.language.lasi=Lasi -controlledvocabulary.language.late_middle_chinese=Late Middle Chinese -controlledvocabulary.language.latgalian=Latgalian -controlledvocabulary.language.latin=Latin -controlledvocabulary.language.latu=Latu -controlledvocabulary.language.latunde=Latundê -controlledvocabulary.language.latvian=Latvian -controlledvocabulary.language.latvian_sign_language=Latvian Sign Language -controlledvocabulary.language.lau=Lau -controlledvocabulary.language.laua=Laua -controlledvocabulary.language.lauan=Lauan -controlledvocabulary.language.lauje=Lauje -controlledvocabulary.language.laura=Laura -controlledvocabulary.language.laurentian=Laurentian -controlledvocabulary.language.lautu_chin=Lautu Chin -controlledvocabulary.language.lavatbura-lamusong=Lavatbura-Lamusong -controlledvocabulary.language.laven=Laven -controlledvocabulary.language.lavi=Lavi -controlledvocabulary.language.lavukaleve=Lavukaleve -controlledvocabulary.language.lawangan=Lawangan -controlledvocabulary.language.lawu=Lawu -controlledvocabulary.language.lawunuia=Lawunuia -controlledvocabulary.language.layakha=Layakha -controlledvocabulary.language.laz=Laz -controlledvocabulary.language.lealao_chinantec=Lealao Chinantec -controlledvocabulary.language.leco=Leco -controlledvocabulary.language.ledo_kaili=Ledo Kaili -controlledvocabulary.language.leelau=Leelau -controlledvocabulary.language.lefa=Lefa -controlledvocabulary.language.lega-mwenga=Lega-Mwenga -controlledvocabulary.language.lega-shabunda=Lega-Shabunda -controlledvocabulary.language.legbo=Legbo -controlledvocabulary.language.legenyem=Legenyem -controlledvocabulary.language.lehali=Lehali -controlledvocabulary.language.lehalurup=Lehalurup -controlledvocabulary.language.lehar=Lehar -controlledvocabulary.language.leinong_naga=Leinong Naga -controlledvocabulary.language.leipon=Leipon -controlledvocabulary.language.lelak=Lelak -controlledvocabulary.language.lele_(chad)=Lele (Chad) -controlledvocabulary.language.lele_(democratic_republic_of_congo)=Lele (Democratic Republic of Congo) -controlledvocabulary.language.lele_(guinea)=Lele (Guinea) -controlledvocabulary.language.lele_(papua_new_guinea)=Lele (Papua New Guinea) -controlledvocabulary.language.lelemi=Lelemi -controlledvocabulary.language.lelepa=Lelepa -controlledvocabulary.language.lembena=Lembena -controlledvocabulary.language.lemerig=Lemerig -controlledvocabulary.language.lemio=Lemio -controlledvocabulary.language.lemnian=Lemnian -controlledvocabulary.language.lemolang=Lemolang -controlledvocabulary.language.lemoro=Lemoro -controlledvocabulary.language.lenakel=Lenakel -controlledvocabulary.language.lenca=Lenca -controlledvocabulary.language.lendu=Lendu -controlledvocabulary.language.lengilu=Lengilu -controlledvocabulary.language.lengo=Lengo -controlledvocabulary.language.lengola=Lengola -controlledvocabulary.language.leningitij=Leningitij -controlledvocabulary.language.lenje=Lenje -controlledvocabulary.language.lenkau=Lenkau -controlledvocabulary.language.lenyima=Lenyima -controlledvocabulary.language.lepcha=Lepcha -controlledvocabulary.language.lepki=Lepki -controlledvocabulary.language.lepontic=Lepontic -controlledvocabulary.language.lere=Lere -controlledvocabulary.language.lese=Lese -controlledvocabulary.language.lesing-gelimi=Lesing-Gelimi -controlledvocabulary.language.letemboi=Letemboi -controlledvocabulary.language.leti_(cameroon)=Leti (Cameroon) -controlledvocabulary.language.leti_(indonesia)=Leti (Indonesia) -controlledvocabulary.language.levantine_arabic=Levantine Arabic -controlledvocabulary.language.levuka=Levuka -controlledvocabulary.language.lewo=Lewo -controlledvocabulary.language.lewo_eleng=Lewo Eleng -controlledvocabulary.language.lewotobi=Lewotobi -controlledvocabulary.language.leyigha=Leyigha -controlledvocabulary.language.lezghian=Lezghian -controlledvocabulary.language.lhokpu=Lhokpu -controlledvocabulary.language.lhomi=Lhomi -controlledvocabulary.language.li'o=Li'o -controlledvocabulary.language.liabuku=Liabuku -controlledvocabulary.language.liana-seti=Liana-Seti -controlledvocabulary.language.liangmai_naga=Liangmai Naga -controlledvocabulary.language.lianshan_zhuang=Lianshan Zhuang -controlledvocabulary.language.liberia_kpelle=Liberia Kpelle -controlledvocabulary.language.liberian_english=Liberian English -controlledvocabulary.language.libido=Libido -controlledvocabulary.language.libinza=Libinza -controlledvocabulary.language.libon_bikol=Libon Bikol -controlledvocabulary.language.liburnian=Liburnian -controlledvocabulary.language.libyan_arabic=Libyan Arabic -controlledvocabulary.language.libyan_sign_language=Libyan Sign Language -controlledvocabulary.language.lidzonka=Lidzonka -controlledvocabulary.language.ligbi=Ligbi -controlledvocabulary.language.ligenza=Ligenza -controlledvocabulary.language.ligurian=Ligurian -controlledvocabulary.language.ligurian_(ancient)=Ligurian (Ancient) -controlledvocabulary.language.lihir=Lihir -controlledvocabulary.language.lijili=Lijili -controlledvocabulary.language.lika=Lika -controlledvocabulary.language.liki=Liki -controlledvocabulary.language.likila=Likila -controlledvocabulary.language.likuba=Likuba -controlledvocabulary.language.likum=Likum -controlledvocabulary.language.likwala=Likwala -controlledvocabulary.language.lilau=Lilau -controlledvocabulary.language.lillooet=Lillooet -controlledvocabulary.language.limassa=Limassa -controlledvocabulary.language.limbu=Limbu -controlledvocabulary.language.limbum=Limbum -controlledvocabulary.language.limburgan,_limburger,_limburgish=Limburgan, Limburger, Limburgish -controlledvocabulary.language.limi=Limi -controlledvocabulary.language.limilngan=Limilngan -controlledvocabulary.language.limos_kalinga=Limos Kalinga -controlledvocabulary.language.linear_a=Linear A -controlledvocabulary.language.lingala=Lingala -controlledvocabulary.language.lingao=Lingao -controlledvocabulary.language.lingarak=Lingarak -controlledvocabulary.language.lingua_franca=Lingua Franca -controlledvocabulary.language.lingua_franca_nova=Lingua Franca Nova -controlledvocabulary.language.lipan_apache=Lipan Apache -controlledvocabulary.language.lipo=Lipo -controlledvocabulary.language.lisabata-nuniali=Lisabata-Nuniali -controlledvocabulary.language.lisela=Lisela -controlledvocabulary.language.lish=Lish -controlledvocabulary.language.lishana_deni=Lishana Deni -controlledvocabulary.language.lishanid_noshan=Lishanid Noshan -controlledvocabulary.language.lishan_didan=Lishán Didán -controlledvocabulary.language.lisu=Lisu -controlledvocabulary.language.literary_chinese=Literary Chinese -controlledvocabulary.language.lithuanian=Lithuanian -controlledvocabulary.language.lithuanian_sign_language=Lithuanian Sign Language -controlledvocabulary.language.litzlitz=Litzlitz -controlledvocabulary.language.liujiang_zhuang=Liujiang Zhuang -controlledvocabulary.language.liuqian_zhuang=Liuqian Zhuang -controlledvocabulary.language.liv=Liv -controlledvocabulary.language.livvi=Livvi -controlledvocabulary.language.lo-toga=Lo-Toga -controlledvocabulary.language.loarki=Loarki -controlledvocabulary.language.lobala=Lobala -controlledvocabulary.language.lobi=Lobi -controlledvocabulary.language.lodhi=Lodhi -controlledvocabulary.language.logba=Logba -controlledvocabulary.language.logir=Logir -controlledvocabulary.language.logo=Logo -controlledvocabulary.language.logol=Logol -controlledvocabulary.language.logooli=Logooli -controlledvocabulary.language.logorik=Logorik -controlledvocabulary.language.logudorese_sardinian,_croatian=Logudorese Sardinian, Croatian -controlledvocabulary.language.lohorung=Lohorung -controlledvocabulary.language.loja_highland_quichua=Loja Highland Quichua -controlledvocabulary.language.lojban=Lojban -controlledvocabulary.language.lokaa=Lokaa -controlledvocabulary.language.loke=Loke -controlledvocabulary.language.loko=Loko -controlledvocabulary.language.lokoya=Lokoya -controlledvocabulary.language.lola=Lola -controlledvocabulary.language.lolak=Lolak -controlledvocabulary.language.lole=Lole -controlledvocabulary.language.lolo=Lolo -controlledvocabulary.language.loloda=Loloda -controlledvocabulary.language.lolopo=Lolopo -controlledvocabulary.language.loma_(cote_d'ivoire)=Loma (Côte d'Ivoire) -controlledvocabulary.language.loma_(liberia)=Loma (Liberia) -controlledvocabulary.language.lomaiviti=Lomaiviti -controlledvocabulary.language.lomavren=Lomavren -controlledvocabulary.language.lombard=Lombard -controlledvocabulary.language.lombi=Lombi -controlledvocabulary.language.lombo=Lombo -controlledvocabulary.language.lomwe=Lomwe -controlledvocabulary.language.loncong=Loncong -controlledvocabulary.language.long_phuri_naga=Long Phuri Naga -controlledvocabulary.language.long_wat=Long Wat -controlledvocabulary.language.longgu=Longgu -controlledvocabulary.language.longto=Longto -controlledvocabulary.language.longuda=Longuda -controlledvocabulary.language.loniu=Loniu -controlledvocabulary.language.lonwolwol=Lonwolwol -controlledvocabulary.language.lonzo=Lonzo -controlledvocabulary.language.loo=Loo -controlledvocabulary.language.lopa=Lopa -controlledvocabulary.language.lopi=Lopi -controlledvocabulary.language.lopit=Lopit -controlledvocabulary.language.lorang=Lorang -controlledvocabulary.language.lorediakarkar=Lorediakarkar -controlledvocabulary.language.loreto-ucayali_spanish=Loreto-Ucayali Spanish -controlledvocabulary.language.lote=Lote -controlledvocabulary.language.lotha_naga=Lotha Naga -controlledvocabulary.language.lotud=Lotud -controlledvocabulary.language.lou=Lou -controlledvocabulary.language.louisiana_creole=Louisiana Creole -controlledvocabulary.language.loun=Loun -controlledvocabulary.language.loup_a=Loup A -controlledvocabulary.language.loup_b=Loup B -controlledvocabulary.language.low_german=Low German -controlledvocabulary.language.lower_burdekin=Lower Burdekin -controlledvocabulary.language.lower_chehalis=Lower Chehalis -controlledvocabulary.language.lower_grand_valley_dani=Lower Grand Valley Dani -controlledvocabulary.language.lower_nossob=Lower Nossob -controlledvocabulary.language.lower_silesian=Lower Silesian -controlledvocabulary.language.lower_sorbian=Lower Sorbian -controlledvocabulary.language.lower_southern_aranda=Lower Southern Aranda -controlledvocabulary.language.lower_ta'oih=Lower Ta'oih -controlledvocabulary.language.lower_tanana=Lower Tanana -controlledvocabulary.language.lowland_oaxaca_chontal=Lowland Oaxaca Chontal -controlledvocabulary.language.lowland_tarahumara=Lowland Tarahumara -controlledvocabulary.language.loxicha_zapotec=Loxicha Zapotec -controlledvocabulary.language.lozi=Lozi -controlledvocabulary.language.luang=Luang -controlledvocabulary.language.luba-katanga=Luba-Katanga -controlledvocabulary.language.luba-lulua=Luba-Lulua -controlledvocabulary.language.lubila=Lubila -controlledvocabulary.language.lubu=Lubu -controlledvocabulary.language.lubuagan_kalinga=Lubuagan Kalinga -controlledvocabulary.language.luchazi=Luchazi -controlledvocabulary.language.lucumi=Lucumi -controlledvocabulary.language.ludian=Ludian -controlledvocabulary.language.lufu=Lufu -controlledvocabulary.language.lugbara=Lugbara -controlledvocabulary.language.luguru=Luguru -controlledvocabulary.language.luhu=Luhu -controlledvocabulary.language.luimbi=Luimbi -controlledvocabulary.language.luiseno=Luiseno -controlledvocabulary.language.lukpa=Lukpa -controlledvocabulary.language.lule=Lule -controlledvocabulary.language.lule_sami=Lule Sami -controlledvocabulary.language.lumba-yakkha=Lumba-Yakkha -controlledvocabulary.language.lumbu=Lumbu -controlledvocabulary.language.lumun=Lumun -controlledvocabulary.language.luna=Luna -controlledvocabulary.language.lunanakha=Lunanakha -controlledvocabulary.language.lunda=Lunda -controlledvocabulary.language.lundayeh=Lundayeh -controlledvocabulary.language.lungalunga=Lungalunga -controlledvocabulary.language.lungga=Lungga -controlledvocabulary.language.luo_(cameroon)=Luo (Cameroon) -controlledvocabulary.language.luo_(kenya_and_tanzania)=Luo (Kenya and Tanzania) -controlledvocabulary.language.luopohe_hmong=Luopohe Hmong -controlledvocabulary.language.luri=Luri -controlledvocabulary.language.lusengo=Lusengo -controlledvocabulary.language.lushai=Lushai -controlledvocabulary.language.lushootseed=Lushootseed -controlledvocabulary.language.lusi=Lusi -controlledvocabulary.language.lusitanian=Lusitanian -controlledvocabulary.language.lutos=Lutos -controlledvocabulary.language.luvale=Luvale -controlledvocabulary.language.luwati=Luwati -controlledvocabulary.language.luwo=Luwo -controlledvocabulary.language.luxembourgish,_letzeburgesch=Luxembourgish, Letzeburgesch -controlledvocabulary.language.luyana=Luyana -controlledvocabulary.language.luyia=Luyia -controlledvocabulary.language.lwalu=Lwalu -controlledvocabulary.language.lwel=Lwel -controlledvocabulary.language.lycian=Lycian -controlledvocabulary.language.lydian=Lydian -controlledvocabulary.language.lyngngam=Lyngngam -controlledvocabulary.language.lyele=Lyélé -controlledvocabulary.language.laadan=Láadan -controlledvocabulary.language.laa_laa_bwamu=Láá Láá Bwamu -controlledvocabulary.language.lu=Lü -controlledvocabulary.language.ma_(democratic_republic_of_congo)=Ma (Democratic Republic of Congo) -controlledvocabulary.language.ma_(papua_new_guinea)=Ma (Papua New Guinea) -controlledvocabulary.language.ma_manda=Ma Manda -controlledvocabulary.language.ma'anyan=Ma'anyan -controlledvocabulary.language.ma'di=Ma'di -controlledvocabulary.language.ma'ya=Ma'ya -controlledvocabulary.language.maa=Maa -controlledvocabulary.language.maaka=Maaka -controlledvocabulary.language.maasina_fulfulde=Maasina Fulfulde -controlledvocabulary.language.maay=Maay -controlledvocabulary.language.maba_(chad)=Maba (Chad) -controlledvocabulary.language.maba_(indonesia)=Maba (Indonesia) -controlledvocabulary.language.mabaale=Mabaale -controlledvocabulary.language.mabaan=Mabaan -controlledvocabulary.language.mabaka_valley_kalinga=Mabaka Valley Kalinga -controlledvocabulary.language.mabire=Mabire -controlledvocabulary.language.maca=Maca -controlledvocabulary.language.macaguaje=Macaguaje -controlledvocabulary.language.macaguan=Macaguán -controlledvocabulary.language.macanese=Macanese -controlledvocabulary.language.macedo-romanian=Macedo-Romanian -controlledvocabulary.language.macedonian=Macedonian -controlledvocabulary.language.machame=Machame -controlledvocabulary.language.machiguenga=Machiguenga -controlledvocabulary.language.machinere=Machinere -controlledvocabulary.language.machinga=Machinga -controlledvocabulary.language.maco=Maco -controlledvocabulary.language.macuna=Macuna -controlledvocabulary.language.macushi=Macushi -controlledvocabulary.language.mada_(cameroon)=Mada (Cameroon) -controlledvocabulary.language.mada_(nigeria)=Mada (Nigeria) -controlledvocabulary.language.madagascar_sign_language=Madagascar Sign Language -controlledvocabulary.language.madak=Madak -controlledvocabulary.language.madhi_madhi=Madhi Madhi -controlledvocabulary.language.madi=Madi -controlledvocabulary.language.madurese=Madurese -controlledvocabulary.language.mae=Mae -controlledvocabulary.language.maek=Maek -controlledvocabulary.language.maeng_itneg=Maeng Itneg -controlledvocabulary.language.mafa=Mafa -controlledvocabulary.language.mafea=Mafea -controlledvocabulary.language.mag-indi_ayta=Mag-Indi Ayta -controlledvocabulary.language.mag-antsi_ayta=Mag-antsi Ayta -controlledvocabulary.language.magahi=Magahi -controlledvocabulary.language.magbukun_ayta=Magbukun Ayta -controlledvocabulary.language.magdalena_penasco_mixtec=Magdalena Peñasco Mixtec -controlledvocabulary.language.magoma=Magoma -controlledvocabulary.language.magori=Magori -controlledvocabulary.language.maguindanaon=Maguindanaon -controlledvocabulary.language.magɨ_(madang_province)=Magɨ (Madang Province) -controlledvocabulary.language.magɨyi=Magɨyi -controlledvocabulary.language.mahali=Mahali -controlledvocabulary.language.mahasu_pahari=Mahasu Pahari -controlledvocabulary.language.mahican=Mahican -controlledvocabulary.language.mahongwe=Mahongwe -controlledvocabulary.language.mahou=Mahou -controlledvocabulary.language.mai_brat=Mai Brat -controlledvocabulary.language.maia=Maia -controlledvocabulary.language.maiadomu=Maiadomu -controlledvocabulary.language.maiani=Maiani -controlledvocabulary.language.maii=Maii -controlledvocabulary.language.mailu=Mailu -controlledvocabulary.language.maindo=Maindo -controlledvocabulary.language.mainfrankisch=Mainfränkisch -controlledvocabulary.language.mainstream_kenyah=Mainstream Kenyah -controlledvocabulary.language.mairasi=Mairasi -controlledvocabulary.language.maisin=Maisin -controlledvocabulary.language.maithili=Maithili -controlledvocabulary.language.maiwa_(indonesia)=Maiwa (Indonesia) -controlledvocabulary.language.maiwa_(papua_new_guinea)=Maiwa (Papua New Guinea) -controlledvocabulary.language.maiwala=Maiwala -controlledvocabulary.language.majang=Majang -controlledvocabulary.language.majera=Majera -controlledvocabulary.language.majhi=Majhi -controlledvocabulary.language.majhwar=Majhwar -controlledvocabulary.language.majukayang_kalinga=Majukayang Kalinga -controlledvocabulary.language.mak_(china)=Mak (China) -controlledvocabulary.language.mak_(nigeria)=Mak (Nigeria) -controlledvocabulary.language.makaa=Makaa -controlledvocabulary.language.makah=Makah -controlledvocabulary.language.makalero=Makalero -controlledvocabulary.language.makasae=Makasae -controlledvocabulary.language.makasar=Makasar -controlledvocabulary.language.makassar_malay=Makassar Malay -controlledvocabulary.language.makayam=Makayam -controlledvocabulary.language.makhuwa=Makhuwa -controlledvocabulary.language.makhuwa-marrevone=Makhuwa-Marrevone -controlledvocabulary.language.makhuwa-meetto=Makhuwa-Meetto -controlledvocabulary.language.makhuwa-moniga=Makhuwa-Moniga -controlledvocabulary.language.makhuwa-saka=Makhuwa-Saka -controlledvocabulary.language.makhuwa-shirima=Makhuwa-Shirima -controlledvocabulary.language.maklew=Maklew -controlledvocabulary.language.makolkol=Makolkol -controlledvocabulary.language.makonde=Makonde -controlledvocabulary.language.maku'a=Maku'a -controlledvocabulary.language.makuri_naga=Makuri Naga -controlledvocabulary.language.makurap=Makuráp -controlledvocabulary.language.makwe=Makwe -controlledvocabulary.language.makyan_naga=Makyan Naga -controlledvocabulary.language.mal=Mal -controlledvocabulary.language.mal_paharia=Mal Paharia -controlledvocabulary.language.mala_(nigeria)=Mala (Nigeria) -controlledvocabulary.language.mala_(papua_new_guinea)=Mala (Papua New Guinea) -controlledvocabulary.language.mala_malasar=Mala Malasar -controlledvocabulary.language.malaccan_creole_malay=Malaccan Creole Malay -controlledvocabulary.language.malaccan_creole_portuguese=Malaccan Creole Portuguese -controlledvocabulary.language.malagasy=Malagasy -controlledvocabulary.language.malak_malak=Malak Malak -controlledvocabulary.language.malalamai=Malalamai -controlledvocabulary.language.malango=Malango -controlledvocabulary.language.malankuravan=Malankuravan -controlledvocabulary.language.malapandaram=Malapandaram -controlledvocabulary.language.malaryan=Malaryan -controlledvocabulary.language.malas=Malas -controlledvocabulary.language.malasar=Malasar -controlledvocabulary.language.malavedan=Malavedan -controlledvocabulary.language.malawi_lomwe=Malawi Lomwe -controlledvocabulary.language.malawi_sena=Malawi Sena -controlledvocabulary.language.malawian_sign_language=Malawian Sign Language -controlledvocabulary.language.malay_(individual_language)=Malay (individual language) -controlledvocabulary.language.malay,_malay_(macrolanguage)=Malay, Malay (macrolanguage) -controlledvocabulary.language.malayalam=Malayalam -controlledvocabulary.language.malayic_dayak=Malayic Dayak -controlledvocabulary.language.malaynon=Malaynon -controlledvocabulary.language.malayo=Malayo -controlledvocabulary.language.malaysian_sign_language=Malaysian Sign Language -controlledvocabulary.language.malba_birifor=Malba Birifor -controlledvocabulary.language.maldivian,_dhivehi,_divehi=Maldivian, Dhivehi, Divehi -controlledvocabulary.language.male_(ethiopia)=Male (Ethiopia) -controlledvocabulary.language.male_(papua_new_guinea)=Male (Papua New Guinea) -controlledvocabulary.language.malecite-passamaquoddy=Malecite-Passamaquoddy -controlledvocabulary.language.maleng=Maleng -controlledvocabulary.language.maleu-kilenge=Maleu-Kilenge -controlledvocabulary.language.malfaxal=Malfaxal -controlledvocabulary.language.malgana=Malgana -controlledvocabulary.language.malgbe=Malgbe -controlledvocabulary.language.mali=Mali -controlledvocabulary.language.malila=Malila -controlledvocabulary.language.malimba=Malimba -controlledvocabulary.language.malimpung=Malimpung -controlledvocabulary.language.malinaltepec_me'phaa=Malinaltepec Me'phaa -controlledvocabulary.language.malo=Malo -controlledvocabulary.language.malol=Malol -controlledvocabulary.language.maltese=Maltese -controlledvocabulary.language.maltese_sign_language=Maltese Sign Language -controlledvocabulary.language.malua_bay=Malua Bay -controlledvocabulary.language.malvi=Malvi -controlledvocabulary.language.malyangapa=Malyangapa -controlledvocabulary.language.maleku_jaika=Maléku Jaíka -controlledvocabulary.language.mam=Mam -controlledvocabulary.language.mama=Mama -controlledvocabulary.language.mamaa=Mamaa -controlledvocabulary.language.mamainde=Mamaindé -controlledvocabulary.language.mamanwa=Mamanwa -controlledvocabulary.language.mamara_senoufo=Mamara Senoufo -controlledvocabulary.language.mamasa=Mamasa -controlledvocabulary.language.mambae=Mambae -controlledvocabulary.language.mambai=Mambai -controlledvocabulary.language.mamboru=Mamboru -controlledvocabulary.language.mambwe-lungu=Mambwe-Lungu -controlledvocabulary.language.mampruli=Mampruli -controlledvocabulary.language.mamuju=Mamuju -controlledvocabulary.language.mamulique=Mamulique -controlledvocabulary.language.mamusi=Mamusi -controlledvocabulary.language.mamvu=Mamvu -controlledvocabulary.language.man_met=Man Met -controlledvocabulary.language.manado_malay=Manado Malay -controlledvocabulary.language.manam=Manam -controlledvocabulary.language.manambu=Manambu -controlledvocabulary.language.manangba=Manangba -controlledvocabulary.language.manangkari=Manangkari -controlledvocabulary.language.manchu=Manchu -controlledvocabulary.language.manda_(australia)=Manda (Australia) -controlledvocabulary.language.manda_(india)=Manda (India) -controlledvocabulary.language.manda_(tanzania)=Manda (Tanzania) -controlledvocabulary.language.mandahuaca=Mandahuaca -controlledvocabulary.language.mandaic=Mandaic -controlledvocabulary.language.mandan=Mandan -controlledvocabulary.language.mandandanyi=Mandandanyi -controlledvocabulary.language.mandar=Mandar -controlledvocabulary.language.mandara=Mandara -controlledvocabulary.language.mandari=Mandari -controlledvocabulary.language.mandarin_chinese=Mandarin Chinese -controlledvocabulary.language.mandaya=Mandaya -controlledvocabulary.language.mandeali=Mandeali -controlledvocabulary.language.mander=Mander -controlledvocabulary.language.mandingo=Mandingo -controlledvocabulary.language.mandinka=Mandinka -controlledvocabulary.language.mandjak=Mandjak -controlledvocabulary.language.mandobo_atas=Mandobo Atas -controlledvocabulary.language.mandobo_bawah=Mandobo Bawah -controlledvocabulary.language.manem=Manem -controlledvocabulary.language.mang=Mang -controlledvocabulary.language.manga_kanuri=Manga Kanuri -controlledvocabulary.language.mangala=Mangala -controlledvocabulary.language.mangareva=Mangareva -controlledvocabulary.language.mangarrayi=Mangarrayi -controlledvocabulary.language.mangas=Mangas -controlledvocabulary.language.mangayat=Mangayat -controlledvocabulary.language.mangbetu=Mangbetu -controlledvocabulary.language.mangbutu=Mangbutu -controlledvocabulary.language.mangerr=Mangerr -controlledvocabulary.language.mangga_buang=Mangga Buang -controlledvocabulary.language.manggarai=Manggarai -controlledvocabulary.language.mango=Mango -controlledvocabulary.language.mangole=Mangole -controlledvocabulary.language.mangseng=Mangseng -controlledvocabulary.language.mangue=Mangue -controlledvocabulary.language.manichaean_middle_persian=Manichaean Middle Persian -controlledvocabulary.language.manide=Manide -controlledvocabulary.language.manikion=Manikion -controlledvocabulary.language.manipa=Manipa -controlledvocabulary.language.manipuri=Manipuri -controlledvocabulary.language.mankanya=Mankanya -controlledvocabulary.language.mankiyali=Mankiyali -controlledvocabulary.language.manna-dora=Manna-Dora -controlledvocabulary.language.mannan=Mannan -controlledvocabulary.language.mano=Mano -controlledvocabulary.language.manombai=Manombai -controlledvocabulary.language.mansaka=Mansaka -controlledvocabulary.language.mansi=Mansi -controlledvocabulary.language.mansoanka=Mansoanka -controlledvocabulary.language.manta=Manta -controlledvocabulary.language.mantsi=Mantsi -controlledvocabulary.language.manumanaw_karen=Manumanaw Karen -controlledvocabulary.language.manx=Manx -controlledvocabulary.language.manya=Manya -controlledvocabulary.language.manyawa=Manyawa -controlledvocabulary.language.manyika=Manyika -controlledvocabulary.language.manza=Manza -controlledvocabulary.language.mao_naga=Mao Naga -controlledvocabulary.language.maonan=Maonan -controlledvocabulary.language.maore_comorian=Maore Comorian -controlledvocabulary.language.mape=Mape -controlledvocabulary.language.mapena=Mapena -controlledvocabulary.language.mapia=Mapia -controlledvocabulary.language.mapidian=Mapidian -controlledvocabulary.language.mapos_buang=Mapos Buang -controlledvocabulary.language.mapoyo=Mapoyo -controlledvocabulary.language.mapudungun=Mapudungun -controlledvocabulary.language.mapun=Mapun -controlledvocabulary.language.maquiritari=Maquiritari -controlledvocabulary.language.mara_chin=Mara Chin -controlledvocabulary.language.marachi=Marachi -controlledvocabulary.language.maraghei=Maraghei -controlledvocabulary.language.maragus=Maragus -controlledvocabulary.language.maram_naga=Maram Naga -controlledvocabulary.language.marama=Marama -controlledvocabulary.language.maranao=Maranao -controlledvocabulary.language.maranunggu=Maranunggu -controlledvocabulary.language.mararit=Mararit -controlledvocabulary.language.marathi,_marathi_(marathi)=Marathi, Marathi (Marāṭhī) -controlledvocabulary.language.marau=Marau -controlledvocabulary.language.marba=Marba -controlledvocabulary.language.mardin_sign_language=Mardin Sign Language -controlledvocabulary.language.maremgi=Maremgi -controlledvocabulary.language.marenje=Marenje -controlledvocabulary.language.marfa=Marfa -controlledvocabulary.language.margany=Margany -controlledvocabulary.language.marghi_central=Marghi Central -controlledvocabulary.language.marghi_south=Marghi South -controlledvocabulary.language.margos-yarowilca-lauricocha_quechua=Margos-Yarowilca-Lauricocha Quechua -controlledvocabulary.language.margu=Margu -controlledvocabulary.language.mari_(east_sepik_province)=Mari (East Sepik Province) -controlledvocabulary.language.mari_(madang_province)=Mari (Madang Province) -controlledvocabulary.language.mari_(russia)=Mari (Russia) -controlledvocabulary.language.maria_(india)=Maria (India) -controlledvocabulary.language.maria_(papua_new_guinea)=Maria (Papua New Guinea) -controlledvocabulary.language.maricopa=Maricopa -controlledvocabulary.language.maridan=Maridan -controlledvocabulary.language.maridjabin=Maridjabin -controlledvocabulary.language.marik=Marik -controlledvocabulary.language.marimanindji=Marimanindji -controlledvocabulary.language.marind=Marind -controlledvocabulary.language.maring=Maring -controlledvocabulary.language.maring_naga=Maring Naga -controlledvocabulary.language.maringarr=Maringarr -controlledvocabulary.language.marino=Marino -controlledvocabulary.language.mariri=Mariri -controlledvocabulary.language.maritime_sign_language=Maritime Sign Language -controlledvocabulary.language.maritsaua=Maritsauá -controlledvocabulary.language.mariyedi=Mariyedi -controlledvocabulary.language.marka=Marka -controlledvocabulary.language.markweeta=Markweeta -controlledvocabulary.language.marma=Marma -controlledvocabulary.language.marovo=Marovo -controlledvocabulary.language.marra=Marra -controlledvocabulary.language.marriammu=Marriammu -controlledvocabulary.language.marrithiyel=Marrithiyel -controlledvocabulary.language.marrucinian=Marrucinian -controlledvocabulary.language.marshallese=Marshallese -controlledvocabulary.language.marsian=Marsian -controlledvocabulary.language.martha's_vineyard_sign_language=Martha's Vineyard Sign Language -controlledvocabulary.language.marti_ke=Marti Ke -controlledvocabulary.language.martu_wangka=Martu Wangka -controlledvocabulary.language.martuyhunira=Martuyhunira -controlledvocabulary.language.maru=Maru -controlledvocabulary.language.marwari=Marwari -controlledvocabulary.language.marwari_(india)=Marwari (India) -controlledvocabulary.language.marwari_(pakistan)=Marwari (Pakistan) -controlledvocabulary.language.marubo=Marúbo -controlledvocabulary.language.masaaba=Masaaba -controlledvocabulary.language.masadiit_itneg=Masadiit Itneg -controlledvocabulary.language.masai=Masai -controlledvocabulary.language.masalit=Masalit -controlledvocabulary.language.masana=Masana -controlledvocabulary.language.masbatenyo=Masbatenyo -controlledvocabulary.language.mashco_piro=Mashco Piro -controlledvocabulary.language.mashi_(nigeria)=Mashi (Nigeria) -controlledvocabulary.language.mashi_(zambia)=Mashi (Zambia) -controlledvocabulary.language.masikoro_malagasy=Masikoro Malagasy -controlledvocabulary.language.masimasi=Masimasi -controlledvocabulary.language.masiwang=Masiwang -controlledvocabulary.language.maskelynes=Maskelynes -controlledvocabulary.language.maslam=Maslam -controlledvocabulary.language.masmaje=Masmaje -controlledvocabulary.language.massalat=Massalat -controlledvocabulary.language.massep=Massep -controlledvocabulary.language.matagalpa=Matagalpa -controlledvocabulary.language.matal=Matal -controlledvocabulary.language.matambwe=Matambwe -controlledvocabulary.language.matbat=Matbat -controlledvocabulary.language.matengo=Matengo -controlledvocabulary.language.matepi=Matepi -controlledvocabulary.language.matigsalug_manobo=Matigsalug Manobo -controlledvocabulary.language.matipuhy=Matipuhy -controlledvocabulary.language.matngala=Matngala -controlledvocabulary.language.mato=Mato -controlledvocabulary.language.mato_grosso_arara=Mato Grosso Arára -controlledvocabulary.language.mator=Mator -controlledvocabulary.language.matses=Matsés -controlledvocabulary.language.mattole=Mattole -controlledvocabulary.language.matu_chin=Matu Chin -controlledvocabulary.language.matukar=Matukar -controlledvocabulary.language.matumbi=Matumbi -controlledvocabulary.language.matya_samo=Matya Samo -controlledvocabulary.language.matis=Matís -controlledvocabulary.language.maung=Maung -controlledvocabulary.language.mauritian_sign_language=Mauritian Sign Language -controlledvocabulary.language.mauwake=Mauwake -controlledvocabulary.language.mawa_(chad)=Mawa (Chad) -controlledvocabulary.language.mawa_(nigeria)=Mawa (Nigeria) -controlledvocabulary.language.mawak=Mawak -controlledvocabulary.language.mawan=Mawan -controlledvocabulary.language.mawayana=Mawayana -controlledvocabulary.language.mawchi=Mawchi -controlledvocabulary.language.mawes=Mawes -controlledvocabulary.language.maxakali=Maxakalí -controlledvocabulary.language.maxi_gbe=Maxi Gbe -controlledvocabulary.language.maya_samo=Maya Samo -controlledvocabulary.language.mayaguduna=Mayaguduna -controlledvocabulary.language.mayangna=Mayangna -controlledvocabulary.language.mayawali=Mayawali -controlledvocabulary.language.mayeka=Mayeka -controlledvocabulary.language.mayi-kulan=Mayi-Kulan -controlledvocabulary.language.mayi-thakurti=Mayi-Thakurti -controlledvocabulary.language.mayi-yapi=Mayi-Yapi -controlledvocabulary.language.mayo=Mayo -controlledvocabulary.language.mayogo=Mayogo -controlledvocabulary.language.mayoyao_ifugao=Mayoyao Ifugao -controlledvocabulary.language.mazagway=Mazagway -controlledvocabulary.language.mazaltepec_zapotec=Mazaltepec Zapotec -controlledvocabulary.language.mazanderani=Mazanderani -controlledvocabulary.language.mazatlan_mazatec=Mazatlán Mazatec -controlledvocabulary.language.mazatlan_mixe=Mazatlán Mixe -controlledvocabulary.language.mba=Mba -controlledvocabulary.language.mbala=Mbala -controlledvocabulary.language.mbalanhu=Mbalanhu -controlledvocabulary.language.mbandja=Mbandja -controlledvocabulary.language.mbangala=Mbangala -controlledvocabulary.language.mbangi=Mbangi -controlledvocabulary.language.mbangwe=Mbangwe -controlledvocabulary.language.mbara_(australia)=Mbara (Australia) -controlledvocabulary.language.mbara_(chad)=Mbara (Chad) -controlledvocabulary.language.mbariman-gudhinma=Mbariman-Gudhinma -controlledvocabulary.language.mbati=Mbati -controlledvocabulary.language.mbato=Mbato -controlledvocabulary.language.mbay=Mbay -controlledvocabulary.language.mbe=Mbe -controlledvocabulary.language.mbe'=Mbe' -controlledvocabulary.language.mbelime=Mbelime -controlledvocabulary.language.mbere=Mbere -controlledvocabulary.language.mbesa=Mbesa -controlledvocabulary.language.mbessa=Mbessa -controlledvocabulary.language.mbo_(cameroon)=Mbo (Cameroon) -controlledvocabulary.language.mbo_(democratic_republic_of_congo)=Mbo (Democratic Republic of Congo) -controlledvocabulary.language.mboi=Mboi -controlledvocabulary.language.mboko=Mboko -controlledvocabulary.language.mbole=Mbole -controlledvocabulary.language.mbonga=Mbonga -controlledvocabulary.language.mbongno=Mbongno -controlledvocabulary.language.mbosi=Mbosi -controlledvocabulary.language.mbowe=Mbowe -controlledvocabulary.language.mbre=Mbre -controlledvocabulary.language.mbudum=Mbudum -controlledvocabulary.language.mbugu=Mbugu -controlledvocabulary.language.mbugwe=Mbugwe -controlledvocabulary.language.mbuk=Mbuk -controlledvocabulary.language.mbuko=Mbuko -controlledvocabulary.language.mbukushu=Mbukushu -controlledvocabulary.language.mbula=Mbula -controlledvocabulary.language.mbula-bwazza=Mbula-Bwazza -controlledvocabulary.language.mbule=Mbule -controlledvocabulary.language.mbulungish=Mbulungish -controlledvocabulary.language.mbum=Mbum -controlledvocabulary.language.mbunda=Mbunda -controlledvocabulary.language.mbunga=Mbunga -controlledvocabulary.language.mburku=Mburku -controlledvocabulary.language.mbwela=Mbwela -controlledvocabulary.language.mbya_guarani=Mbyá Guaraní -controlledvocabulary.language.me'en=Me'en -controlledvocabulary.language.medebur=Medebur -controlledvocabulary.language.medefaidrin=Medefaidrin -controlledvocabulary.language.media_lengua=Media Lengua -controlledvocabulary.language.median=Median -controlledvocabulary.language.mednyj_aleut=Mednyj Aleut -controlledvocabulary.language.medumba=Medumba -controlledvocabulary.language.mefele=Mefele -controlledvocabulary.language.megam=Megam -controlledvocabulary.language.megleno_romanian=Megleno Romanian -controlledvocabulary.language.mehek=Mehek -controlledvocabulary.language.mehinaku=Mehináku -controlledvocabulary.language.mehri=Mehri -controlledvocabulary.language.mekeo=Mekeo -controlledvocabulary.language.mekmek=Mekmek -controlledvocabulary.language.mekwei=Mekwei -controlledvocabulary.language.mel-khaonh=Mel-Khaonh -controlledvocabulary.language.mele-fila=Mele-Fila -controlledvocabulary.language.melo=Melo -controlledvocabulary.language.melpa=Melpa -controlledvocabulary.language.memoni=Memoni -controlledvocabulary.language.mendalam_kayan=Mendalam Kayan -controlledvocabulary.language.mendankwe-nkwen=Mendankwe-Nkwen -controlledvocabulary.language.mende_(papua_new_guinea)=Mende (Papua New Guinea) -controlledvocabulary.language.mende_(sierra_leone)=Mende (Sierra Leone) -controlledvocabulary.language.mengaka=Mengaka -controlledvocabulary.language.mengen=Mengen -controlledvocabulary.language.mengisa=Mengisa -controlledvocabulary.language.menka=Menka -controlledvocabulary.language.menominee=Menominee -controlledvocabulary.language.mentawai=Mentawai -controlledvocabulary.language.menya=Menya -controlledvocabulary.language.meoswar=Meoswar -controlledvocabulary.language.mer=Mer -controlledvocabulary.language.meramera=Meramera -controlledvocabulary.language.merei=Merei -controlledvocabulary.language.merey=Merey -controlledvocabulary.language.meriam_mir=Meriam Mir -controlledvocabulary.language.merlav=Merlav -controlledvocabulary.language.meroitic=Meroitic -controlledvocabulary.language.meru=Meru -controlledvocabulary.language.merwari=Merwari -controlledvocabulary.language.mesaka=Mesaka -controlledvocabulary.language.mescalero-chiricahua_apache=Mescalero-Chiricahua Apache -controlledvocabulary.language.mese=Mese -controlledvocabulary.language.meskwaki=Meskwaki -controlledvocabulary.language.mesme=Mesme -controlledvocabulary.language.mesmes=Mesmes -controlledvocabulary.language.mesopotamian_arabic=Mesopotamian Arabic -controlledvocabulary.language.mesqan=Mesqan -controlledvocabulary.language.messapic=Messapic -controlledvocabulary.language.meta'=Meta' -controlledvocabulary.language.metlatonoc_mixtec=Metlatónoc Mixtec -controlledvocabulary.language.mewari=Mewari -controlledvocabulary.language.mewati=Mewati -controlledvocabulary.language.mexican_sign_language=Mexican Sign Language -controlledvocabulary.language.meyah=Meyah -controlledvocabulary.language.mezontla_popoloca=Mezontla Popoloca -controlledvocabulary.language.mezquital_otomi=Mezquital Otomi -controlledvocabulary.language.mfinu=Mfinu -controlledvocabulary.language.mfumte=Mfumte -controlledvocabulary.language.mgbolizhia=Mgbolizhia -controlledvocabulary.language.mi'kmaq=Mi'kmaq -controlledvocabulary.language.miahuatlan_zapotec=Miahuatlán Zapotec -controlledvocabulary.language.miami=Miami -controlledvocabulary.language.mian=Mian -controlledvocabulary.language.miani=Miani -controlledvocabulary.language.michif=Michif -controlledvocabulary.language.michigamea=Michigamea -controlledvocabulary.language.michoacan_mazahua=Michoacán Mazahua -controlledvocabulary.language.michoacan_nahuatl=Michoacán Nahuatl -controlledvocabulary.language.mid_grand_valley_dani=Mid Grand Valley Dani -controlledvocabulary.language.mid-southern_banda=Mid-Southern Banda -controlledvocabulary.language.middle_armenian=Middle Armenian -controlledvocabulary.language.middle_breton=Middle Breton -controlledvocabulary.language.middle_cornish=Middle Cornish -controlledvocabulary.language.middle_dutch_(ca._1050-1350)=Middle Dutch (ca. 1050-1350) -controlledvocabulary.language.middle_english_(1100-1500)=Middle English (1100-1500) -controlledvocabulary.language.middle_french_(ca._1400-1600)=Middle French (ca. 1400-1600) -controlledvocabulary.language.middle_high_german_(ca._1050-1500)=Middle High German (ca. 1050-1500) -controlledvocabulary.language.middle_hittite=Middle Hittite -controlledvocabulary.language.middle_irish_(900-1200)=Middle Irish (900-1200) -controlledvocabulary.language.middle_khmer_(1400_to_1850_ce)=Middle Khmer (1400 to 1850 CE) -controlledvocabulary.language.middle_korean_(10th-16th_cent.)=Middle Korean (10th-16th cent.) -controlledvocabulary.language.middle_low_german=Middle Low German -controlledvocabulary.language.middle_mongolian=Middle Mongolian -controlledvocabulary.language.middle_newar=Middle Newar -controlledvocabulary.language.middle_watut=Middle Watut -controlledvocabulary.language.middle_welsh=Middle Welsh -controlledvocabulary.language.midob=Midob -controlledvocabulary.language.migaama=Migaama -controlledvocabulary.language.migabac=Migabac -controlledvocabulary.language.migum=Migum -controlledvocabulary.language.miju-mishmi=Miju-Mishmi -controlledvocabulary.language.mikasuki=Mikasuki -controlledvocabulary.language.mili=Mili -controlledvocabulary.language.miltu=Miltu -controlledvocabulary.language.miluk=Miluk -controlledvocabulary.language.milyan=Milyan -controlledvocabulary.language.min_bei_chinese=Min Bei Chinese -controlledvocabulary.language.min_dong_chinese=Min Dong Chinese -controlledvocabulary.language.min_nan_chinese=Min Nan Chinese -controlledvocabulary.language.min_zhong_chinese=Min Zhong Chinese -controlledvocabulary.language.mina_(cameroon)=Mina (Cameroon) -controlledvocabulary.language.minaean=Minaean -controlledvocabulary.language.minang=Minang -controlledvocabulary.language.minangkabau=Minangkabau -controlledvocabulary.language.minanibai=Minanibai -controlledvocabulary.language.minaveha=Minaveha -controlledvocabulary.language.minderico=Minderico -controlledvocabulary.language.mindiri=Mindiri -controlledvocabulary.language.mingang_doso=Mingang Doso -controlledvocabulary.language.mingrelian=Mingrelian -controlledvocabulary.language.minica_huitoto=Minica Huitoto -controlledvocabulary.language.minidien=Minidien -controlledvocabulary.language.minjungbal=Minjungbal -controlledvocabulary.language.minkin=Minkin -controlledvocabulary.language.minoan=Minoan -controlledvocabulary.language.minokok=Minokok -controlledvocabulary.language.minriq=Minriq -controlledvocabulary.language.mintil=Mintil -controlledvocabulary.language.minz_zhuang=Minz Zhuang -controlledvocabulary.language.miqie=Miqie -controlledvocabulary.language.mirandese=Mirandese -controlledvocabulary.language.miraya_bikol=Miraya Bikol -controlledvocabulary.language.mirgan=Mirgan -controlledvocabulary.language.miriti=Miriti -controlledvocabulary.language.miriwoong=Miriwoong -controlledvocabulary.language.miriwoong_sign_language=Miriwoong Sign Language -controlledvocabulary.language.mirning=Mirning -controlledvocabulary.language.miship=Miship -controlledvocabulary.language.misima-panaeati=Misima-Panaeati -controlledvocabulary.language.mising=Mising -controlledvocabulary.language.mitla_zapotec=Mitla Zapotec -controlledvocabulary.language.mitlatongo_mixtec=Mitlatongo Mixtec -controlledvocabulary.language.mittu=Mittu -controlledvocabulary.language.mituku=Mituku -controlledvocabulary.language.miu=Miu -controlledvocabulary.language.miwa=Miwa -controlledvocabulary.language.mixed_great_andamanese=Mixed Great Andamanese -controlledvocabulary.language.mixtepec_mixtec=Mixtepec Mixtec -controlledvocabulary.language.mixtepec_zapotec=Mixtepec Zapotec -controlledvocabulary.language.miya=Miya -controlledvocabulary.language.miyako=Miyako -controlledvocabulary.language.miyakubo_sign_language=Miyakubo Sign Language -controlledvocabulary.language.miyobe=Miyobe -controlledvocabulary.language.mlabri=Mlabri -controlledvocabulary.language.mlahso=Mlahsö -controlledvocabulary.language.mlap=Mlap -controlledvocabulary.language.mlomp=Mlomp -controlledvocabulary.language.mmaala=Mmaala -controlledvocabulary.language.mmen=Mmen -controlledvocabulary.language.mo'da=Mo'da -controlledvocabulary.language.moabite=Moabite -controlledvocabulary.language.moba=Moba -controlledvocabulary.language.mobilian=Mobilian -controlledvocabulary.language.mobumrin_aizi=Mobumrin Aizi -controlledvocabulary.language.mobwa_karen=Mobwa Karen -controlledvocabulary.language.mochi=Mochi -controlledvocabulary.language.mochica=Mochica -controlledvocabulary.language.mocho=Mocho -controlledvocabulary.language.mocovi=Mocoví -controlledvocabulary.language.modang=Modang -controlledvocabulary.language.modern_greek_(1453-),_greek_(modern)=Modern Greek (1453-), Greek (modern) -controlledvocabulary.language.modole=Modole -controlledvocabulary.language.moere=Moere -controlledvocabulary.language.mofu-gudur=Mofu-Gudur -controlledvocabulary.language.mogholi=Mogholi -controlledvocabulary.language.mogofin=Mogofin -controlledvocabulary.language.mogum=Mogum -controlledvocabulary.language.mohave=Mohave -controlledvocabulary.language.mohawk=Mohawk -controlledvocabulary.language.mohegan-pequot=Mohegan-Pequot -controlledvocabulary.language.moi_(congo)=Moi (Congo) -controlledvocabulary.language.moi_(indonesia)=Moi (Indonesia) -controlledvocabulary.language.moikodi=Moikodi -controlledvocabulary.language.moingi=Moingi -controlledvocabulary.language.moji=Moji -controlledvocabulary.language.mok=Mok -controlledvocabulary.language.mokati=Mokati -controlledvocabulary.language.moken=Moken -controlledvocabulary.language.mokerang=Mokerang -controlledvocabulary.language.mokilese=Mokilese -controlledvocabulary.language.moklen=Moklen -controlledvocabulary.language.mokole=Mokole -controlledvocabulary.language.mokpwe=Mokpwe -controlledvocabulary.language.moksela=Moksela -controlledvocabulary.language.moksha=Moksha -controlledvocabulary.language.molale=Molale -controlledvocabulary.language.molbog=Molbog -controlledvocabulary.language.moldova_sign_language=Moldova Sign Language -controlledvocabulary.language.molengue=Molengue -controlledvocabulary.language.molima=Molima -controlledvocabulary.language.molmo_one=Molmo One -controlledvocabulary.language.molo=Molo -controlledvocabulary.language.molof=Molof -controlledvocabulary.language.moloko=Moloko -controlledvocabulary.language.mom_jango=Mom Jango -controlledvocabulary.language.moma=Moma -controlledvocabulary.language.momare=Momare -controlledvocabulary.language.mombo_dogon=Mombo Dogon -controlledvocabulary.language.mombum=Mombum -controlledvocabulary.language.momina=Momina -controlledvocabulary.language.momuna=Momuna -controlledvocabulary.language.mon=Mon -controlledvocabulary.language.monastic_sign_language=Monastic Sign Language -controlledvocabulary.language.mondropolon=Mondropolon -controlledvocabulary.language.monde=Mondé -controlledvocabulary.language.mongo=Mongo -controlledvocabulary.language.mongol=Mongol -controlledvocabulary.language.mongolia_buriat=Mongolia Buriat -controlledvocabulary.language.mongolian=Mongolian -controlledvocabulary.language.mongolian_sign_language=Mongolian Sign Language -controlledvocabulary.language.mongondow=Mongondow -controlledvocabulary.language.moni=Moni -controlledvocabulary.language.mono_(cameroon)=Mono (Cameroon) -controlledvocabulary.language.mono_(democratic_republic_of_congo)=Mono (Democratic Republic of Congo) -controlledvocabulary.language.mono_(solomon_islands)=Mono (Solomon Islands) -controlledvocabulary.language.mono_(usa)=Mono (USA) -controlledvocabulary.language.monom=Monom -controlledvocabulary.language.monsang_naga=Monsang Naga -controlledvocabulary.language.montenegrin=Montenegrin -controlledvocabulary.language.montol=Montol -controlledvocabulary.language.monumbo=Monumbo -controlledvocabulary.language.monzombo=Monzombo -controlledvocabulary.language.moo=Moo -controlledvocabulary.language.moose_cree=Moose Cree -controlledvocabulary.language.mopan_maya=Mopán Maya -controlledvocabulary.language.mor_(bomberai_peninsula)=Mor (Bomberai Peninsula) -controlledvocabulary.language.mor_(mor_islands)=Mor (Mor Islands) -controlledvocabulary.language.moraid=Moraid -controlledvocabulary.language.morawa=Morawa -controlledvocabulary.language.morelos_nahuatl=Morelos Nahuatl -controlledvocabulary.language.morerebi=Morerebi -controlledvocabulary.language.moresada=Moresada -controlledvocabulary.language.mori_atas=Mori Atas -controlledvocabulary.language.mori_bawah=Mori Bawah -controlledvocabulary.language.morigi=Morigi -controlledvocabulary.language.moriori=Moriori -controlledvocabulary.language.morisyen=Morisyen -controlledvocabulary.language.moro=Moro -controlledvocabulary.language.moroccan_arabic=Moroccan Arabic -controlledvocabulary.language.moroccan_sign_language=Moroccan Sign Language -controlledvocabulary.language.morokodo=Morokodo -controlledvocabulary.language.morom=Morom -controlledvocabulary.language.moronene=Moronene -controlledvocabulary.language.morori=Morori -controlledvocabulary.language.morouas=Morouas -controlledvocabulary.language.morrobalama=Morrobalama -controlledvocabulary.language.mortlockese=Mortlockese -controlledvocabulary.language.moru=Moru -controlledvocabulary.language.mosimo=Mosimo -controlledvocabulary.language.moskona=Moskona -controlledvocabulary.language.mossi=Mossi -controlledvocabulary.language.mota=Mota -controlledvocabulary.language.motlav=Motlav -controlledvocabulary.language.motu=Motu -controlledvocabulary.language.mouk-aria=Mouk-Aria -controlledvocabulary.language.moundadan_chetty=Moundadan Chetty -controlledvocabulary.language.mountain_koiali=Mountain Koiali -controlledvocabulary.language.mouwase=Mouwase -controlledvocabulary.language.movima=Movima -controlledvocabulary.language.moyadan_itneg=Moyadan Itneg -controlledvocabulary.language.moyon_naga=Moyon Naga -controlledvocabulary.language.mozambican_sign_language=Mozambican Sign Language -controlledvocabulary.language.mozarabic=Mozarabic -controlledvocabulary.language.mpade=Mpade -controlledvocabulary.language.mpalitjanh=Mpalitjanh -controlledvocabulary.language.mpi=Mpi -controlledvocabulary.language.mpiemo=Mpiemo -controlledvocabulary.language.mpinda=Mpinda -controlledvocabulary.language.mpoto=Mpoto -controlledvocabulary.language.mpotovoro=Mpotovoro -controlledvocabulary.language.mpumpong=Mpumpong -controlledvocabulary.language.mpuono=Mpuono -controlledvocabulary.language.mpur=Mpur -controlledvocabulary.language.mro-khimi_chin=Mro-Khimi Chin -controlledvocabulary.language.mru=Mru -controlledvocabulary.language.mser=Mser -controlledvocabulary.language.mt._iraya_agta=Mt. Iraya Agta -controlledvocabulary.language.mt._iriga_agta=Mt. Iriga Agta -controlledvocabulary.language.muak_sa-aak=Muak Sa-aak -controlledvocabulary.language.mualang=Mualang -controlledvocabulary.language.mubami=Mubami -controlledvocabulary.language.mubi=Mubi -controlledvocabulary.language.muda=Muda -controlledvocabulary.language.mudburra=Mudburra -controlledvocabulary.language.mudhili_gadaba=Mudhili Gadaba -controlledvocabulary.language.mudu_koraga=Mudu Koraga -controlledvocabulary.language.muduga=Muduga -controlledvocabulary.language.mufian=Mufian -controlledvocabulary.language.mugom=Mugom -controlledvocabulary.language.muinane=Muinane -controlledvocabulary.language.mukha-dora=Mukha-Dora -controlledvocabulary.language.mukulu=Mukulu -controlledvocabulary.language.mulaha=Mulaha -controlledvocabulary.language.mulam=Mulam -controlledvocabulary.language.mulao=Mulao -controlledvocabulary.language.mulgi=Mulgi -controlledvocabulary.language.mullu_kurumba=Mullu Kurumba -controlledvocabulary.language.multiple_languages=Multiple languages -controlledvocabulary.language.muluridyi=Muluridyi -controlledvocabulary.language.mum=Mum -controlledvocabulary.language.mumuye=Mumuye -controlledvocabulary.language.muna=Muna -controlledvocabulary.language.munda=Munda -controlledvocabulary.language.mundabli=Mundabli -controlledvocabulary.language.mundang=Mundang -controlledvocabulary.language.mundani=Mundani -controlledvocabulary.language.mundari=Mundari -controlledvocabulary.language.mundat=Mundat -controlledvocabulary.language.munduruku=Mundurukú -controlledvocabulary.language.mungaka=Mungaka -controlledvocabulary.language.munggui=Munggui -controlledvocabulary.language.mungkip=Mungkip -controlledvocabulary.language.muniche=Muniche -controlledvocabulary.language.munit=Munit -controlledvocabulary.language.munji=Munji -controlledvocabulary.language.munsee=Munsee -controlledvocabulary.language.muong=Muong -controlledvocabulary.language.mur_pano=Mur Pano -controlledvocabulary.language.muratayak=Muratayak -controlledvocabulary.language.murik_(malaysia)=Murik (Malaysia) -controlledvocabulary.language.murik_(papua_new_guinea)=Murik (Papua New Guinea) -controlledvocabulary.language.murkim=Murkim -controlledvocabulary.language.murle=Murle -controlledvocabulary.language.murrinh-patha=Murrinh-Patha -controlledvocabulary.language.mursi=Mursi -controlledvocabulary.language.murui_huitoto=Murui Huitoto -controlledvocabulary.language.murupi=Murupi -controlledvocabulary.language.muruwari=Muruwari -controlledvocabulary.language.musak=Musak -controlledvocabulary.language.musar=Musar -controlledvocabulary.language.musasa=Musasa -controlledvocabulary.language.musey=Musey -controlledvocabulary.language.musgu=Musgu -controlledvocabulary.language.mushungulu=Mushungulu -controlledvocabulary.language.musi=Musi -controlledvocabulary.language.muskum=Muskum -controlledvocabulary.language.muslim_tat=Muslim Tat -controlledvocabulary.language.musom=Musom -controlledvocabulary.language.mussau-emira=Mussau-Emira -controlledvocabulary.language.muthuvan=Muthuvan -controlledvocabulary.language.mutu=Mutu -controlledvocabulary.language.muyang=Muyang -controlledvocabulary.language.muyuw=Muyuw -controlledvocabulary.language.muzi=Muzi -controlledvocabulary.language.mvanip=Mvanip -controlledvocabulary.language.mvuba=Mvuba -controlledvocabulary.language.mwaghavul=Mwaghavul -controlledvocabulary.language.mwali_comorian=Mwali Comorian -controlledvocabulary.language.mwan=Mwan -controlledvocabulary.language.mwani=Mwani -controlledvocabulary.language.mwatebu=Mwatebu -controlledvocabulary.language.mwera_(chimwera)=Mwera (Chimwera) -controlledvocabulary.language.mwera_(nyasa)=Mwera (Nyasa) -controlledvocabulary.language.mwimbi-muthambi=Mwimbi-Muthambi -controlledvocabulary.language.myanmar_sign_language=Myanmar Sign Language -controlledvocabulary.language.mycenaean_greek=Mycenaean Greek -controlledvocabulary.language.myene=Myene -controlledvocabulary.language.mysian=Mysian -controlledvocabulary.language.mzieme_naga=Mzieme Naga -controlledvocabulary.language.maghdi=Mághdì -controlledvocabulary.language.maku=Máku -controlledvocabulary.language.menik=Ménik -controlledvocabulary.language.miskito=Mískito -controlledvocabulary.language.mocheno=Mócheno -controlledvocabulary.language.mun_chin=Mün Chin -controlledvocabulary.language.mundu=Mündü -controlledvocabulary.language.maharastri_prakrit=Māhārāṣṭri Prākrit -controlledvocabulary.language.maori,_maori=Māori, Maori -controlledvocabulary.language.n'ko=N'Ko -controlledvocabulary.language.na=Na -controlledvocabulary.language.na-kara=Na-kara -controlledvocabulary.language.naaba=Naaba -controlledvocabulary.language.naami=Naami -controlledvocabulary.language.naasioi=Naasioi -controlledvocabulary.language.naba=Naba -controlledvocabulary.language.nabak=Nabak -controlledvocabulary.language.nabi=Nabi -controlledvocabulary.language.nachering=Nachering -controlledvocabulary.language.nadruvian=Nadruvian -controlledvocabulary.language.nadeb=Nadëb -controlledvocabulary.language.nafaanra=Nafaanra -controlledvocabulary.language.nafi=Nafi -controlledvocabulary.language.nafri=Nafri -controlledvocabulary.language.nafusi=Nafusi -controlledvocabulary.language.naga_pidgin=Naga Pidgin -controlledvocabulary.language.nagarchal=Nagarchal -controlledvocabulary.language.nage=Nage -controlledvocabulary.language.nagumi=Nagumi -controlledvocabulary.language.nahali=Nahali -controlledvocabulary.language.nahari=Nahari -controlledvocabulary.language.nai=Nai -controlledvocabulary.language.najdi_arabic=Najdi Arabic -controlledvocabulary.language.naka'ela=Naka'ela -controlledvocabulary.language.nakai=Nakai -controlledvocabulary.language.nakame=Nakame -controlledvocabulary.language.nakanai=Nakanai -controlledvocabulary.language.nake=Nake -controlledvocabulary.language.naki=Naki -controlledvocabulary.language.nakwi=Nakwi -controlledvocabulary.language.nalca=Nalca -controlledvocabulary.language.nali=Nali -controlledvocabulary.language.nalik=Nalik -controlledvocabulary.language.nalu=Nalu -controlledvocabulary.language.naluo_yi=Naluo Yi -controlledvocabulary.language.nalogo=Nalögo -controlledvocabulary.language.nama_(papua_new_guinea)=Nama (Papua New Guinea) -controlledvocabulary.language.namakura=Namakura -controlledvocabulary.language.namat=Namat -controlledvocabulary.language.nambo=Nambo -controlledvocabulary.language.nambya=Nambya -controlledvocabulary.language.namia=Namia -controlledvocabulary.language.namiae=Namiae -controlledvocabulary.language.namibian_sign_language=Namibian Sign Language -controlledvocabulary.language.namla=Namla -controlledvocabulary.language.namo=Namo -controlledvocabulary.language.namonuito=Namonuito -controlledvocabulary.language.namosi-naitasiri-serua=Namosi-Naitasiri-Serua -controlledvocabulary.language.namuyi=Namuyi -controlledvocabulary.language.nanai=Nanai -controlledvocabulary.language.nancere=Nancere -controlledvocabulary.language.nande=Nande -controlledvocabulary.language.nandi=Nandi -controlledvocabulary.language.nanerige_senoufo=Nanerigé Sénoufo -controlledvocabulary.language.nanga_dama_dogon=Nanga Dama Dogon -controlledvocabulary.language.nankina=Nankina -controlledvocabulary.language.nanti=Nanti -controlledvocabulary.language.nanticoke=Nanticoke -controlledvocabulary.language.nanubae=Nanubae -controlledvocabulary.language.napo_lowland_quechua=Napo Lowland Quechua -controlledvocabulary.language.napu=Napu -controlledvocabulary.language.nar_phu=Nar Phu -controlledvocabulary.language.nara=Nara -controlledvocabulary.language.narak=Narak -controlledvocabulary.language.narango=Narango -controlledvocabulary.language.nari_nari=Nari Nari -controlledvocabulary.language.naro=Naro -controlledvocabulary.language.narom=Narom -controlledvocabulary.language.narragansett=Narragansett -controlledvocabulary.language.narua=Narua -controlledvocabulary.language.narungga=Narungga -controlledvocabulary.language.nasal=Nasal -controlledvocabulary.language.nasarian=Nasarian -controlledvocabulary.language.naskapi=Naskapi -controlledvocabulary.language.natanzi=Natanzi -controlledvocabulary.language.natchez=Natchez -controlledvocabulary.language.nateni=Nateni -controlledvocabulary.language.nathembo=Nathembo -controlledvocabulary.language.natioro=Natioro -controlledvocabulary.language.natugu=Natügu -controlledvocabulary.language.nauete=Nauete -controlledvocabulary.language.naukan_yupik=Naukan Yupik -controlledvocabulary.language.nauna=Nauna -controlledvocabulary.language.nauo=Nauo -controlledvocabulary.language.nauru=Nauru -controlledvocabulary.language.navajo,_navaho=Navajo, Navaho -controlledvocabulary.language.navut=Navut -controlledvocabulary.language.nawaru=Nawaru -controlledvocabulary.language.nawathinehena=Nawathinehena -controlledvocabulary.language.nawdm=Nawdm -controlledvocabulary.language.nawuri=Nawuri -controlledvocabulary.language.naxi=Naxi -controlledvocabulary.language.nayi=Nayi -controlledvocabulary.language.nayini=Nayini -controlledvocabulary.language.ncane=Ncane -controlledvocabulary.language.nchumbulu=Nchumbulu -controlledvocabulary.language.nda'nda'=Nda'nda' -controlledvocabulary.language.ndai=Ndai -controlledvocabulary.language.ndaka=Ndaka -controlledvocabulary.language.ndali=Ndali -controlledvocabulary.language.ndam=Ndam -controlledvocabulary.language.ndamba=Ndamba -controlledvocabulary.language.ndambomo=Ndambomo -controlledvocabulary.language.ndasa=Ndasa -controlledvocabulary.language.ndau=Ndau -controlledvocabulary.language.nde-gbite=Nde-Gbite -controlledvocabulary.language.nde-nsele-nta=Nde-Nsele-Nta -controlledvocabulary.language.ndemli=Ndemli -controlledvocabulary.language.ndendeule=Ndendeule -controlledvocabulary.language.ndengereko=Ndengereko -controlledvocabulary.language.nding=Nding -controlledvocabulary.language.ndo=Ndo -controlledvocabulary.language.ndobo=Ndobo -controlledvocabulary.language.ndoe=Ndoe -controlledvocabulary.language.ndogo=Ndogo -controlledvocabulary.language.ndolo=Ndolo -controlledvocabulary.language.ndom=Ndom -controlledvocabulary.language.ndombe=Ndombe -controlledvocabulary.language.ndonde_hamba=Ndonde Hamba -controlledvocabulary.language.ndonga=Ndonga -controlledvocabulary.language.ndoola=Ndoola -controlledvocabulary.language.ndra'ngith=Ndra'ngith -controlledvocabulary.language.ndrulo=Ndrulo -controlledvocabulary.language.nduga=Nduga -controlledvocabulary.language.ndumu=Ndumu -controlledvocabulary.language.ndunda=Ndunda -controlledvocabulary.language.ndunga=Ndunga -controlledvocabulary.language.ndut=Ndut -controlledvocabulary.language.ndwewe=Ndwewe -controlledvocabulary.language.ndyuka-trio_pidgin=Ndyuka-Trio Pidgin -controlledvocabulary.language.ndzwani_comorian=Ndzwani Comorian -controlledvocabulary.language.neapolitan=Neapolitan -controlledvocabulary.language.nedebang=Nedebang -controlledvocabulary.language.nefamese=Nefamese -controlledvocabulary.language.negerhollands=Negerhollands -controlledvocabulary.language.negeri_sembilan_malay=Negeri Sembilan Malay -controlledvocabulary.language.negidal=Negidal -controlledvocabulary.language.nehan=Nehan -controlledvocabulary.language.nek=Nek -controlledvocabulary.language.nekgini=Nekgini -controlledvocabulary.language.neko=Neko -controlledvocabulary.language.neku=Neku -controlledvocabulary.language.nema=Nema -controlledvocabulary.language.neme=Neme -controlledvocabulary.language.nemi=Nemi -controlledvocabulary.language.nen=Nen -controlledvocabulary.language.nend=Nend -controlledvocabulary.language.nenets=Nenets -controlledvocabulary.language.nengone=Nengone -controlledvocabulary.language.neo=Neo -controlledvocabulary.language.neo-hittite=Neo-Hittite -controlledvocabulary.language.nepalese_sign_language=Nepalese Sign Language -controlledvocabulary.language.nepali_(individual_language)=Nepali (individual language) -controlledvocabulary.language.nepali_(macrolanguage),_nepali=Nepali (macrolanguage), Nepali -controlledvocabulary.language.nete=Nete -controlledvocabulary.language.new_caledonian_javanese=New Caledonian Javanese -controlledvocabulary.language.new_zealand_sign_language=New Zealand Sign Language -controlledvocabulary.language.newari=Newari -controlledvocabulary.language.neyo=Neyo -controlledvocabulary.language.nez_perce=Nez Perce -controlledvocabulary.language.ngaanyatjarra=Ngaanyatjarra -controlledvocabulary.language.ngad'a=Ngad'a -controlledvocabulary.language.ngadjunmaya=Ngadjunmaya -controlledvocabulary.language.ngadjuri=Ngadjuri -controlledvocabulary.language.ngaing=Ngaing -controlledvocabulary.language.ngaju=Ngaju -controlledvocabulary.language.ngala=Ngala -controlledvocabulary.language.ngalakgan=Ngalakgan -controlledvocabulary.language.ngalum=Ngalum -controlledvocabulary.language.ngam=Ngam -controlledvocabulary.language.ngamambo=Ngamambo -controlledvocabulary.language.ngambay=Ngambay -controlledvocabulary.language.ngamini=Ngamini -controlledvocabulary.language.ngamo=Ngamo -controlledvocabulary.language.ngan'gityemerri=Ngan'gityemerri -controlledvocabulary.language.nganakarti=Nganakarti -controlledvocabulary.language.nganasan=Nganasan -controlledvocabulary.language.ngandi=Ngandi -controlledvocabulary.language.ngando_(central_african_republic)=Ngando (Central African Republic) -controlledvocabulary.language.ngando_(democratic_republic_of_congo)=Ngando (Democratic Republic of Congo) -controlledvocabulary.language.ngandyera=Ngandyera -controlledvocabulary.language.ngangam=Ngangam -controlledvocabulary.language.ngantangarra=Ngantangarra -controlledvocabulary.language.nganyaywana=Nganyaywana -controlledvocabulary.language.ngardi=Ngardi -controlledvocabulary.language.ngarigu=Ngarigu -controlledvocabulary.language.ngarinyin=Ngarinyin -controlledvocabulary.language.ngarinyman=Ngarinyman -controlledvocabulary.language.ngarla=Ngarla -controlledvocabulary.language.ngarluma=Ngarluma -controlledvocabulary.language.ngarrindjeri=Ngarrindjeri -controlledvocabulary.language.ngas=Ngas -controlledvocabulary.language.ngasa=Ngasa -controlledvocabulary.language.ngatik_men's_creole=Ngatik Men's Creole -controlledvocabulary.language.ngawn_chin=Ngawn Chin -controlledvocabulary.language.ngawun=Ngawun -controlledvocabulary.language.ngayawung=Ngayawung -controlledvocabulary.language.ngazidja_comorian=Ngazidja Comorian -controlledvocabulary.language.ngbaka=Ngbaka -controlledvocabulary.language.ngbaka_ma'bo=Ngbaka Ma'bo -controlledvocabulary.language.ngbaka_manza=Ngbaka Manza -controlledvocabulary.language.ngbee=Ngbee -controlledvocabulary.language.ngbinda=Ngbinda -controlledvocabulary.language.ngbundu=Ngbundu -controlledvocabulary.language.ngelima=Ngelima -controlledvocabulary.language.ngemba=Ngemba -controlledvocabulary.language.ngen=Ngen -controlledvocabulary.language.ngendelengo=Ngendelengo -controlledvocabulary.language.ngete=Ngete -controlledvocabulary.language.nggem=Nggem -controlledvocabulary.language.nggwahyi=Nggwahyi -controlledvocabulary.language.ngie=Ngie -controlledvocabulary.language.ngiemboon=Ngiemboon -controlledvocabulary.language.ngile=Ngile -controlledvocabulary.language.ngindo=Ngindo -controlledvocabulary.language.ngiti=Ngiti -controlledvocabulary.language.ngizim=Ngizim -controlledvocabulary.language.ngkalmpw_kanum=Ngkâlmpw Kanum -controlledvocabulary.language.ngom=Ngom -controlledvocabulary.language.ngomba=Ngomba -controlledvocabulary.language.ngombale=Ngombale -controlledvocabulary.language.ngombe_(central_african_republic)=Ngombe (Central African Republic) -controlledvocabulary.language.ngombe_(democratic_republic_of_congo)=Ngombe (Democratic Republic of Congo) -controlledvocabulary.language.ngongo=Ngongo -controlledvocabulary.language.ngoni_(mozambique)=Ngoni (Mozambique) -controlledvocabulary.language.ngoni_(tanzania)=Ngoni (Tanzania) -controlledvocabulary.language.ngoshie=Ngoshie -controlledvocabulary.language.ngul=Ngul -controlledvocabulary.language.ngulu=Ngulu -controlledvocabulary.language.nguluwan=Nguluwan -controlledvocabulary.language.ngumbarl=Ngumbarl -controlledvocabulary.language.ngumbi=Ngumbi -controlledvocabulary.language.ngunawal=Ngunawal -controlledvocabulary.language.ngundi=Ngundi -controlledvocabulary.language.ngundu=Ngundu -controlledvocabulary.language.ngungwel=Ngungwel -controlledvocabulary.language.ngurimi=Ngurimi -controlledvocabulary.language.ngurmbur=Ngurmbur -controlledvocabulary.language.nguon=Nguôn -controlledvocabulary.language.ngwaba=Ngwaba -controlledvocabulary.language.ngwe=Ngwe -controlledvocabulary.language.ngwo=Ngwo -controlledvocabulary.language.ngabere=Ngäbere -controlledvocabulary.language.nhanda=Nhanda -controlledvocabulary.language.nhengatu=Nhengatu -controlledvocabulary.language.nhirrpi=Nhirrpi -controlledvocabulary.language.nhuwala=Nhuwala -controlledvocabulary.language.nias=Nias -controlledvocabulary.language.nicaragua_creole_english=Nicaragua Creole English -controlledvocabulary.language.nicaraguan_sign_language=Nicaraguan Sign Language -controlledvocabulary.language.niellim=Niellim -controlledvocabulary.language.nigeria_mambila=Nigeria Mambila -controlledvocabulary.language.nigerian_fulfulde=Nigerian Fulfulde -controlledvocabulary.language.nigerian_pidgin=Nigerian Pidgin -controlledvocabulary.language.nigerian_sign_language=Nigerian Sign Language -controlledvocabulary.language.nihali=Nihali -controlledvocabulary.language.nii=Nii -controlledvocabulary.language.niksek=Niksek -controlledvocabulary.language.nila=Nila -controlledvocabulary.language.nilamba=Nilamba -controlledvocabulary.language.nimadi=Nimadi -controlledvocabulary.language.nimanbur=Nimanbur -controlledvocabulary.language.nimbari=Nimbari -controlledvocabulary.language.nimboran=Nimboran -controlledvocabulary.language.nimi=Nimi -controlledvocabulary.language.nimo=Nimo -controlledvocabulary.language.nimoa=Nimoa -controlledvocabulary.language.ninam=Ninam -controlledvocabulary.language.nindi=Nindi -controlledvocabulary.language.ningera=Ningera -controlledvocabulary.language.ninggerum=Ninggerum -controlledvocabulary.language.ningil=Ningil -controlledvocabulary.language.ninia_yali=Ninia Yali -controlledvocabulary.language.ninzo=Ninzo -controlledvocabulary.language.nipsan=Nipsan -controlledvocabulary.language.nisa=Nisa -controlledvocabulary.language.nisenan=Nisenan -controlledvocabulary.language.nisga'a=Nisga'a -controlledvocabulary.language.nisi_(china)=Nisi (China) -controlledvocabulary.language.niuafo'ou=Niuafo'ou -controlledvocabulary.language.niuatoputapu=Niuatoputapu -controlledvocabulary.language.niuean=Niuean -controlledvocabulary.language.nivacle=Nivaclé -controlledvocabulary.language.niwer_mil=Niwer Mil -controlledvocabulary.language.njalgulgule=Njalgulgule -controlledvocabulary.language.njebi=Njebi -controlledvocabulary.language.njen=Njen -controlledvocabulary.language.njerep=Njerep -controlledvocabulary.language.njyem=Njyem -controlledvocabulary.language.nkami=Nkami -controlledvocabulary.language.nkangala=Nkangala -controlledvocabulary.language.nkari=Nkari -controlledvocabulary.language.nkem-nkum=Nkem-Nkum -controlledvocabulary.language.nkhumbi=Nkhumbi -controlledvocabulary.language.nkongho=Nkongho -controlledvocabulary.language.nkonya=Nkonya -controlledvocabulary.language.nkoroo=Nkoroo -controlledvocabulary.language.nkoya=Nkoya -controlledvocabulary.language.nkukoli=Nkukoli -controlledvocabulary.language.nkutu=Nkutu -controlledvocabulary.language.nnam=Nnam -controlledvocabulary.language.no_linguistic_content=No linguistic content -controlledvocabulary.language.nobiin=Nobiin -controlledvocabulary.language.nobonob=Nobonob -controlledvocabulary.language.nocte_naga=Nocte Naga -controlledvocabulary.language.nogai=Nogai -controlledvocabulary.language.noipx=Noipx -controlledvocabulary.language.noiri=Noiri -controlledvocabulary.language.nokuku=Nokuku -controlledvocabulary.language.nomaande=Nomaande -controlledvocabulary.language.nomane=Nomane -controlledvocabulary.language.nomatsiguenga=Nomatsiguenga -controlledvocabulary.language.nomlaki=Nomlaki -controlledvocabulary.language.nomu=Nomu -controlledvocabulary.language.nong_zhuang=Nong Zhuang -controlledvocabulary.language.nonuya=Nonuya -controlledvocabulary.language.nooksack=Nooksack -controlledvocabulary.language.noon=Noon -controlledvocabulary.language.noone=Noone -controlledvocabulary.language.nopala_chatino=Nopala Chatino -controlledvocabulary.language.noric=Noric -controlledvocabulary.language.norn=Norn -controlledvocabulary.language.norra=Norra -controlledvocabulary.language.north_alaskan_inupiatun=North Alaskan Inupiatun -controlledvocabulary.language.north_ambrym=North Ambrym -controlledvocabulary.language.north_asmat=North Asmat -controlledvocabulary.language.north_awyu=North Awyu -controlledvocabulary.language.north_azerbaijani=North Azerbaijani -controlledvocabulary.language.north_babar=North Babar -controlledvocabulary.language.north_bolivian_quechua=North Bolivian Quechua -controlledvocabulary.language.north_central_mixe=North Central Mixe -controlledvocabulary.language.north_efate=North Efate -controlledvocabulary.language.north_fali=North Fali -controlledvocabulary.language.north_giziga=North Giziga -controlledvocabulary.language.north_junin_quechua=North Junín Quechua -controlledvocabulary.language.north_marquesan=North Marquesan -controlledvocabulary.language.north_mesopotamian_arabic=North Mesopotamian Arabic -controlledvocabulary.language.north_midlands_tasmanian=North Midlands Tasmanian -controlledvocabulary.language.north_mofu=North Mofu -controlledvocabulary.language.north_moluccan_malay=North Moluccan Malay -controlledvocabulary.language.north_muyu=North Muyu -controlledvocabulary.language.north_nuaulu=North Nuaulu -controlledvocabulary.language.north_picene=North Picene -controlledvocabulary.language.north_slavey=North Slavey -controlledvocabulary.language.north_tairora=North Tairora -controlledvocabulary.language.north_tanna=North Tanna -controlledvocabulary.language.north_wahgi=North Wahgi -controlledvocabulary.language.north_watut=North Watut -controlledvocabulary.language.northeast_kiwai=Northeast Kiwai -controlledvocabulary.language.northeast_maidu=Northeast Maidu -controlledvocabulary.language.northeast_pashai=Northeast Pashai -controlledvocabulary.language.northeastern_dinka=Northeastern Dinka -controlledvocabulary.language.northeastern_pomo=Northeastern Pomo -controlledvocabulary.language.northeastern_tasmanian=Northeastern Tasmanian -controlledvocabulary.language.northeastern_thai=Northeastern Thai -controlledvocabulary.language.northern_alta=Northern Alta -controlledvocabulary.language.northern_altai=Northern Altai -controlledvocabulary.language.northern_amami-oshima=Northern Amami-Oshima -controlledvocabulary.language.northern_betsimisaraka_malagasy=Northern Betsimisaraka Malagasy -controlledvocabulary.language.northern_binukidnon=Northern Binukidnon -controlledvocabulary.language.northern_bobo_madare=Northern Bobo Madaré -controlledvocabulary.language.northern_bontok=Northern Bontok -controlledvocabulary.language.northern_catanduanes_bikol=Northern Catanduanes Bikol -controlledvocabulary.language.northern_conchucos_ancash_quechua=Northern Conchucos Ancash Quechua -controlledvocabulary.language.northern_dagara=Northern Dagara -controlledvocabulary.language.northern_dong=Northern Dong -controlledvocabulary.language.northern_east_cree=Northern East Cree -controlledvocabulary.language.northern_embera=Northern Emberá -controlledvocabulary.language.northern_frisian=Northern Frisian -controlledvocabulary.language.northern_ghale=Northern Ghale -controlledvocabulary.language.northern_gondi=Northern Gondi -controlledvocabulary.language.northern_grebo=Northern Grebo -controlledvocabulary.language.northern_guiyang_hmong=Northern Guiyang Hmong -controlledvocabulary.language.northern_haida=Northern Haida -controlledvocabulary.language.northern_hindko=Northern Hindko -controlledvocabulary.language.northern_huishui_hmong=Northern Huishui Hmong -controlledvocabulary.language.northern_kalapuya=Northern Kalapuya -controlledvocabulary.language.northern_kankanay=Northern Kankanay -controlledvocabulary.language.northern_katang=Northern Katang -controlledvocabulary.language.northern_khmer=Northern Khmer -controlledvocabulary.language.northern_kissi=Northern Kissi -controlledvocabulary.language.northern_kurdish=Northern Kurdish -controlledvocabulary.language.northern_luri=Northern Luri -controlledvocabulary.language.northern_mashan_hmong=Northern Mashan Hmong -controlledvocabulary.language.northern_muji=Northern Muji -controlledvocabulary.language.northern_nago=Northern Nago -controlledvocabulary.language.northern_ndebele,_north_ndebele=Northern Ndebele, North Ndebele -controlledvocabulary.language.northern_ngbandi=Northern Ngbandi -controlledvocabulary.language.northern_nisu=Northern Nisu -controlledvocabulary.language.northern_nuni=Northern Nuni -controlledvocabulary.language.northern_oaxaca_nahuatl=Northern Oaxaca Nahuatl -controlledvocabulary.language.northern_ohlone=Northern Ohlone -controlledvocabulary.language.northern_one=Northern One -controlledvocabulary.language.northern_paiute=Northern Paiute -controlledvocabulary.language.northern_pame=Northern Pame -controlledvocabulary.language.northern_pashto=Northern Pashto -controlledvocabulary.language.northern_pastaza_quichua=Northern Pastaza Quichua -controlledvocabulary.language.northern_ping_chinese=Northern Ping Chinese -controlledvocabulary.language.northern_pomo=Northern Pomo -controlledvocabulary.language.northern_puebla_nahuatl=Northern Puebla Nahuatl -controlledvocabulary.language.northern_pumi=Northern Pumi -controlledvocabulary.language.northern_qiandong_miao=Northern Qiandong Miao -controlledvocabulary.language.northern_qiang=Northern Qiang -controlledvocabulary.language.northern_rengma_naga=Northern Rengma Naga -controlledvocabulary.language.northern_roglai=Northern Roglai -controlledvocabulary.language.northern_sami=Northern Sami -controlledvocabulary.language.northern_sierra_miwok=Northern Sierra Miwok -controlledvocabulary.language.northern_sorsoganon=Northern Sorsoganon -controlledvocabulary.language.northern_subanen=Northern Subanen -controlledvocabulary.language.northern_tarahumara=Northern Tarahumara -controlledvocabulary.language.northern_tasmanian=Northern Tasmanian -controlledvocabulary.language.northern_tepehuan=Northern Tepehuan -controlledvocabulary.language.northern_thai=Northern Thai -controlledvocabulary.language.northern_tidung=Northern Tidung -controlledvocabulary.language.northern_tiwa=Northern Tiwa -controlledvocabulary.language.northern_tlaxiaco_mixtec=Northern Tlaxiaco Mixtec -controlledvocabulary.language.northern_toussian=Northern Toussian -controlledvocabulary.language.northern_tujia=Northern Tujia -controlledvocabulary.language.northern_tutchone=Northern Tutchone -controlledvocabulary.language.northern_uzbek=Northern Uzbek -controlledvocabulary.language.northern_yukaghir=Northern Yukaghir -controlledvocabulary.language.northwest_alaska_inupiatun=Northwest Alaska Inupiatun -controlledvocabulary.language.northwest_gbaya=Northwest Gbaya -controlledvocabulary.language.northwest_maidu=Northwest Maidu -controlledvocabulary.language.northwest_oaxaca_mixtec=Northwest Oaxaca Mixtec -controlledvocabulary.language.northwest_pashai=Northwest Pashai -controlledvocabulary.language.northwestern_dinka=Northwestern Dinka -controlledvocabulary.language.northwestern_fars=Northwestern Fars -controlledvocabulary.language.northwestern_kolami=Northwestern Kolami -controlledvocabulary.language.northwestern_nisu=Northwestern Nisu -controlledvocabulary.language.northwestern_ojibwa=Northwestern Ojibwa -controlledvocabulary.language.northwestern_tasmanian=Northwestern Tasmanian -controlledvocabulary.language.norwegian=Norwegian -controlledvocabulary.language.norwegian_bokmal=Norwegian Bokmål -controlledvocabulary.language.norwegian_nynorsk=Norwegian Nynorsk -controlledvocabulary.language.norwegian_sign_language=Norwegian Sign Language -controlledvocabulary.language.notre=Notre -controlledvocabulary.language.notsi=Notsi -controlledvocabulary.language.nottoway=Nottoway -controlledvocabulary.language.nottoway-meherrin=Nottoway-Meherrin -controlledvocabulary.language.novial=Novial -controlledvocabulary.language.noy=Noy -controlledvocabulary.language.nsenga=Nsenga -controlledvocabulary.language.nshi=Nshi -controlledvocabulary.language.nsongo=Nsongo -controlledvocabulary.language.ntcham=Ntcham -controlledvocabulary.language.nteng=Nteng -controlledvocabulary.language.ntomba=Ntomba -controlledvocabulary.language.nubaca=Nubaca -controlledvocabulary.language.nubi=Nubi -controlledvocabulary.language.nubri=Nubri -controlledvocabulary.language.nuer=Nuer -controlledvocabulary.language.nugunu_(australia)=Nugunu (Australia) -controlledvocabulary.language.nugunu_(cameroon)=Nugunu (Cameroon) -controlledvocabulary.language.nuk=Nuk -controlledvocabulary.language.nukak_maku=Nukak Makú -controlledvocabulary.language.nukna=Nukna -controlledvocabulary.language.nukuini=Nukuini -controlledvocabulary.language.nukumanu=Nukumanu -controlledvocabulary.language.nukunul=Nukunul -controlledvocabulary.language.nukuoro=Nukuoro -controlledvocabulary.language.nukuria=Nukuria -controlledvocabulary.language.numana=Numana -controlledvocabulary.language.numanggang=Numanggang -controlledvocabulary.language.numbami=Numbami -controlledvocabulary.language.nume=Nume -controlledvocabulary.language.numidian=Numidian -controlledvocabulary.language.numee=Numèè -controlledvocabulary.language.nung_(viet_nam)=Nung (Viet Nam) -controlledvocabulary.language.nungali=Nungali -controlledvocabulary.language.nunggubuyu=Nunggubuyu -controlledvocabulary.language.nungu=Nungu -controlledvocabulary.language.nupbikha=Nupbikha -controlledvocabulary.language.nupe-nupe-tako=Nupe-Nupe-Tako -controlledvocabulary.language.nusa_laut=Nusa Laut -controlledvocabulary.language.nusu=Nusu -controlledvocabulary.language.nuu-chah-nulth=Nuu-chah-nulth -controlledvocabulary.language.nyabwa=Nyabwa -controlledvocabulary.language.nyaheun=Nyaheun -controlledvocabulary.language.nyahkur=Nyahkur -controlledvocabulary.language.nyakyusa-ngonde=Nyakyusa-Ngonde -controlledvocabulary.language.nyali=Nyali -controlledvocabulary.language.nyam=Nyam -controlledvocabulary.language.nyamal=Nyamal -controlledvocabulary.language.nyambo=Nyambo -controlledvocabulary.language.nyamusa-molo=Nyamusa-Molo -controlledvocabulary.language.nyamwanga=Nyamwanga -controlledvocabulary.language.nyamwezi=Nyamwezi -controlledvocabulary.language.nyaneka=Nyaneka -controlledvocabulary.language.nyang'i=Nyang'i -controlledvocabulary.language.nyanga=Nyanga -controlledvocabulary.language.nyanga-li=Nyanga-li -controlledvocabulary.language.nyangatom=Nyangatom -controlledvocabulary.language.nyangbo=Nyangbo -controlledvocabulary.language.nyangga=Nyangga -controlledvocabulary.language.nyangumarta=Nyangumarta -controlledvocabulary.language.nyankole=Nyankole -controlledvocabulary.language.nyankpa=Nyankpa -controlledvocabulary.language.nyarafolo_senoufo=Nyarafolo Senoufo -controlledvocabulary.language.nyaturu=Nyaturu -controlledvocabulary.language.nyaw=Nyaw -controlledvocabulary.language.nyawaygi=Nyawaygi -controlledvocabulary.language.nyemba=Nyemba -controlledvocabulary.language.nyengo=Nyengo -controlledvocabulary.language.nyenkha=Nyenkha -controlledvocabulary.language.nyeu=Nyeu -controlledvocabulary.language.nyiha_(malawi)=Nyiha (Malawi) -controlledvocabulary.language.nyiha_(tanzania)=Nyiha (Tanzania) -controlledvocabulary.language.nyika_(malawi_and_zambia)=Nyika (Malawi and Zambia) -controlledvocabulary.language.nyika_(tanzania)=Nyika (Tanzania) -controlledvocabulary.language.nyikina=Nyikina -controlledvocabulary.language.nyindrou=Nyindrou -controlledvocabulary.language.nyindu=Nyindu -controlledvocabulary.language.nyishi=Nyishi -controlledvocabulary.language.nyiyaparli=Nyiyaparli -controlledvocabulary.language.nyokon=Nyokon -controlledvocabulary.language.nyole=Nyole -controlledvocabulary.language.nyong=Nyong -controlledvocabulary.language.nyore=Nyore -controlledvocabulary.language.nyoro=Nyoro -controlledvocabulary.language.nyulnyul=Nyulnyul -controlledvocabulary.language.nyungar=Nyungar -controlledvocabulary.language.nyungwe=Nyungwe -controlledvocabulary.language.nyalayu=Nyâlayu -controlledvocabulary.language.nzadi=Nzadi -controlledvocabulary.language.nzakambay=Nzakambay -controlledvocabulary.language.nzakara=Nzakara -controlledvocabulary.language.nzanyi=Nzanyi -controlledvocabulary.language.nzima=Nzima -controlledvocabulary.language.na-meo=Ná-Meo -controlledvocabulary.language.nelemwa-nixumwak=Nêlêmwa-Nixumwak -controlledvocabulary.language.nupode_huitoto=Nüpode Huitoto -controlledvocabulary.language.nǁng=Nǁng -controlledvocabulary.language.o'chi'chi'=O'chi'chi' -controlledvocabulary.language.o'du=O'du -controlledvocabulary.language.obanliku=Obanliku -controlledvocabulary.language.obispeno=Obispeño -controlledvocabulary.language.oblo=Oblo -controlledvocabulary.language.obo_manobo=Obo Manobo -controlledvocabulary.language.obokuitai=Obokuitai -controlledvocabulary.language.obolo=Obolo -controlledvocabulary.language.obulom=Obulom -controlledvocabulary.language.ocaina=Ocaina -controlledvocabulary.language.occitan_(post_1500),_occitan=Occitan (post 1500), Occitan -controlledvocabulary.language.ocotepec_mixtec=Ocotepec Mixtec -controlledvocabulary.language.ocotlan_zapotec=Ocotlán Zapotec -controlledvocabulary.language.od=Od -controlledvocabulary.language.odia=Odia -controlledvocabulary.language.odiai=Odiai -controlledvocabulary.language.odoodee=Odoodee -controlledvocabulary.language.odual=Odual -controlledvocabulary.language.odut=Odut -controlledvocabulary.language.ofaye=Ofayé -controlledvocabulary.language.official_aramaic_(700-300_bce)=Official Aramaic (700-300 BCE) -controlledvocabulary.language.ofo=Ofo -controlledvocabulary.language.ogbah=Ogbah -controlledvocabulary.language.ogbia=Ogbia -controlledvocabulary.language.ogbogolo=Ogbogolo -controlledvocabulary.language.ogbronuagum=Ogbronuagum -controlledvocabulary.language.ogea=Ogea -controlledvocabulary.language.oirata=Oirata -controlledvocabulary.language.ojibwe,_ojibwa=Ojibwe, Ojibwa -controlledvocabulary.language.ojitlan_chinantec=Ojitlán Chinantec -controlledvocabulary.language.okanagan=Okanagan -controlledvocabulary.language.oki-no-erabu=Oki-No-Erabu -controlledvocabulary.language.okiek=Okiek -controlledvocabulary.language.oko-eni-osayen=Oko-Eni-Osayen -controlledvocabulary.language.oko-juwoi=Oko-Juwoi -controlledvocabulary.language.okobo=Okobo -controlledvocabulary.language.okodia=Okodia -controlledvocabulary.language.okolie=Okolie -controlledvocabulary.language.okolod=Okolod -controlledvocabulary.language.okpamheri=Okpamheri -controlledvocabulary.language.okpe_(northwestern_edo)=Okpe (Northwestern Edo) -controlledvocabulary.language.okpe_(southwestern_edo)=Okpe (Southwestern Edo) -controlledvocabulary.language.oksapmin=Oksapmin -controlledvocabulary.language.oku=Oku -controlledvocabulary.language.old_aramaic_(up_to_700_bce)=Old Aramaic (up to 700 BCE) -controlledvocabulary.language.old_avar=Old Avar -controlledvocabulary.language.old_breton=Old Breton -controlledvocabulary.language.old_burmese=Old Burmese -controlledvocabulary.language.old_cham=Old Cham -controlledvocabulary.language.old_chinese=Old Chinese -controlledvocabulary.language.old_cornish=Old Cornish -controlledvocabulary.language.old_dutch=Old Dutch -controlledvocabulary.language.old_english_(ca._450-1100)=Old English (ca. 450-1100) -controlledvocabulary.language.old_french_(842-ca._1400)=Old French (842-ca. 1400) -controlledvocabulary.language.old_frisian=Old Frisian -controlledvocabulary.language.old_georgian=Old Georgian -controlledvocabulary.language.old_high_german_(ca._750-1050)=Old High German (ca. 750-1050) -controlledvocabulary.language.old_hittite=Old Hittite -controlledvocabulary.language.old_hungarian=Old Hungarian -controlledvocabulary.language.old_irish_(to_900)=Old Irish (to 900) -controlledvocabulary.language.old_japanese=Old Japanese -controlledvocabulary.language.old_kentish_sign_language=Old Kentish Sign Language -controlledvocabulary.language.old_khmer=Old Khmer -controlledvocabulary.language.old_korean_(3rd-9th_cent.)=Old Korean (3rd-9th cent.) -controlledvocabulary.language.old_lithuanian=Old Lithuanian -controlledvocabulary.language.old_malay=Old Malay -controlledvocabulary.language.old_manipuri=Old Manipuri -controlledvocabulary.language.old_marathi=Old Marathi -controlledvocabulary.language.old_mon=Old Mon -controlledvocabulary.language.old_norse=Old Norse -controlledvocabulary.language.old_nubian=Old Nubian -controlledvocabulary.language.old_ossetic=Old Ossetic -controlledvocabulary.language.old_persian_(ca._600-400_b.c.)=Old Persian (ca. 600-400 B.C.) -controlledvocabulary.language.old_provencal_(to_1500)=Old Provençal (to 1500) -controlledvocabulary.language.old_russian=Old Russian -controlledvocabulary.language.old_saxon=Old Saxon -controlledvocabulary.language.old_spanish=Old Spanish -controlledvocabulary.language.old_sundanese=Old Sundanese -controlledvocabulary.language.old_tamil=Old Tamil -controlledvocabulary.language.old_tibetan=Old Tibetan -controlledvocabulary.language.old_turkish=Old Turkish -controlledvocabulary.language.old_uighur=Old Uighur -controlledvocabulary.language.old_welsh=Old Welsh -controlledvocabulary.language.olekha=Olekha -controlledvocabulary.language.olkol=Olkol -controlledvocabulary.language.olo=Olo -controlledvocabulary.language.oloma=Oloma -controlledvocabulary.language.olrat=Olrat -controlledvocabulary.language.olu'bo=Olu'bo -controlledvocabulary.language.olulumo-ikom=Olulumo-Ikom -controlledvocabulary.language.oluta_popoluca=Oluta Popoluca -controlledvocabulary.language.omagua=Omagua -controlledvocabulary.language.omaha-ponca=Omaha-Ponca -controlledvocabulary.language.omani_arabic=Omani Arabic -controlledvocabulary.language.ombamba=Ombamba -controlledvocabulary.language.ombo=Ombo -controlledvocabulary.language.ometepec_nahuatl=Ometepec Nahuatl -controlledvocabulary.language.omi=Omi -controlledvocabulary.language.omok=Omok -controlledvocabulary.language.omotik=Omotik -controlledvocabulary.language.omurano=Omurano -controlledvocabulary.language.ona=Ona -controlledvocabulary.language.oneida=Oneida -controlledvocabulary.language.ong=Ong -controlledvocabulary.language.onin=Onin -controlledvocabulary.language.onin_based_pidgin=Onin Based Pidgin -controlledvocabulary.language.onjob=Onjob -controlledvocabulary.language.ono=Ono -controlledvocabulary.language.onobasulu=Onobasulu -controlledvocabulary.language.onondaga=Onondaga -controlledvocabulary.language.ontenu=Ontenu -controlledvocabulary.language.ontong_java=Ontong Java -controlledvocabulary.language.oorlams=Oorlams -controlledvocabulary.language.opao=Opao -controlledvocabulary.language.opata=Opata -controlledvocabulary.language.orang_kanaq=Orang Kanaq -controlledvocabulary.language.orang_seletar=Orang Seletar -controlledvocabulary.language.oraon_sadri=Oraon Sadri -controlledvocabulary.language.orejon=Orejón -controlledvocabulary.language.oring=Oring -controlledvocabulary.language.oriya,_oriya_(macrolanguage)=Oriya, Oriya (macrolanguage) -controlledvocabulary.language.orizaba_nahuatl=Orizaba Nahuatl -controlledvocabulary.language.orma=Orma -controlledvocabulary.language.ormu=Ormu -controlledvocabulary.language.ormuri=Ormuri -controlledvocabulary.language.oro=Oro -controlledvocabulary.language.oro_win=Oro Win -controlledvocabulary.language.oroch=Oroch -controlledvocabulary.language.oroha=Oroha -controlledvocabulary.language.orok=Orok -controlledvocabulary.language.orokaiva=Orokaiva -controlledvocabulary.language.oroko=Oroko -controlledvocabulary.language.orokolo=Orokolo -controlledvocabulary.language.oromo=Oromo -controlledvocabulary.language.oroqen=Oroqen -controlledvocabulary.language.orowe=Orowe -controlledvocabulary.language.oruma=Oruma -controlledvocabulary.language.orya=Orya -controlledvocabulary.language.osage=Osage -controlledvocabulary.language.osatu=Osatu -controlledvocabulary.language.oscan=Oscan -controlledvocabulary.language.osing=Osing -controlledvocabulary.language.ososo=Ososo -controlledvocabulary.language.ossetian,_ossetic=Ossetian, Ossetic -controlledvocabulary.language.ot_danum=Ot Danum -controlledvocabulary.language.otank=Otank -controlledvocabulary.language.oti=Oti -controlledvocabulary.language.otoro=Otoro -controlledvocabulary.language.ottawa=Ottawa -controlledvocabulary.language.ottoman_turkish_(1500-1928)=Ottoman Turkish (1500-1928) -controlledvocabulary.language.otuho=Otuho -controlledvocabulary.language.otuke=Otuke -controlledvocabulary.language.ouma=Ouma -controlledvocabulary.language.oune=Oune -controlledvocabulary.language.owa=Owa -controlledvocabulary.language.owenia=Owenia -controlledvocabulary.language.owiniga=Owiniga -controlledvocabulary.language.oy=Oy -controlledvocabulary.language.oya'oya=Oya'oya -controlledvocabulary.language.oyda=Oyda -controlledvocabulary.language.oyster_bay_tasmanian=Oyster Bay Tasmanian -controlledvocabulary.language.ozolotepec_zapotec=Ozolotepec Zapotec -controlledvocabulary.language.ozumacin_chinantec=Ozumacín Chinantec -controlledvocabulary.language.pa_di=Pa Di -controlledvocabulary.language.pa'a=Pa'a -controlledvocabulary.language.pa'o_karen=Pa'o Karen -controlledvocabulary.language.pa-hng=Pa-Hng -controlledvocabulary.language.paakantyi=Paakantyi -controlledvocabulary.language.paama=Paama -controlledvocabulary.language.paasaal=Paasaal -controlledvocabulary.language.pacahuara=Pacahuara -controlledvocabulary.language.pacaraos_quechua=Pacaraos Quechua -controlledvocabulary.language.pacific_gulf_yupik=Pacific Gulf Yupik -controlledvocabulary.language.pacoh=Pacoh -controlledvocabulary.language.padoe=Padoe -controlledvocabulary.language.paekche=Paekche -controlledvocabulary.language.paelignian=Paelignian -controlledvocabulary.language.pagi=Pagi -controlledvocabulary.language.pagibete=Pagibete -controlledvocabulary.language.pagu=Pagu -controlledvocabulary.language.pahanan_agta=Pahanan Agta -controlledvocabulary.language.pahari=Pahari -controlledvocabulary.language.pahari-potwari=Pahari-Potwari -controlledvocabulary.language.pahi=Pahi -controlledvocabulary.language.pahlavani=Pahlavani -controlledvocabulary.language.pahlavi=Pahlavi -controlledvocabulary.language.pai_tavytera=Pai Tavytera -controlledvocabulary.language.paici=Paicî -controlledvocabulary.language.paipai=Paipai -controlledvocabulary.language.paite_chin=Paite Chin -controlledvocabulary.language.paiwan=Paiwan -controlledvocabulary.language.pak-tong=Pak-Tong -controlledvocabulary.language.pakanha=Pakanha -controlledvocabulary.language.pakaasnovos=Pakaásnovos -controlledvocabulary.language.pakistan_sign_language=Pakistan Sign Language -controlledvocabulary.language.paku=Paku -controlledvocabulary.language.paku_karen=Paku Karen -controlledvocabulary.language.pal=Pal -controlledvocabulary.language.palaic=Palaic -controlledvocabulary.language.palaka_senoufo=Palaka Senoufo -controlledvocabulary.language.palantla_chinantec=Palantla Chinantec -controlledvocabulary.language.palauan=Palauan -controlledvocabulary.language.paleni=Paleni -controlledvocabulary.language.palenquero=Palenquero -controlledvocabulary.language.palikur=Palikúr -controlledvocabulary.language.paliyan=Paliyan -controlledvocabulary.language.pallanganmiddang=Pallanganmiddang -controlledvocabulary.language.paloor=Paloor -controlledvocabulary.language.palu'e=Palu'e -controlledvocabulary.language.paluan=Paluan -controlledvocabulary.language.palya_bareli=Palya Bareli -controlledvocabulary.language.pam=Pam -controlledvocabulary.language.pambia=Pambia -controlledvocabulary.language.pamona=Pamona -controlledvocabulary.language.pamosu=Pamosu -controlledvocabulary.language.pampanga=Pampanga -controlledvocabulary.language.pamplona_atta=Pamplona Atta -controlledvocabulary.language.pana_(burkina_faso)=Pana (Burkina Faso) -controlledvocabulary.language.pana_(central_african_republic)=Pana (Central African Republic) -controlledvocabulary.language.panamanian_sign_language=Panamanian Sign Language -controlledvocabulary.language.panamint=Panamint -controlledvocabulary.language.panao_huanuco_quechua=Panao Huánuco Quechua -controlledvocabulary.language.panara=Panará -controlledvocabulary.language.panasuan=Panasuan -controlledvocabulary.language.panawa=Panawa -controlledvocabulary.language.pancana=Pancana -controlledvocabulary.language.panchpargania=Panchpargania -controlledvocabulary.language.pande=Pande -controlledvocabulary.language.pangasinan=Pangasinan -controlledvocabulary.language.pangseng=Pangseng -controlledvocabulary.language.pangu=Pangu -controlledvocabulary.language.pangutaran_sama=Pangutaran Sama -controlledvocabulary.language.pangwa=Pangwa -controlledvocabulary.language.pangwali=Pangwali -controlledvocabulary.language.panim=Panim -controlledvocabulary.language.paniya=Paniya -controlledvocabulary.language.panjabi,_punjabi=Panjabi, Punjabi -controlledvocabulary.language.pankarare=Pankararé -controlledvocabulary.language.pankararu=Pankararú -controlledvocabulary.language.pankhu=Pankhu -controlledvocabulary.language.pannei=Pannei -controlledvocabulary.language.pano=Pano -controlledvocabulary.language.panoan_katukina=Panoan Katukína -controlledvocabulary.language.panobo=Panobo -controlledvocabulary.language.panyi_bai=Panyi Bai -controlledvocabulary.language.papantla_totonac=Papantla Totonac -controlledvocabulary.language.papapana=Papapana -controlledvocabulary.language.papar=Papar -controlledvocabulary.language.papasena=Papasena -controlledvocabulary.language.papel=Papel -controlledvocabulary.language.papi=Papi -controlledvocabulary.language.papiamento=Papiamento -controlledvocabulary.language.papora=Papora -controlledvocabulary.language.papua_new_guinean_sign_language=Papua New Guinean Sign Language -controlledvocabulary.language.papuan_malay=Papuan Malay -controlledvocabulary.language.papuma=Papuma -controlledvocabulary.language.parachi=Parachi -controlledvocabulary.language.paraguayan_guarani=Paraguayan Guaraní -controlledvocabulary.language.paraguayan_sign_language=Paraguayan Sign Language -controlledvocabulary.language.parakana=Parakanã -controlledvocabulary.language.paranan=Paranan -controlledvocabulary.language.paranawat=Paranawát -controlledvocabulary.language.paraujano=Paraujano -controlledvocabulary.language.parauk=Parauk -controlledvocabulary.language.parawen=Parawen -controlledvocabulary.language.pardhan=Pardhan -controlledvocabulary.language.pardhi=Pardhi -controlledvocabulary.language.pare=Pare -controlledvocabulary.language.parecis=Parecís -controlledvocabulary.language.parenga=Parenga -controlledvocabulary.language.parkari_koli=Parkari Koli -controlledvocabulary.language.parkwa=Parkwa -controlledvocabulary.language.parsi-dari=Parsi-Dari -controlledvocabulary.language.parthian=Parthian -controlledvocabulary.language.parya=Parya -controlledvocabulary.language.para_arara=Pará Arára -controlledvocabulary.language.para_gaviao=Pará Gavião -controlledvocabulary.language.pashto,_pushto=Pashto, Pushto -controlledvocabulary.language.pasi=Pasi -controlledvocabulary.language.pass_valley_yali=Pass Valley Yali -controlledvocabulary.language.patamona=Patamona -controlledvocabulary.language.patani=Patani -controlledvocabulary.language.pataxo_ha-ha-hae=Pataxó Hã-Ha-Hãe -controlledvocabulary.language.patep=Patep -controlledvocabulary.language.pathiya=Pathiya -controlledvocabulary.language.patpatar=Patpatar -controlledvocabulary.language.pattani=Pattani -controlledvocabulary.language.pattani_malay=Pattani Malay -controlledvocabulary.language.pattapu=Pattapu -controlledvocabulary.language.patwin=Patwin -controlledvocabulary.language.paulohi=Paulohi -controlledvocabulary.language.paumari=Paumarí -controlledvocabulary.language.paunaka=Paunaka -controlledvocabulary.language.pauri_bareli=Pauri Bareli -controlledvocabulary.language.pauserna=Pauserna -controlledvocabulary.language.pawaia=Pawaia -controlledvocabulary.language.pawnee=Pawnee -controlledvocabulary.language.paynamar=Paynamar -controlledvocabulary.language.pazeh=Pazeh -controlledvocabulary.language.pe=Pe -controlledvocabulary.language.pear=Pear -controlledvocabulary.language.pech=Pech -controlledvocabulary.language.pecheneg=Pecheneg -controlledvocabulary.language.pedi=Pedi -controlledvocabulary.language.pei=Pei -controlledvocabulary.language.pekal=Pekal -controlledvocabulary.language.pela=Pela -controlledvocabulary.language.pele-ata=Pele-Ata -controlledvocabulary.language.pelende=Pelende -controlledvocabulary.language.pemon=Pemon -controlledvocabulary.language.penang_sign_language=Penang Sign Language -controlledvocabulary.language.penchal=Penchal -controlledvocabulary.language.pendau=Pendau -controlledvocabulary.language.pengo=Pengo -controlledvocabulary.language.pennsylvania_german=Pennsylvania German -controlledvocabulary.language.penrhyn=Penrhyn -controlledvocabulary.language.pentlatch=Pentlatch -controlledvocabulary.language.perai=Perai -controlledvocabulary.language.peranakan_indonesian=Peranakan Indonesian -controlledvocabulary.language.pere=Pere -controlledvocabulary.language.peripheral_mongolian=Peripheral Mongolian -controlledvocabulary.language.pero=Pero -controlledvocabulary.language.persian,_persian_(farsi)=Persian, Persian (Farsi) -controlledvocabulary.language.peruvian_sign_language=Peruvian Sign Language -controlledvocabulary.language.pesse=Pesse -controlledvocabulary.language.petapa_zapotec=Petapa Zapotec -controlledvocabulary.language.petats=Petats -controlledvocabulary.language.petjo=Petjo -controlledvocabulary.language.penoles_mixtec=Peñoles Mixtec -controlledvocabulary.language.pfaelzisch=Pfaelzisch -controlledvocabulary.language.phai=Phai -controlledvocabulary.language.phake=Phake -controlledvocabulary.language.phala=Phala -controlledvocabulary.language.phalura=Phalura -controlledvocabulary.language.phana'=Phana' -controlledvocabulary.language.phangduwali=Phangduwali -controlledvocabulary.language.phende=Phende -controlledvocabulary.language.philippine_sign_language=Philippine Sign Language -controlledvocabulary.language.phimbi=Phimbi -controlledvocabulary.language.phoenician=Phoenician -controlledvocabulary.language.phola=Phola -controlledvocabulary.language.pholo=Pholo -controlledvocabulary.language.phom_naga=Phom Naga -controlledvocabulary.language.phong-kniang=Phong-Kniang -controlledvocabulary.language.phrae_pwo_karen=Phrae Pwo Karen -controlledvocabulary.language.phrygian=Phrygian -controlledvocabulary.language.phu_thai=Phu Thai -controlledvocabulary.language.phuan=Phuan -controlledvocabulary.language.phudagi=Phudagi -controlledvocabulary.language.phuie=Phuie -controlledvocabulary.language.phukha=Phukha -controlledvocabulary.language.phuma=Phuma -controlledvocabulary.language.phunoi=Phunoi -controlledvocabulary.language.phuong=Phuong -controlledvocabulary.language.phupa=Phupa -controlledvocabulary.language.phupha=Phupha -controlledvocabulary.language.phuza=Phuza -controlledvocabulary.language.piamatsina=Piamatsina -controlledvocabulary.language.piame=Piame -controlledvocabulary.language.piapoco=Piapoco -controlledvocabulary.language.piaroa=Piaroa -controlledvocabulary.language.picard=Picard -controlledvocabulary.language.pichis_asheninka=Pichis Ashéninka -controlledvocabulary.language.pictish=Pictish -controlledvocabulary.language.pidgin_delaware=Pidgin Delaware -controlledvocabulary.language.piemontese=Piemontese -controlledvocabulary.language.pijao=Pijao -controlledvocabulary.language.pije=Pije -controlledvocabulary.language.pijin=Pijin -controlledvocabulary.language.pilaga=Pilagá -controlledvocabulary.language.pileni=Pileni -controlledvocabulary.language.pima_bajo=Pima Bajo -controlledvocabulary.language.pimbwe=Pimbwe -controlledvocabulary.language.pinai-hagahai=Pinai-Hagahai -controlledvocabulary.language.pindiini=Pindiini -controlledvocabulary.language.pingelapese=Pingelapese -controlledvocabulary.language.pinigura=Pinigura -controlledvocabulary.language.pinjarup=Pinjarup -controlledvocabulary.language.pinji=Pinji -controlledvocabulary.language.pinotepa_nacional_mixtec=Pinotepa Nacional Mixtec -controlledvocabulary.language.pintupi-luritja=Pintupi-Luritja -controlledvocabulary.language.pinyin=Pinyin -controlledvocabulary.language.pipil=Pipil -controlledvocabulary.language.piraha=Pirahã -controlledvocabulary.language.piratapuyo=Piratapuyo -controlledvocabulary.language.pirlatapa=Pirlatapa -controlledvocabulary.language.piro=Piro -controlledvocabulary.language.pirriya=Pirriya -controlledvocabulary.language.pisabo=Pisabo -controlledvocabulary.language.pisaflores_tepehua=Pisaflores Tepehua -controlledvocabulary.language.piscataway=Piscataway -controlledvocabulary.language.pisidian=Pisidian -controlledvocabulary.language.pitcairn-norfolk=Pitcairn-Norfolk -controlledvocabulary.language.pite_sami=Pite Sami -controlledvocabulary.language.piti=Piti -controlledvocabulary.language.pitjantjatjara=Pitjantjatjara -controlledvocabulary.language.pitta_pitta=Pitta Pitta -controlledvocabulary.language.piu=Piu -controlledvocabulary.language.piya-kwonci=Piya-Kwonci -controlledvocabulary.language.plains_cree=Plains Cree -controlledvocabulary.language.plains_indian_sign_language=Plains Indian Sign Language -controlledvocabulary.language.plains_miwok=Plains Miwok -controlledvocabulary.language.plapo_krumen=Plapo Krumen -controlledvocabulary.language.plateau_malagasy=Plateau Malagasy -controlledvocabulary.language.plautdietsch=Plautdietsch -controlledvocabulary.language.playero=Playero -controlledvocabulary.language.pnar=Pnar -controlledvocabulary.language.pochuri_naga=Pochuri Naga -controlledvocabulary.language.pochutec=Pochutec -controlledvocabulary.language.podena=Podena -controlledvocabulary.language.pogolo=Pogolo -controlledvocabulary.language.pohnpeian=Pohnpeian -controlledvocabulary.language.pokanga=Pokangá -controlledvocabulary.language.poke=Poke -controlledvocabulary.language.pokomo=Pokomo -controlledvocabulary.language.polabian=Polabian -controlledvocabulary.language.polari=Polari -controlledvocabulary.language.polish=Polish -controlledvocabulary.language.polish_sign_language=Polish Sign Language -controlledvocabulary.language.polonombauk=Polonombauk -controlledvocabulary.language.pom=Pom -controlledvocabulary.language.pomo=Pomo -controlledvocabulary.language.ponam=Ponam -controlledvocabulary.language.ponosakan=Ponosakan -controlledvocabulary.language.pontic=Pontic -controlledvocabulary.language.ponyo-gongwang_naga=Ponyo-Gongwang Naga -controlledvocabulary.language.popti'=Popti' -controlledvocabulary.language.poqomam=Poqomam -controlledvocabulary.language.poqomchi'=Poqomchi' -controlledvocabulary.language.porohanon=Porohanon -controlledvocabulary.language.port_sandwich=Port Sandwich -controlledvocabulary.language.port_sorell_tasmanian=Port Sorell Tasmanian -controlledvocabulary.language.port_vato=Port Vato -controlledvocabulary.language.portuguese=Portuguese -controlledvocabulary.language.portuguese_sign_language=Portuguese Sign Language -controlledvocabulary.language.potawatomi=Potawatomi -controlledvocabulary.language.potiguara=Potiguára -controlledvocabulary.language.pottangi_ollar_gadaba=Pottangi Ollar Gadaba -controlledvocabulary.language.poumei_naga=Poumei Naga -controlledvocabulary.language.pouye=Pouye -controlledvocabulary.language.powari=Powari -controlledvocabulary.language.powhatan=Powhatan -controlledvocabulary.language.poyanawa=Poyanáwa -controlledvocabulary.language.prasuni=Prasuni -controlledvocabulary.language.primitive_irish=Primitive Irish -controlledvocabulary.language.principense=Principense -controlledvocabulary.language.providencia_sign_language=Providencia Sign Language -controlledvocabulary.language.prussian=Prussian -controlledvocabulary.language.psikye=Psikye -controlledvocabulary.language.pu-xian_chinese=Pu-Xian Chinese -controlledvocabulary.language.puare=Puare -controlledvocabulary.language.pudtol_atta=Pudtol Atta -controlledvocabulary.language.puebla_mazatec=Puebla Mazatec -controlledvocabulary.language.puelche=Puelche -controlledvocabulary.language.puerto_rican_sign_language=Puerto Rican Sign Language -controlledvocabulary.language.puimei_naga=Puimei Naga -controlledvocabulary.language.puinave=Puinave -controlledvocabulary.language.pukapuka=Pukapuka -controlledvocabulary.language.pulaar=Pulaar -controlledvocabulary.language.pulabu=Pulabu -controlledvocabulary.language.pular=Pular -controlledvocabulary.language.puluwatese=Puluwatese -controlledvocabulary.language.puma=Puma -controlledvocabulary.language.pumpokol=Pumpokol -controlledvocabulary.language.pume=Pumé -controlledvocabulary.language.punan_aput=Punan Aput -controlledvocabulary.language.punan_bah-biau=Punan Bah-Biau -controlledvocabulary.language.punan_batu_1=Punan Batu 1 -controlledvocabulary.language.punan_merah=Punan Merah -controlledvocabulary.language.punan_merap=Punan Merap -controlledvocabulary.language.punan_tubu=Punan Tubu -controlledvocabulary.language.punic=Punic -controlledvocabulary.language.puno_quechua=Puno Quechua -controlledvocabulary.language.punthamara=Punthamara -controlledvocabulary.language.punu=Punu -controlledvocabulary.language.puoc=Puoc -controlledvocabulary.language.puquina=Puquina -controlledvocabulary.language.puragi=Puragi -controlledvocabulary.language.purari=Purari -controlledvocabulary.language.purepecha=Purepecha -controlledvocabulary.language.puri=Puri -controlledvocabulary.language.purik=Purik -controlledvocabulary.language.purisimeno=Purisimeño -controlledvocabulary.language.puroik=Puroik -controlledvocabulary.language.purubora=Puruborá -controlledvocabulary.language.purum=Purum -controlledvocabulary.language.putai=Putai -controlledvocabulary.language.putoh=Putoh -controlledvocabulary.language.putukwam=Putukwam -controlledvocabulary.language.puyo=Puyo -controlledvocabulary.language.puyo-paekche=Puyo-Paekche -controlledvocabulary.language.puyuma=Puyuma -controlledvocabulary.language.pwaamei=Pwaamei -controlledvocabulary.language.pwapwa=Pwapwâ -controlledvocabulary.language.pwo_eastern_karen=Pwo Eastern Karen -controlledvocabulary.language.pwo_northern_karen=Pwo Northern Karen -controlledvocabulary.language.pwo_western_karen=Pwo Western Karen -controlledvocabulary.language.pyapun=Pyapun -controlledvocabulary.language.pye_krumen=Pye Krumen -controlledvocabulary.language.pyen=Pyen -controlledvocabulary.language.pyu_(myanmar)=Pyu (Myanmar) -controlledvocabulary.language.pyu_(papua_new_guinea)=Pyu (Papua New Guinea) -controlledvocabulary.language.paez=Páez -controlledvocabulary.language.paafang=Pááfang -controlledvocabulary.language.pari=Päri -controlledvocabulary.language.pemono=Pémono -controlledvocabulary.language.peve=Pévé -controlledvocabulary.language.pokoot=Pökoot -controlledvocabulary.language.pali,_pali=Pāli, Pali -controlledvocabulary.language.q'anjob'al=Q'anjob'al -controlledvocabulary.language.qabiao=Qabiao -controlledvocabulary.language.qaqet=Qaqet -controlledvocabulary.language.qashqa'i=Qashqa'i -controlledvocabulary.language.qatabanian=Qatabanian -controlledvocabulary.language.qau=Qau -controlledvocabulary.language.qawasqar=Qawasqar -controlledvocabulary.language.qila_muji=Qila Muji -controlledvocabulary.language.qimant=Qimant -controlledvocabulary.language.qiubei_zhuang=Qiubei Zhuang -controlledvocabulary.language.quapaw=Quapaw -controlledvocabulary.language.quebec_sign_language=Quebec Sign Language -controlledvocabulary.language.quechan=Quechan -controlledvocabulary.language.quechua=Quechua -controlledvocabulary.language.quenya=Quenya -controlledvocabulary.language.queretaro_otomi=Querétaro Otomi -controlledvocabulary.language.quetzaltepec_mixe=Quetzaltepec Mixe -controlledvocabulary.language.queyu=Queyu -controlledvocabulary.language.quiavicuzas_zapotec=Quiavicuzas Zapotec -controlledvocabulary.language.quileute=Quileute -controlledvocabulary.language.quinault=Quinault -controlledvocabulary.language.quinqui=Quinqui -controlledvocabulary.language.quioquitani-quieri_zapotec=Quioquitani-Quierí Zapotec -controlledvocabulary.language.quiotepec_chinantec=Quiotepec Chinantec -controlledvocabulary.language.quiripi=Quiripi -controlledvocabulary.language.rabha=Rabha -controlledvocabulary.language.rade=Rade -controlledvocabulary.language.raetic=Raetic -controlledvocabulary.language.rahambuu=Rahambuu -controlledvocabulary.language.rajah_kabunsuwan_manobo=Rajah Kabunsuwan Manobo -controlledvocabulary.language.rajasthani=Rajasthani -controlledvocabulary.language.rajbanshi=Rajbanshi -controlledvocabulary.language.raji=Raji -controlledvocabulary.language.rajong=Rajong -controlledvocabulary.language.rajput_garasia=Rajput Garasia -controlledvocabulary.language.rakahanga-manihiki=Rakahanga-Manihiki -controlledvocabulary.language.rakhine=Rakhine -controlledvocabulary.language.ralte=Ralte -controlledvocabulary.language.rama=Rama -controlledvocabulary.language.ramoaaina=Ramoaaina -controlledvocabulary.language.ramopa=Ramopa -controlledvocabulary.language.rampi=Rampi -controlledvocabulary.language.rana_tharu=Rana Tharu -controlledvocabulary.language.rang=Rang -controlledvocabulary.language.rangi=Rangi -controlledvocabulary.language.rangkas=Rangkas -controlledvocabulary.language.ranglong=Ranglong -controlledvocabulary.language.rangpuri=Rangpuri -controlledvocabulary.language.rao=Rao -controlledvocabulary.language.rapa=Rapa -controlledvocabulary.language.rapanui=Rapanui -controlledvocabulary.language.rapoisi=Rapoisi -controlledvocabulary.language.rapting=Rapting -controlledvocabulary.language.rara_bakati'=Rara Bakati' -controlledvocabulary.language.rarotongan=Rarotongan -controlledvocabulary.language.rasawa=Rasawa -controlledvocabulary.language.ratagnon=Ratagnon -controlledvocabulary.language.ratahan=Ratahan -controlledvocabulary.language.rathawi=Rathawi -controlledvocabulary.language.rathwi_bareli=Rathwi Bareli -controlledvocabulary.language.raute=Raute -controlledvocabulary.language.ravula=Ravula -controlledvocabulary.language.rawa=Rawa -controlledvocabulary.language.rawang=Rawang -controlledvocabulary.language.rawat=Rawat -controlledvocabulary.language.rawngtu_chin=Rawngtu Chin -controlledvocabulary.language.rawo=Rawo -controlledvocabulary.language.rayon_zoque=Rayón Zoque -controlledvocabulary.language.razajerdi=Razajerdi -controlledvocabulary.language.red_gelao=Red Gelao -controlledvocabulary.language.reel=Reel -controlledvocabulary.language.rejang=Rejang -controlledvocabulary.language.rejang_kayan=Rejang Kayan -controlledvocabulary.language.reli=Reli -controlledvocabulary.language.rema=Rema -controlledvocabulary.language.rembarrnga=Rembarrnga -controlledvocabulary.language.rembong=Rembong -controlledvocabulary.language.remo=Remo -controlledvocabulary.language.remontado_dumagat=Remontado Dumagat -controlledvocabulary.language.rempi=Rempi -controlledvocabulary.language.remun=Remun -controlledvocabulary.language.rendille=Rendille -controlledvocabulary.language.rengao=Rengao -controlledvocabulary.language.rennell-bellona=Rennell-Bellona -controlledvocabulary.language.repanbitip=Repanbitip -controlledvocabulary.language.rer_bare=Rer Bare -controlledvocabulary.language.rerau=Rerau -controlledvocabulary.language.rerep=Rerep -controlledvocabulary.language.reshe=Reshe -controlledvocabulary.language.resigaro=Resígaro -controlledvocabulary.language.retta=Retta -controlledvocabulary.language.reyesano=Reyesano -controlledvocabulary.language.riang_(india)=Riang (India) -controlledvocabulary.language.riang_lai=Riang Lai -controlledvocabulary.language.riang_lang=Riang Lang -controlledvocabulary.language.riantana=Riantana -controlledvocabulary.language.ribun=Ribun -controlledvocabulary.language.rigwe=Rigwe -controlledvocabulary.language.rikbaktsa=Rikbaktsa -controlledvocabulary.language.rinconada_bikol=Rinconada Bikol -controlledvocabulary.language.rincon_zapotec=Rincón Zapotec -controlledvocabulary.language.ringgou=Ringgou -controlledvocabulary.language.ririo=Ririo -controlledvocabulary.language.rishiwa=Rishiwa -controlledvocabulary.language.ritharrngu=Ritharrngu -controlledvocabulary.language.riung=Riung -controlledvocabulary.language.riverain_sango=Riverain Sango -controlledvocabulary.language.rmeet=Rmeet -controlledvocabulary.language.rogo=Rogo -controlledvocabulary.language.rohingya=Rohingya -controlledvocabulary.language.roma=Roma -controlledvocabulary.language.romagnol=Romagnol -controlledvocabulary.language.romam=Romam -controlledvocabulary.language.romanian=Romanian -controlledvocabulary.language.romanian_sign_language=Romanian Sign Language -controlledvocabulary.language.romano-greek=Romano-Greek -controlledvocabulary.language.romano-serbian=Romano-Serbian -controlledvocabulary.language.romanova=Romanova -controlledvocabulary.language.romansh=Romansh -controlledvocabulary.language.romany=Romany -controlledvocabulary.language.romblomanon=Romblomanon -controlledvocabulary.language.rombo=Rombo -controlledvocabulary.language.romkun=Romkun -controlledvocabulary.language.ron=Ron -controlledvocabulary.language.ronga=Ronga -controlledvocabulary.language.rongga=Rongga -controlledvocabulary.language.rongmei_naga=Rongmei Naga -controlledvocabulary.language.rongpo=Rongpo -controlledvocabulary.language.ronji=Ronji -controlledvocabulary.language.roon=Roon -controlledvocabulary.language.roria=Roria -controlledvocabulary.language.rotokas=Rotokas -controlledvocabulary.language.rotuman=Rotuman -controlledvocabulary.language.roviana=Roviana -controlledvocabulary.language.ruching_palaung=Ruching Palaung -controlledvocabulary.language.rudbari=Rudbari -controlledvocabulary.language.rufiji=Rufiji -controlledvocabulary.language.ruga=Ruga -controlledvocabulary.language.rukai=Rukai -controlledvocabulary.language.ruma=Ruma -controlledvocabulary.language.rumai_palaung=Rumai Palaung -controlledvocabulary.language.rumu=Rumu -controlledvocabulary.language.rundi,_kirundi=Rundi, Kirundi -controlledvocabulary.language.runga=Runga -controlledvocabulary.language.rungtu_chin=Rungtu Chin -controlledvocabulary.language.rungus=Rungus -controlledvocabulary.language.rungwa=Rungwa -controlledvocabulary.language.russia_buriat=Russia Buriat -controlledvocabulary.language.russian=Russian -controlledvocabulary.language.russian_sign_language=Russian Sign Language -controlledvocabulary.language.rusyn=Rusyn -controlledvocabulary.language.ruthenian=Ruthenian -controlledvocabulary.language.rutul=Rutul -controlledvocabulary.language.ruuli=Ruuli -controlledvocabulary.language.ruund=Ruund -controlledvocabulary.language.ruwila=Ruwila -controlledvocabulary.language.rwa=Rwa -controlledvocabulary.language.rwandan_sign_language=Rwandan Sign Language -controlledvocabulary.language.reunion_creole_french=Réunion Creole French -controlledvocabulary.language.razihi=Rāziḥī -controlledvocabulary.language.s'gaw_karen=S'gaw Karen -controlledvocabulary.language.sa=Sa -controlledvocabulary.language.sa'a=Sa'a -controlledvocabulary.language.sa'ban=Sa'ban -controlledvocabulary.language.sa'och=Sa'och -controlledvocabulary.language.saafi-saafi=Saafi-Saafi -controlledvocabulary.language.saam=Saam -controlledvocabulary.language.saamia=Saamia -controlledvocabulary.language.saaroa=Saaroa -controlledvocabulary.language.saba=Saba -controlledvocabulary.language.sabaean=Sabaean -controlledvocabulary.language.sabah_bisaya=Sabah Bisaya -controlledvocabulary.language.sabah_malay=Sabah Malay -controlledvocabulary.language.sabane=Sabanê -controlledvocabulary.language.sabaot=Sabaot -controlledvocabulary.language.sabine=Sabine -controlledvocabulary.language.sabu=Sabu -controlledvocabulary.language.sabum=Sabüm -controlledvocabulary.language.sacapulteco=Sacapulteco -controlledvocabulary.language.sadri=Sadri -controlledvocabulary.language.saek=Saek -controlledvocabulary.language.saep=Saep -controlledvocabulary.language.safaliba=Safaliba -controlledvocabulary.language.safeyoka=Safeyoka -controlledvocabulary.language.safwa=Safwa -controlledvocabulary.language.sagala=Sagala -controlledvocabulary.language.sagalla=Sagalla -controlledvocabulary.language.saho=Saho -controlledvocabulary.language.sahu=Sahu -controlledvocabulary.language.saidi_arabic=Saidi Arabic -controlledvocabulary.language.saint_lucian_creole_french=Saint Lucian Creole French -controlledvocabulary.language.saisiyat=Saisiyat -controlledvocabulary.language.sajalong=Sajalong -controlledvocabulary.language.sajau_basap=Sajau Basap -controlledvocabulary.language.sakachep=Sakachep -controlledvocabulary.language.sakalava_malagasy=Sakalava Malagasy -controlledvocabulary.language.sakao=Sakao -controlledvocabulary.language.sakata=Sakata -controlledvocabulary.language.sake=Sake -controlledvocabulary.language.sakirabia=Sakirabiá -controlledvocabulary.language.sakizaya=Sakizaya -controlledvocabulary.language.sala=Sala -controlledvocabulary.language.salampasu=Salampasu -controlledvocabulary.language.salar=Salar -controlledvocabulary.language.salas=Salas -controlledvocabulary.language.salasaca_highland_quichua=Salasaca Highland Quichua -controlledvocabulary.language.salawati=Salawati -controlledvocabulary.language.saleman=Saleman -controlledvocabulary.language.saliba=Saliba -controlledvocabulary.language.salinan=Salinan -controlledvocabulary.language.sallands=Sallands -controlledvocabulary.language.salt-yui=Salt-Yui -controlledvocabulary.language.saluan=Saluan -controlledvocabulary.language.saluma=Salumá -controlledvocabulary.language.salvadoran_sign_language=Salvadoran Sign Language -controlledvocabulary.language.sam=Sam -controlledvocabulary.language.samaritan=Samaritan -controlledvocabulary.language.samaritan_aramaic=Samaritan Aramaic -controlledvocabulary.language.samarokena=Samarokena -controlledvocabulary.language.samatao=Samatao -controlledvocabulary.language.samay=Samay -controlledvocabulary.language.samba=Samba -controlledvocabulary.language.samba_daka=Samba Daka -controlledvocabulary.language.samba_leko=Samba Leko -controlledvocabulary.language.sambal=Sambal -controlledvocabulary.language.sambalpuri=Sambalpuri -controlledvocabulary.language.sambe=Sambe -controlledvocabulary.language.samberigi=Samberigi -controlledvocabulary.language.samburu=Samburu -controlledvocabulary.language.samei=Samei -controlledvocabulary.language.samo=Samo -controlledvocabulary.language.samoan=Samoan -controlledvocabulary.language.samogitian=Samogitian -controlledvocabulary.language.samosa=Samosa -controlledvocabulary.language.sampang=Sampang -controlledvocabulary.language.samre=Samre -controlledvocabulary.language.samtao=Samtao -controlledvocabulary.language.samvedi=Samvedi -controlledvocabulary.language.san_agustin_mixtepec_zapotec=San Agustín Mixtepec Zapotec -controlledvocabulary.language.san_baltazar_loxicha_zapotec=San Baltazar Loxicha Zapotec -controlledvocabulary.language.san_blas_kuna=San Blas Kuna -controlledvocabulary.language.san_dionisio_del_mar_huave=San Dionisio Del Mar Huave -controlledvocabulary.language.san_felipe_otlaltepec_popoloca=San Felipe Otlaltepec Popoloca -controlledvocabulary.language.san_francisco_del_mar_huave=San Francisco Del Mar Huave -controlledvocabulary.language.san_francisco_matlatzinca=San Francisco Matlatzinca -controlledvocabulary.language.san_jeronimo_tecoatl_mazatec=San Jerónimo Tecóatl Mazatec -controlledvocabulary.language.san_juan_atzingo_popoloca=San Juan Atzingo Popoloca -controlledvocabulary.language.san_juan_colorado_mixtec=San Juan Colorado Mixtec -controlledvocabulary.language.san_juan_teita_mixtec=San Juan Teita Mixtec -controlledvocabulary.language.san_luis_temalacayuca_popoloca=San Luís Temalacayuca Popoloca -controlledvocabulary.language.san_marcos_tlacoyalco_popoloca=San Marcos Tlacoyalco Popoloca -controlledvocabulary.language.san_martin_itunyoso_triqui=San Martín Itunyoso Triqui -controlledvocabulary.language.san_martin_quechua=San Martín Quechua -controlledvocabulary.language.san_mateo_del_mar_huave=San Mateo Del Mar Huave -controlledvocabulary.language.san_miguel_creole_french=San Miguel Creole French -controlledvocabulary.language.san_miguel_el_grande_mixtec=San Miguel El Grande Mixtec -controlledvocabulary.language.san_miguel_piedras_mixtec=San Miguel Piedras Mixtec -controlledvocabulary.language.san_pedro_amuzgos_amuzgo=San Pedro Amuzgos Amuzgo -controlledvocabulary.language.san_pedro_quiatoni_zapotec=San Pedro Quiatoni Zapotec -controlledvocabulary.language.san_salvador_kongo=San Salvador Kongo -controlledvocabulary.language.san_vicente_coatlan_zapotec=San Vicente Coatlán Zapotec -controlledvocabulary.language.sanaani_arabic=Sanaani Arabic -controlledvocabulary.language.sanapana=Sanapaná -controlledvocabulary.language.sandawe=Sandawe -controlledvocabulary.language.sanga_(democratic_republic_of_congo)=Sanga (Democratic Republic of Congo) -controlledvocabulary.language.sanga_(nigeria)=Sanga (Nigeria) -controlledvocabulary.language.sanggau=Sanggau -controlledvocabulary.language.sangil=Sangil -controlledvocabulary.language.sangir=Sangir -controlledvocabulary.language.sangisari=Sangisari -controlledvocabulary.language.sangkong=Sangkong -controlledvocabulary.language.sanglechi=Sanglechi -controlledvocabulary.language.sango=Sango -controlledvocabulary.language.sangtam_naga=Sangtam Naga -controlledvocabulary.language.sangu_(gabon)=Sangu (Gabon) -controlledvocabulary.language.sangu_(tanzania)=Sangu (Tanzania) -controlledvocabulary.language.sani=Sani -controlledvocabulary.language.sanie=Sanie -controlledvocabulary.language.saniyo-hiyewe=Saniyo-Hiyewe -controlledvocabulary.language.sankaran_maninka=Sankaran Maninka -controlledvocabulary.language.sansi=Sansi -controlledvocabulary.language.sanskrit_(samskrta),_sanskrit=Sanskrit (Saṁskṛta), Sanskrit -controlledvocabulary.language.santa_ana_de_tusi_pasco_quechua=Santa Ana de Tusi Pasco Quechua -controlledvocabulary.language.santa_catarina_albarradas_zapotec=Santa Catarina Albarradas Zapotec -controlledvocabulary.language.santa_ines_ahuatempan_popoloca=Santa Inés Ahuatempan Popoloca -controlledvocabulary.language.santa_ines_yatzechi_zapotec=Santa Inés Yatzechi Zapotec -controlledvocabulary.language.santa_lucia_monteverde_mixtec=Santa Lucía Monteverde Mixtec -controlledvocabulary.language.santa_maria_del_mar_huave=Santa María Del Mar Huave -controlledvocabulary.language.santa_maria_la_alta_nahuatl=Santa María La Alta Nahuatl -controlledvocabulary.language.santa_maria_quiegolani_zapotec=Santa María Quiegolani Zapotec -controlledvocabulary.language.santa_maria_zacatepec_mixtec=Santa María Zacatepec Mixtec -controlledvocabulary.language.santa_teresa_cora=Santa Teresa Cora -controlledvocabulary.language.santali=Santali -controlledvocabulary.language.santiago_xanica_zapotec=Santiago Xanica Zapotec -controlledvocabulary.language.santiago_del_estero_quichua=Santiago del Estero Quichua -controlledvocabulary.language.santo_domingo_albarradas_zapotec=Santo Domingo Albarradas Zapotec -controlledvocabulary.language.sanuma=Sanumá -controlledvocabulary.language.saparua=Saparua -controlledvocabulary.language.sapo=Sapo -controlledvocabulary.language.saponi=Saponi -controlledvocabulary.language.saposa=Saposa -controlledvocabulary.language.sapuan=Sapuan -controlledvocabulary.language.sape=Sapé -controlledvocabulary.language.sar=Sar -controlledvocabulary.language.sara=Sara -controlledvocabulary.language.sara_kaba=Sara Kaba -controlledvocabulary.language.sara_kaba_deme=Sara Kaba Deme -controlledvocabulary.language.sara_kaba_naa=Sara Kaba Náà -controlledvocabulary.language.saraiki=Saraiki -controlledvocabulary.language.saramaccan=Saramaccan -controlledvocabulary.language.sarangani_blaan=Sarangani Blaan -controlledvocabulary.language.sarangani_manobo=Sarangani Manobo -controlledvocabulary.language.sarasira=Sarasira -controlledvocabulary.language.saraveca=Saraveca -controlledvocabulary.language.sardinian=Sardinian -controlledvocabulary.language.sari=Sari -controlledvocabulary.language.sarikoli=Sarikoli -controlledvocabulary.language.sarli=Sarli -controlledvocabulary.language.sarsi=Sarsi -controlledvocabulary.language.sartang=Sartang -controlledvocabulary.language.sarua=Sarua -controlledvocabulary.language.sarudu=Sarudu -controlledvocabulary.language.saruga=Saruga -controlledvocabulary.language.sasak=Sasak -controlledvocabulary.language.sasaru=Sasaru -controlledvocabulary.language.sassarese_sardinian=Sassarese Sardinian -controlledvocabulary.language.satawalese=Satawalese -controlledvocabulary.language.saterfriesisch=Saterfriesisch -controlledvocabulary.language.satere-mawe=Sateré-Mawé -controlledvocabulary.language.saudi_arabian_sign_language=Saudi Arabian Sign Language -controlledvocabulary.language.sauraseni_prakrit=Sauraseni Prākrit -controlledvocabulary.language.saurashtra=Saurashtra -controlledvocabulary.language.sauri=Sauri -controlledvocabulary.language.sauria_paharia=Sauria Paharia -controlledvocabulary.language.sause=Sause -controlledvocabulary.language.sausi=Sausi -controlledvocabulary.language.savi=Savi -controlledvocabulary.language.savosavo=Savosavo -controlledvocabulary.language.sawai=Sawai -controlledvocabulary.language.saweru=Saweru -controlledvocabulary.language.sawi=Sawi -controlledvocabulary.language.sawila=Sawila -controlledvocabulary.language.sawknah=Sawknah -controlledvocabulary.language.saxwe_gbe=Saxwe Gbe -controlledvocabulary.language.saya=Saya -controlledvocabulary.language.sayula_popoluca=Sayula Popoluca -controlledvocabulary.language.scots=Scots -controlledvocabulary.language.scythian=Scythian -controlledvocabulary.language.sea_island_creole_english=Sea Island Creole English -controlledvocabulary.language.seba=Seba -controlledvocabulary.language.sebat_bet_gurage=Sebat Bet Gurage -controlledvocabulary.language.seberuang=Seberuang -controlledvocabulary.language.sebop=Sebop -controlledvocabulary.language.sechelt=Sechelt -controlledvocabulary.language.secoya=Secoya -controlledvocabulary.language.sedang=Sedang -controlledvocabulary.language.sediq=Sediq -controlledvocabulary.language.sedoa=Sedoa -controlledvocabulary.language.seeku=Seeku -controlledvocabulary.language.segai=Segai -controlledvocabulary.language.segeju=Segeju -controlledvocabulary.language.seget=Seget -controlledvocabulary.language.sehwi=Sehwi -controlledvocabulary.language.seimat=Seimat -controlledvocabulary.language.seit-kaitetu=Seit-Kaitetu -controlledvocabulary.language.sekani=Sekani -controlledvocabulary.language.sekapan=Sekapan -controlledvocabulary.language.sekar=Sekar -controlledvocabulary.language.seke_(nepal)=Seke (Nepal) -controlledvocabulary.language.seke_(vanuatu)=Seke (Vanuatu) -controlledvocabulary.language.sekele=Sekele -controlledvocabulary.language.seki=Seki -controlledvocabulary.language.seko_padang=Seko Padang -controlledvocabulary.language.seko_tengah=Seko Tengah -controlledvocabulary.language.sekpele=Sekpele -controlledvocabulary.language.selangor_sign_language=Selangor Sign Language -controlledvocabulary.language.selaru=Selaru -controlledvocabulary.language.selayar=Selayar -controlledvocabulary.language.selee=Selee -controlledvocabulary.language.selepet=Selepet -controlledvocabulary.language.selian=Selian -controlledvocabulary.language.selkup=Selkup -controlledvocabulary.language.selungai_murut=Selungai Murut -controlledvocabulary.language.seluwasan=Seluwasan -controlledvocabulary.language.semai=Semai -controlledvocabulary.language.semandang=Semandang -controlledvocabulary.language.semaq_beri=Semaq Beri -controlledvocabulary.language.sembakung_murut=Sembakung Murut -controlledvocabulary.language.semelai=Semelai -controlledvocabulary.language.semimi=Semimi -controlledvocabulary.language.semnam=Semnam -controlledvocabulary.language.semnani=Semnani -controlledvocabulary.language.sempan=Sempan -controlledvocabulary.language.sena=Sena -controlledvocabulary.language.senara_senoufo=Senara Sénoufo -controlledvocabulary.language.senaya=Senaya -controlledvocabulary.language.sene=Sene -controlledvocabulary.language.seneca=Seneca -controlledvocabulary.language.sened=Sened -controlledvocabulary.language.sengele=Sengele -controlledvocabulary.language.senggi=Senggi -controlledvocabulary.language.sengo=Sengo -controlledvocabulary.language.sengseng=Sengseng -controlledvocabulary.language.senhaja_de_srair=Senhaja De Srair -controlledvocabulary.language.sensi=Sensi -controlledvocabulary.language.sentani=Sentani -controlledvocabulary.language.senthang_chin=Senthang Chin -controlledvocabulary.language.sentinel=Sentinel -controlledvocabulary.language.sepa_(indonesia)=Sepa (Indonesia) -controlledvocabulary.language.sepa_(papua_new_guinea)=Sepa (Papua New Guinea) -controlledvocabulary.language.sepik_iwam=Sepik Iwam -controlledvocabulary.language.sera=Sera -controlledvocabulary.language.serbian=Serbian -controlledvocabulary.language.serbo-croatian=Serbo-Croatian -controlledvocabulary.language.sere=Sere -controlledvocabulary.language.serer=Serer -controlledvocabulary.language.seri=Seri -controlledvocabulary.language.serili=Serili -controlledvocabulary.language.seroa=Seroa -controlledvocabulary.language.serrano=Serrano -controlledvocabulary.language.serua=Serua -controlledvocabulary.language.serudung_murut=Serudung Murut -controlledvocabulary.language.serui-laut=Serui-Laut -controlledvocabulary.language.seselwa_creole_french=Seselwa Creole French -controlledvocabulary.language.seta=Seta -controlledvocabulary.language.setaman=Setaman -controlledvocabulary.language.seti=Seti -controlledvocabulary.language.settla=Settla -controlledvocabulary.language.severn_ojibwa=Severn Ojibwa -controlledvocabulary.language.sewa_bay=Sewa Bay -controlledvocabulary.language.seychelles_sign_language=Seychelles Sign Language -controlledvocabulary.language.seze=Seze -controlledvocabulary.language.sha=Sha -controlledvocabulary.language.shabak=Shabak -controlledvocabulary.language.shahmirzadi=Shahmirzadi -controlledvocabulary.language.shahrudi=Shahrudi -controlledvocabulary.language.shall-zwall=Shall-Zwall -controlledvocabulary.language.shama-sambuga=Shama-Sambuga -controlledvocabulary.language.shamang=Shamang -controlledvocabulary.language.shambala=Shambala -controlledvocabulary.language.shan=Shan -controlledvocabulary.language.shanenawa=Shanenawa -controlledvocabulary.language.shanga=Shanga -controlledvocabulary.language.sharanahua=Sharanahua -controlledvocabulary.language.shark_bay=Shark Bay -controlledvocabulary.language.sharwa=Sharwa -controlledvocabulary.language.shasta=Shasta -controlledvocabulary.language.shatt=Shatt -controlledvocabulary.language.shau=Shau -controlledvocabulary.language.shawnee=Shawnee -controlledvocabulary.language.she=She -controlledvocabulary.language.shehri=Shehri -controlledvocabulary.language.shekhawati=Shekhawati -controlledvocabulary.language.shekkacho=Shekkacho -controlledvocabulary.language.sheko=Sheko -controlledvocabulary.language.shelta=Shelta -controlledvocabulary.language.shempire_senoufo=Shempire Senoufo -controlledvocabulary.language.shendu=Shendu -controlledvocabulary.language.sheni=Sheni -controlledvocabulary.language.sherbro=Sherbro -controlledvocabulary.language.sherdukpen=Sherdukpen -controlledvocabulary.language.sherpa=Sherpa -controlledvocabulary.language.sheshi_kham=Sheshi Kham -controlledvocabulary.language.shi=Shi -controlledvocabulary.language.shihhi_arabic=Shihhi Arabic -controlledvocabulary.language.shiki=Shiki -controlledvocabulary.language.shilluk=Shilluk -controlledvocabulary.language.shina=Shina -controlledvocabulary.language.shipibo-conibo=Shipibo-Conibo -controlledvocabulary.language.sholaga=Sholaga -controlledvocabulary.language.shom_peng=Shom Peng -controlledvocabulary.language.shona=Shona -controlledvocabulary.language.shoo-minda-nye=Shoo-Minda-Nye -controlledvocabulary.language.shor=Shor -controlledvocabulary.language.shoshoni=Shoshoni -controlledvocabulary.language.shua=Shua -controlledvocabulary.language.shuadit=Shuadit -controlledvocabulary.language.shuar=Shuar -controlledvocabulary.language.shubi=Shubi -controlledvocabulary.language.shughni=Shughni -controlledvocabulary.language.shuhi=Shuhi -controlledvocabulary.language.shumashti=Shumashti -controlledvocabulary.language.shumcho=Shumcho -controlledvocabulary.language.shuswap=Shuswap -controlledvocabulary.language.shwai=Shwai -controlledvocabulary.language.shwe_palaung=Shwe Palaung -controlledvocabulary.language.sialum=Sialum -controlledvocabulary.language.siamou=Siamou -controlledvocabulary.language.sian=Sian -controlledvocabulary.language.siane=Siane -controlledvocabulary.language.siang=Siang -controlledvocabulary.language.siar-lak=Siar-Lak -controlledvocabulary.language.siawi=Siawi -controlledvocabulary.language.sibe=Sibe -controlledvocabulary.language.siberian_tatar=Siberian Tatar -controlledvocabulary.language.sibu_melanau=Sibu Melanau -controlledvocabulary.language.sicanian=Sicanian -controlledvocabulary.language.sicel=Sicel -controlledvocabulary.language.sichuan_yi,_nuosu=Sichuan Yi, Nuosu -controlledvocabulary.language.sicilian=Sicilian -controlledvocabulary.language.siculo_arabic=Siculo Arabic -controlledvocabulary.language.sidamo=Sidamo -controlledvocabulary.language.sidetic=Sidetic -controlledvocabulary.language.sie=Sie -controlledvocabulary.language.sierra_leone_sign_language=Sierra Leone Sign Language -controlledvocabulary.language.sierra_negra_nahuatl=Sierra Negra Nahuatl -controlledvocabulary.language.sierra_de_juarez_zapotec=Sierra de Juárez Zapotec -controlledvocabulary.language.sighu=Sighu -controlledvocabulary.language.sihan=Sihan -controlledvocabulary.language.sihuas_ancash_quechua=Sihuas Ancash Quechua -controlledvocabulary.language.sika=Sika -controlledvocabulary.language.sikaiana=Sikaiana -controlledvocabulary.language.sikaritai=Sikaritai -controlledvocabulary.language.sikiana=Sikiana -controlledvocabulary.language.sikkimese=Sikkimese -controlledvocabulary.language.siksika=Siksika -controlledvocabulary.language.sikule=Sikule -controlledvocabulary.language.sila=Sila -controlledvocabulary.language.silacayoapan_mixtec=Silacayoapan Mixtec -controlledvocabulary.language.sileibi=Sileibi -controlledvocabulary.language.silesian=Silesian -controlledvocabulary.language.silimo=Silimo -controlledvocabulary.language.siliput=Siliput -controlledvocabulary.language.silopi=Silopi -controlledvocabulary.language.silt'e=Silt'e -controlledvocabulary.language.simaa=Simaa -controlledvocabulary.language.simba=Simba -controlledvocabulary.language.simbali=Simbali -controlledvocabulary.language.simbari=Simbari -controlledvocabulary.language.simbo=Simbo -controlledvocabulary.language.simeku=Simeku -controlledvocabulary.language.simeulue=Simeulue -controlledvocabulary.language.simte=Simte -controlledvocabulary.language.sinagen=Sinagen -controlledvocabulary.language.sinasina=Sinasina -controlledvocabulary.language.sinaugoro=Sinaugoro -controlledvocabulary.language.sindarin=Sindarin -controlledvocabulary.language.sindhi=Sindhi -controlledvocabulary.language.sindhi_bhil=Sindhi Bhil -controlledvocabulary.language.sindihui_mixtec=Sindihui Mixtec -controlledvocabulary.language.singa=Singa -controlledvocabulary.language.singapore_sign_language=Singapore Sign Language -controlledvocabulary.language.singpho=Singpho -controlledvocabulary.language.sinhala,_sinhalese=Sinhala, Sinhalese -controlledvocabulary.language.sinicahua_mixtec=Sinicahua Mixtec -controlledvocabulary.language.sininkere=Sininkere -controlledvocabulary.language.sinte_romani=Sinte Romani -controlledvocabulary.language.sinyar=Sinyar -controlledvocabulary.language.sio=Sio -controlledvocabulary.language.siona=Siona -controlledvocabulary.language.sipacapense=Sipacapense -controlledvocabulary.language.sira=Sira -controlledvocabulary.language.siraya=Siraya -controlledvocabulary.language.sirenik_yupik=Sirenik Yupik -controlledvocabulary.language.siri=Siri -controlledvocabulary.language.siriano=Siriano -controlledvocabulary.language.siriono=Sirionó -controlledvocabulary.language.sirmauri=Sirmauri -controlledvocabulary.language.siroi=Siroi -controlledvocabulary.language.sissala=Sissala -controlledvocabulary.language.sissano=Sissano -controlledvocabulary.language.siuslaw=Siuslaw -controlledvocabulary.language.sivandi=Sivandi -controlledvocabulary.language.sivia_sign_language=Sivia Sign Language -controlledvocabulary.language.siwai=Siwai -controlledvocabulary.language.siwi=Siwi -controlledvocabulary.language.siwu=Siwu -controlledvocabulary.language.siyin_chin=Siyin Chin -controlledvocabulary.language.skagit=Skagit -controlledvocabulary.language.skalvian=Skalvian -controlledvocabulary.language.skepi_creole_dutch=Skepi Creole Dutch -controlledvocabulary.language.skolt_sami=Skolt Sami -controlledvocabulary.language.skou=Skou -controlledvocabulary.language.slave_(athapascan)=Slave (Athapascan) -controlledvocabulary.language.slavomolisano=Slavomolisano -controlledvocabulary.language.slovak=Slovak -controlledvocabulary.language.slovakian_sign_language=Slovakian Sign Language -controlledvocabulary.language.slovenian,_slovene=Slovenian, Slovene -controlledvocabulary.language.small_flowery_miao=Small Flowery Miao -controlledvocabulary.language.smarky_kanum=Smärky Kanum -controlledvocabulary.language.snohomish=Snohomish -controlledvocabulary.language.so_(democratic_republic_of_congo)=So (Democratic Republic of Congo) -controlledvocabulary.language.so'a=So'a -controlledvocabulary.language.sobei=Sobei -controlledvocabulary.language.sochiapam_chinantec=Sochiapam Chinantec -controlledvocabulary.language.soga=Soga -controlledvocabulary.language.sogdian=Sogdian -controlledvocabulary.language.soi=Soi -controlledvocabulary.language.sokoro=Sokoro -controlledvocabulary.language.solano=Solano -controlledvocabulary.language.soli=Soli -controlledvocabulary.language.solomon_islands_sign_language=Solomon Islands Sign Language -controlledvocabulary.language.solong=Solong -controlledvocabulary.language.solos=Solos -controlledvocabulary.language.som=Som -controlledvocabulary.language.somali=Somali -controlledvocabulary.language.somba-siawari=Somba-Siawari -controlledvocabulary.language.somrai=Somrai -controlledvocabulary.language.somray=Somray -controlledvocabulary.language.somyev=Somyev -controlledvocabulary.language.sonaga=Sonaga -controlledvocabulary.language.sonde=Sonde -controlledvocabulary.language.songe=Songe -controlledvocabulary.language.songlai_chin=Songlai Chin -controlledvocabulary.language.songo=Songo -controlledvocabulary.language.songomeno=Songomeno -controlledvocabulary.language.songoora=Songoora -controlledvocabulary.language.sonha=Sonha -controlledvocabulary.language.sonia=Sonia -controlledvocabulary.language.soninke=Soninke -controlledvocabulary.language.sonsorol=Sonsorol -controlledvocabulary.language.soo=Soo -controlledvocabulary.language.sop=Sop -controlledvocabulary.language.soqotri=Soqotri -controlledvocabulary.language.sora=Sora -controlledvocabulary.language.sori-harengan=Sori-Harengan -controlledvocabulary.language.sorkhei=Sorkhei -controlledvocabulary.language.sorothaptic=Sorothaptic -controlledvocabulary.language.sorsogon_ayta=Sorsogon Ayta -controlledvocabulary.language.sos_kundi=Sos Kundi -controlledvocabulary.language.sota_kanum=Sota Kanum -controlledvocabulary.language.sou=Sou -controlledvocabulary.language.sou_nama=Sou Nama -controlledvocabulary.language.sou_upaa=Sou Upaa -controlledvocabulary.language.south_african_sign_language=South African Sign Language -controlledvocabulary.language.south_awyu=South Awyu -controlledvocabulary.language.south_azerbaijani=South Azerbaijani -controlledvocabulary.language.south_bolivian_quechua=South Bolivian Quechua -controlledvocabulary.language.south_central_banda=South Central Banda -controlledvocabulary.language.south_central_dinka=South Central Dinka -controlledvocabulary.language.south_efate=South Efate -controlledvocabulary.language.south_fali=South Fali -controlledvocabulary.language.south_giziga=South Giziga -controlledvocabulary.language.south_lembata=South Lembata -controlledvocabulary.language.south_marquesan=South Marquesan -controlledvocabulary.language.south_muyu=South Muyu -controlledvocabulary.language.south_ndebele,_southern_ndebele=South Ndebele, Southern Ndebele -controlledvocabulary.language.south_nuaulu=South Nuaulu -controlledvocabulary.language.south_picene=South Picene -controlledvocabulary.language.south_slavey=South Slavey -controlledvocabulary.language.south_tairora=South Tairora -controlledvocabulary.language.south_ucayali_asheninka=South Ucayali Ashéninka -controlledvocabulary.language.south_watut=South Watut -controlledvocabulary.language.south_west_bay=South West Bay -controlledvocabulary.language.southeast_ambrym=Southeast Ambrym -controlledvocabulary.language.southeast_babar=Southeast Babar -controlledvocabulary.language.southeast_ijo=Southeast Ijo -controlledvocabulary.language.southeast_pashai=Southeast Pashai -controlledvocabulary.language.southeast_tasmanian=Southeast Tasmanian -controlledvocabulary.language.southeastern_dinka=Southeastern Dinka -controlledvocabulary.language.southeastern_ixtlan_zapotec=Southeastern Ixtlán Zapotec -controlledvocabulary.language.southeastern_kolami=Southeastern Kolami -controlledvocabulary.language.southeastern_nochixtlan_mixtec=Southeastern Nochixtlán Mixtec -controlledvocabulary.language.southeastern_pomo=Southeastern Pomo -controlledvocabulary.language.southeastern_puebla_nahuatl=Southeastern Puebla Nahuatl -controlledvocabulary.language.southeastern_tarahumara=Southeastern Tarahumara -controlledvocabulary.language.southeastern_tepehuan=Southeastern Tepehuan -controlledvocabulary.language.southern_alta=Southern Alta -controlledvocabulary.language.southern_altai=Southern Altai -controlledvocabulary.language.southern_amami-oshima=Southern Amami-Oshima -controlledvocabulary.language.southern_aymara=Southern Aymara -controlledvocabulary.language.southern_bai=Southern Bai -controlledvocabulary.language.southern_balochi=Southern Balochi -controlledvocabulary.language.southern_betsimisaraka_malagasy=Southern Betsimisaraka Malagasy -controlledvocabulary.language.southern_binukidnon=Southern Binukidnon -controlledvocabulary.language.southern_birifor=Southern Birifor -controlledvocabulary.language.southern_bobo_madare=Southern Bobo Madaré -controlledvocabulary.language.southern_bontok=Southern Bontok -controlledvocabulary.language.southern_carrier=Southern Carrier -controlledvocabulary.language.southern_catanduanes_bikol=Southern Catanduanes Bikol -controlledvocabulary.language.southern_conchucos_ancash_quechua=Southern Conchucos Ancash Quechua -controlledvocabulary.language.southern_dagaare=Southern Dagaare -controlledvocabulary.language.southern_dong=Southern Dong -controlledvocabulary.language.southern_east_cree=Southern East Cree -controlledvocabulary.language.southern_ghale=Southern Ghale -controlledvocabulary.language.southern_grebo=Southern Grebo -controlledvocabulary.language.southern_guiyang_hmong=Southern Guiyang Hmong -controlledvocabulary.language.southern_haida=Southern Haida -controlledvocabulary.language.southern_hindko=Southern Hindko -controlledvocabulary.language.southern_kalapuya=Southern Kalapuya -controlledvocabulary.language.southern_kalinga=Southern Kalinga -controlledvocabulary.language.southern_katang=Southern Katang -controlledvocabulary.language.southern_kisi=Southern Kisi -controlledvocabulary.language.southern_kiwai=Southern Kiwai -controlledvocabulary.language.southern_kurdish=Southern Kurdish -controlledvocabulary.language.southern_lolopo=Southern Lolopo -controlledvocabulary.language.southern_luri=Southern Luri -controlledvocabulary.language.southern_ma'di=Southern Ma'di -controlledvocabulary.language.southern_mashan_hmong=Southern Mashan Hmong -controlledvocabulary.language.southern_mnong=Southern Mnong -controlledvocabulary.language.southern_muji=Southern Muji -controlledvocabulary.language.southern_nago=Southern Nago -controlledvocabulary.language.southern_nambikuara=Southern Nambikuára -controlledvocabulary.language.southern_ngbandi=Southern Ngbandi -controlledvocabulary.language.southern_nicobarese=Southern Nicobarese -controlledvocabulary.language.southern_nisu=Southern Nisu -controlledvocabulary.language.southern_nuni=Southern Nuni -controlledvocabulary.language.southern_ohlone=Southern Ohlone -controlledvocabulary.language.southern_one=Southern One -controlledvocabulary.language.southern_pame=Southern Pame -controlledvocabulary.language.southern_pashto=Southern Pashto -controlledvocabulary.language.southern_pastaza_quechua=Southern Pastaza Quechua -controlledvocabulary.language.southern_ping_chinese=Southern Ping Chinese -controlledvocabulary.language.southern_pomo=Southern Pomo -controlledvocabulary.language.southern_puebla_mixtec=Southern Puebla Mixtec -controlledvocabulary.language.southern_puget_sound_salish=Southern Puget Sound Salish -controlledvocabulary.language.southern_pumi=Southern Pumi -controlledvocabulary.language.southern_qiandong_miao=Southern Qiandong Miao -controlledvocabulary.language.southern_qiang=Southern Qiang -controlledvocabulary.language.southern_rengma_naga=Southern Rengma Naga -controlledvocabulary.language.southern_rincon_zapotec=Southern Rincon Zapotec -controlledvocabulary.language.southern_roglai=Southern Roglai -controlledvocabulary.language.southern_sama=Southern Sama -controlledvocabulary.language.southern_sami=Southern Sami -controlledvocabulary.language.southern_samo=Southern Samo -controlledvocabulary.language.southern_sierra_miwok=Southern Sierra Miwok -controlledvocabulary.language.southern_sorsoganon=Southern Sorsoganon -controlledvocabulary.language.southern_sotho=Southern Sotho -controlledvocabulary.language.southern_subanen=Southern Subanen -controlledvocabulary.language.southern_thai=Southern Thai -controlledvocabulary.language.southern_tidung=Southern Tidung -controlledvocabulary.language.southern_tiwa=Southern Tiwa -controlledvocabulary.language.southern_toussian=Southern Toussian -controlledvocabulary.language.southern_tujia=Southern Tujia -controlledvocabulary.language.southern_tutchone=Southern Tutchone -controlledvocabulary.language.southern_uzbek=Southern Uzbek -controlledvocabulary.language.southern_yamphu=Southern Yamphu -controlledvocabulary.language.southern_yukaghir=Southern Yukaghir -controlledvocabulary.language.southwest_gbaya=Southwest Gbaya -controlledvocabulary.language.southwest_palawano=Southwest Palawano -controlledvocabulary.language.southwest_pashai=Southwest Pashai -controlledvocabulary.language.southwest_tanna=Southwest Tanna -controlledvocabulary.language.southwestern_bontok=Southwestern Bontok -controlledvocabulary.language.southwestern_dinka=Southwestern Dinka -controlledvocabulary.language.southwestern_fars=Southwestern Fars -controlledvocabulary.language.southwestern_guiyang_hmong=Southwestern Guiyang Hmong -controlledvocabulary.language.southwestern_huishui_hmong=Southwestern Huishui Hmong -controlledvocabulary.language.southwestern_nisu=Southwestern Nisu -controlledvocabulary.language.southwestern_tarahumara=Southwestern Tarahumara -controlledvocabulary.language.southwestern_tasmanian=Southwestern Tasmanian -controlledvocabulary.language.southwestern_tepehuan=Southwestern Tepehuan -controlledvocabulary.language.southwestern_tlaxiaco_mixtec=Southwestern Tlaxiaco Mixtec -controlledvocabulary.language.sowa=Sowa -controlledvocabulary.language.sowanda=Sowanda -controlledvocabulary.language.soyaltepec_mazatec=Soyaltepec Mazatec -controlledvocabulary.language.soyaltepec_mixtec=Soyaltepec Mixtec -controlledvocabulary.language.spanish_sign_language=Spanish Sign Language -controlledvocabulary.language.spiti_bhoti=Spiti Bhoti -controlledvocabulary.language.spokane=Spokane -controlledvocabulary.language.squamish=Squamish -controlledvocabulary.language.sranan_tongo=Sranan Tongo -controlledvocabulary.language.sri_lankan_creole_malay=Sri Lankan Creole Malay -controlledvocabulary.language.sri_lankan_sign_language=Sri Lankan Sign Language -controlledvocabulary.language.standard_arabic=Standard Arabic -controlledvocabulary.language.standard_estonian=Standard Estonian -controlledvocabulary.language.standard_latvian=Standard Latvian -controlledvocabulary.language.standard_malay=Standard Malay -controlledvocabulary.language.standard_moroccan_tamazight=Standard Moroccan Tamazight -controlledvocabulary.language.stellingwerfs=Stellingwerfs -controlledvocabulary.language.stod_bhoti=Stod Bhoti -controlledvocabulary.language.stoney=Stoney -controlledvocabulary.language.straits_salish=Straits Salish -controlledvocabulary.language.suabo=Suabo -controlledvocabulary.language.suarmin=Suarmin -controlledvocabulary.language.suau=Suau -controlledvocabulary.language.suba=Suba -controlledvocabulary.language.suba-simbiti=Suba-Simbiti -controlledvocabulary.language.subi=Subi -controlledvocabulary.language.subiya=Subiya -controlledvocabulary.language.subtiaba=Subtiaba -controlledvocabulary.language.sudanese_arabic=Sudanese Arabic -controlledvocabulary.language.sudanese_creole_arabic=Sudanese Creole Arabic -controlledvocabulary.language.sudest=Sudest -controlledvocabulary.language.sudovian=Sudovian -controlledvocabulary.language.suena=Suena -controlledvocabulary.language.suga=Suga -controlledvocabulary.language.suganga=Suganga -controlledvocabulary.language.sugut_dusun=Sugut Dusun -controlledvocabulary.language.sui=Sui -controlledvocabulary.language.suki=Suki -controlledvocabulary.language.suku=Suku -controlledvocabulary.language.sukuma=Sukuma -controlledvocabulary.language.sukur=Sukur -controlledvocabulary.language.sukurum=Sukurum -controlledvocabulary.language.sula=Sula -controlledvocabulary.language.sulka=Sulka -controlledvocabulary.language.sulod=Sulod -controlledvocabulary.language.suma=Suma -controlledvocabulary.language.sumariup=Sumariup -controlledvocabulary.language.sumau=Sumau -controlledvocabulary.language.sumbawa=Sumbawa -controlledvocabulary.language.sumbwa=Sumbwa -controlledvocabulary.language.sumerian=Sumerian -controlledvocabulary.language.sumi_naga=Sumi Naga -controlledvocabulary.language.sumtu_chin=Sumtu Chin -controlledvocabulary.language.sunam=Sunam -controlledvocabulary.language.sundanese=Sundanese -controlledvocabulary.language.sunwar=Sunwar -controlledvocabulary.language.suoy=Suoy -controlledvocabulary.language.supyire_senoufo=Supyire Senoufo -controlledvocabulary.language.sur=Sur -controlledvocabulary.language.surbakhal=Surbakhal -controlledvocabulary.language.surgujia=Surgujia -controlledvocabulary.language.surigaonon=Surigaonon -controlledvocabulary.language.surjapuri=Surjapuri -controlledvocabulary.language.sursurunga=Sursurunga -controlledvocabulary.language.suruaha=Suruahá -controlledvocabulary.language.surubu=Surubu -controlledvocabulary.language.surui=Suruí -controlledvocabulary.language.surui_do_para=Suruí Do Pará -controlledvocabulary.language.susquehannock=Susquehannock -controlledvocabulary.language.susu=Susu -controlledvocabulary.language.susuami=Susuami -controlledvocabulary.language.suundi=Suundi -controlledvocabulary.language.suwawa=Suwawa -controlledvocabulary.language.suya=Suyá -controlledvocabulary.language.svan=Svan -controlledvocabulary.language.swabian=Swabian -controlledvocabulary.language.swahili_(individual_language)=Swahili (individual language) -controlledvocabulary.language.swahili,_swahili_(macrolanguage)=Swahili, Swahili (macrolanguage) -controlledvocabulary.language.swampy_cree=Swampy Cree -controlledvocabulary.language.swati=Swati -controlledvocabulary.language.swedish=Swedish -controlledvocabulary.language.swedish_sign_language=Swedish Sign Language -controlledvocabulary.language.swiss_german=Swiss German -controlledvocabulary.language.swiss-french_sign_language=Swiss-French Sign Language -controlledvocabulary.language.swiss-german_sign_language=Swiss-German Sign Language -controlledvocabulary.language.swiss-italian_sign_language=Swiss-Italian Sign Language -controlledvocabulary.language.swo=Swo -controlledvocabulary.language.syenara_senoufo=Syenara Senoufo -controlledvocabulary.language.sylheti=Sylheti -controlledvocabulary.language.syriac=Syriac -controlledvocabulary.language.sao_paulo_kaingang=São Paulo Kaingáng -controlledvocabulary.language.saotomense=Sãotomense -controlledvocabulary.language.sicite_senoufo=Sìcìté Sénoufo -controlledvocabulary.language.so=Sô -controlledvocabulary.language.t'apo=T'apo -controlledvocabulary.language.t'en=T'en -controlledvocabulary.language.ta'izzi-adeni_arabic=Ta'izzi-Adeni Arabic -controlledvocabulary.language.taabwa=Taabwa -controlledvocabulary.language.tabaa_zapotec=Tabaa Zapotec -controlledvocabulary.language.tabaru=Tabaru -controlledvocabulary.language.tabasco_chontal=Tabasco Chontal -controlledvocabulary.language.tabasco_nahuatl=Tabasco Nahuatl -controlledvocabulary.language.tabasco_zoque=Tabasco Zoque -controlledvocabulary.language.tabassaran=Tabassaran -controlledvocabulary.language.tabla=Tabla -controlledvocabulary.language.tabo=Tabo -controlledvocabulary.language.tabriak=Tabriak -controlledvocabulary.language.tacahua_mixtec=Tacahua Mixtec -controlledvocabulary.language.tacana=Tacana -controlledvocabulary.language.tachawit=Tachawit -controlledvocabulary.language.tachelhit=Tachelhit -controlledvocabulary.language.tachoni=Tachoni -controlledvocabulary.language.tadaksahak=Tadaksahak -controlledvocabulary.language.tado=Tado -controlledvocabulary.language.tadyawan=Tadyawan -controlledvocabulary.language.tae'=Tae' -controlledvocabulary.language.tafi=Tafi -controlledvocabulary.language.tagabawa=Tagabawa -controlledvocabulary.language.tagakaulo=Tagakaulo -controlledvocabulary.language.tagal_murut=Tagal Murut -controlledvocabulary.language.tagalaka=Tagalaka -controlledvocabulary.language.tagalog=Tagalog -controlledvocabulary.language.tagargrent=Tagargrent -controlledvocabulary.language.tagbanwa=Tagbanwa -controlledvocabulary.language.tagbu=Tagbu -controlledvocabulary.language.tagdal=Tagdal -controlledvocabulary.language.tagin=Tagin -controlledvocabulary.language.tagish=Tagish -controlledvocabulary.language.tagoi=Tagoi -controlledvocabulary.language.tagwana_senoufo=Tagwana Senoufo -controlledvocabulary.language.tahaggart_tamahaq=Tahaggart Tamahaq -controlledvocabulary.language.tahitian=Tahitian -controlledvocabulary.language.tahltan=Tahltan -controlledvocabulary.language.tai=Tai -controlledvocabulary.language.tai_daeng=Tai Daeng -controlledvocabulary.language.tai_dam=Tai Dam -controlledvocabulary.language.tai_do=Tai Do -controlledvocabulary.language.tai_don=Tai Dón -controlledvocabulary.language.tai_hongjin=Tai Hongjin -controlledvocabulary.language.tai_laing=Tai Laing -controlledvocabulary.language.tai_loi=Tai Loi -controlledvocabulary.language.tai_long=Tai Long -controlledvocabulary.language.tai_nua=Tai Nüa -controlledvocabulary.language.tai_pao=Tai Pao -controlledvocabulary.language.tai_thanh=Tai Thanh -controlledvocabulary.language.tai_ya=Tai Ya -controlledvocabulary.language.taiap=Taiap -controlledvocabulary.language.taikat=Taikat -controlledvocabulary.language.tainae=Tainae -controlledvocabulary.language.taino=Taino -controlledvocabulary.language.tairaha=Tairaha -controlledvocabulary.language.tairuma=Tairuma -controlledvocabulary.language.taita=Taita -controlledvocabulary.language.taivoan=Taivoan -controlledvocabulary.language.taiwan_sign_language=Taiwan Sign Language -controlledvocabulary.language.taje=Taje -controlledvocabulary.language.tajik=Tajik -controlledvocabulary.language.tajiki_arabic=Tajiki Arabic -controlledvocabulary.language.tajio=Tajio -controlledvocabulary.language.tajuasohn=Tajuasohn -controlledvocabulary.language.takelma=Takelma -controlledvocabulary.language.takestani=Takestani -controlledvocabulary.language.takia=Takia -controlledvocabulary.language.takua=Takua -controlledvocabulary.language.takuu=Takuu -controlledvocabulary.language.takwane=Takwane -controlledvocabulary.language.tal=Tal -controlledvocabulary.language.tala=Tala -controlledvocabulary.language.talaud=Talaud -controlledvocabulary.language.taliabu=Taliabu -controlledvocabulary.language.talieng=Talieng -controlledvocabulary.language.talinga-bwisi=Talinga-Bwisi -controlledvocabulary.language.talise=Talise -controlledvocabulary.language.talodi=Talodi -controlledvocabulary.language.taloki=Taloki -controlledvocabulary.language.talondo'=Talondo' -controlledvocabulary.language.talossan=Talossan -controlledvocabulary.language.talu=Talu -controlledvocabulary.language.talysh=Talysh -controlledvocabulary.language.tama_(chad)=Tama (Chad) -controlledvocabulary.language.tama_(colombia)=Tama (Colombia) -controlledvocabulary.language.tamagario=Tamagario -controlledvocabulary.language.taman_(indonesia)=Taman (Indonesia) -controlledvocabulary.language.taman_(myanmar)=Taman (Myanmar) -controlledvocabulary.language.tamanaku=Tamanaku -controlledvocabulary.language.tamashek=Tamashek -controlledvocabulary.language.tamasheq=Tamasheq -controlledvocabulary.language.tamazola_mixtec=Tamazola Mixtec -controlledvocabulary.language.tambas=Tambas -controlledvocabulary.language.tambora=Tambora -controlledvocabulary.language.tambotalo=Tambotalo -controlledvocabulary.language.tami=Tami -controlledvocabulary.language.tamil=Tamil -controlledvocabulary.language.tamki=Tamki -controlledvocabulary.language.tamnim_citak=Tamnim Citak -controlledvocabulary.language.tampias_lobu=Tampias Lobu -controlledvocabulary.language.tampuan=Tampuan -controlledvocabulary.language.tampulma=Tampulma -controlledvocabulary.language.tanacross=Tanacross -controlledvocabulary.language.tanahmerah=Tanahmerah -controlledvocabulary.language.tanaina=Tanaina -controlledvocabulary.language.tanapag=Tanapag -controlledvocabulary.language.tandaganon=Tandaganon -controlledvocabulary.language.tandia=Tandia -controlledvocabulary.language.tandroy-mahafaly_malagasy=Tandroy-Mahafaly Malagasy -controlledvocabulary.language.tanema=Tanema -controlledvocabulary.language.tangale=Tangale -controlledvocabulary.language.tangchangya=Tangchangya -controlledvocabulary.language.tanggu=Tanggu -controlledvocabulary.language.tangkhul_naga_(india)=Tangkhul Naga (India) -controlledvocabulary.language.tangkhul_naga_(myanmar)=Tangkhul Naga (Myanmar) -controlledvocabulary.language.tangko=Tangko -controlledvocabulary.language.tanglang=Tanglang -controlledvocabulary.language.tangoa=Tangoa -controlledvocabulary.language.tanguat=Tanguat -controlledvocabulary.language.tangut=Tangut -controlledvocabulary.language.tanimbili=Tanimbili -controlledvocabulary.language.tanimuca-retuara=Tanimuca-Retuarã -controlledvocabulary.language.tanjijili=Tanjijili -controlledvocabulary.language.tanosy_malagasy=Tanosy Malagasy -controlledvocabulary.language.tanudan_kalinga=Tanudan Kalinga -controlledvocabulary.language.tanzanian_sign_language=Tanzanian Sign Language -controlledvocabulary.language.tapei=Tapei -controlledvocabulary.language.tapiete=Tapieté -controlledvocabulary.language.tapirape=Tapirapé -controlledvocabulary.language.tarao_naga=Tarao Naga -controlledvocabulary.language.tareng=Tareng -controlledvocabulary.language.tariana=Tariana -controlledvocabulary.language.tarifit=Tarifit -controlledvocabulary.language.tarjumo=Tarjumo -controlledvocabulary.language.tarok=Tarok -controlledvocabulary.language.tarpia=Tarpia -controlledvocabulary.language.tartessian=Tartessian -controlledvocabulary.language.taruma=Taruma -controlledvocabulary.language.tasawaq=Tasawaq -controlledvocabulary.language.tase_naga=Tase Naga -controlledvocabulary.language.tasmate=Tasmate -controlledvocabulary.language.tataltepec_chatino=Tataltepec Chatino -controlledvocabulary.language.tatana=Tatana -controlledvocabulary.language.tatar=Tatar -controlledvocabulary.language.tatuyo=Tatuyo -controlledvocabulary.language.tauade=Tauade -controlledvocabulary.language.taulil=Taulil -controlledvocabulary.language.taungyo=Taungyo -controlledvocabulary.language.taupota=Taupota -controlledvocabulary.language.tause=Tause -controlledvocabulary.language.taushiro=Taushiro -controlledvocabulary.language.tausug=Tausug -controlledvocabulary.language.tauya=Tauya -controlledvocabulary.language.taveta=Taveta -controlledvocabulary.language.tavoyan=Tavoyan -controlledvocabulary.language.tavringer_romani=Tavringer Romani -controlledvocabulary.language.tawala=Tawala -controlledvocabulary.language.tawallammat_tamajaq=Tawallammat Tamajaq -controlledvocabulary.language.tawande=Tawandê -controlledvocabulary.language.tawang_monpa=Tawang Monpa -controlledvocabulary.language.tawara=Tawara -controlledvocabulary.language.taworta=Taworta -controlledvocabulary.language.tawoyan=Tawoyan -controlledvocabulary.language.tawr_chin=Tawr Chin -controlledvocabulary.language.tay_boi=Tay Boi -controlledvocabulary.language.tay_khang=Tay Khang -controlledvocabulary.language.tayart_tamajeq=Tayart Tamajeq -controlledvocabulary.language.tayo=Tayo -controlledvocabulary.language.taznatit=Taznatit -controlledvocabulary.language.tboli=Tboli -controlledvocabulary.language.tchitchege=Tchitchege -controlledvocabulary.language.tchumbuli=Tchumbuli -controlledvocabulary.language.te'un=Te'un -controlledvocabulary.language.teanu=Teanu -controlledvocabulary.language.tebul_sign_language=Tebul Sign Language -controlledvocabulary.language.tebul_ure_dogon=Tebul Ure Dogon -controlledvocabulary.language.tecpatlan_totonac=Tecpatlán Totonac -controlledvocabulary.language.tedaga=Tedaga -controlledvocabulary.language.tedim_chin=Tedim Chin -controlledvocabulary.language.tee=Tee -controlledvocabulary.language.tefaro=Tefaro -controlledvocabulary.language.tegali=Tegali -controlledvocabulary.language.tehit=Tehit -controlledvocabulary.language.tehuelche=Tehuelche -controlledvocabulary.language.tejalapan_zapotec=Tejalapan Zapotec -controlledvocabulary.language.teke-ebo=Teke-Ebo -controlledvocabulary.language.teke-fuumu=Teke-Fuumu -controlledvocabulary.language.teke-kukuya=Teke-Kukuya -controlledvocabulary.language.teke-laali=Teke-Laali -controlledvocabulary.language.teke-nzikou=Teke-Nzikou -controlledvocabulary.language.teke-tege=Teke-Tege -controlledvocabulary.language.teke-tsaayi=Teke-Tsaayi -controlledvocabulary.language.teke-tyee=Teke-Tyee -controlledvocabulary.language.tektiteko=Tektiteko -controlledvocabulary.language.tela-masbuar=Tela-Masbuar -controlledvocabulary.language.telefol=Telefol -controlledvocabulary.language.telugu=Telugu -controlledvocabulary.language.tem=Tem -controlledvocabulary.language.temacine_tamazight=Temacine Tamazight -controlledvocabulary.language.temascaltepec_nahuatl=Temascaltepec Nahuatl -controlledvocabulary.language.tembo_(kitembo)=Tembo (Kitembo) -controlledvocabulary.language.tembo_(motembo)=Tembo (Motembo) -controlledvocabulary.language.tembe=Tembé -controlledvocabulary.language.teme=Teme -controlledvocabulary.language.temein=Temein -controlledvocabulary.language.temi=Temi -controlledvocabulary.language.temiar=Temiar -controlledvocabulary.language.temoaya_otomi=Temoaya Otomi -controlledvocabulary.language.temoq=Temoq -controlledvocabulary.language.temuan=Temuan -controlledvocabulary.language.ten'edn=Ten'edn -controlledvocabulary.language.tena_lowland_quichua=Tena Lowland Quichua -controlledvocabulary.language.tenango_otomi=Tenango Otomi -controlledvocabulary.language.tene_kan_dogon=Tene Kan Dogon -controlledvocabulary.language.tenggarong_kutai_malay=Tenggarong Kutai Malay -controlledvocabulary.language.tengger=Tengger -controlledvocabulary.language.tenharim=Tenharim -controlledvocabulary.language.tenino=Tenino -controlledvocabulary.language.tenis=Tenis -controlledvocabulary.language.tennet=Tennet -controlledvocabulary.language.teop=Teop -controlledvocabulary.language.teor=Teor -controlledvocabulary.language.tepecano=Tepecano -controlledvocabulary.language.tepetotutla_chinantec=Tepetotutla Chinantec -controlledvocabulary.language.tepeuxila_cuicatec=Tepeuxila Cuicatec -controlledvocabulary.language.tepinapa_chinantec=Tepinapa Chinantec -controlledvocabulary.language.tepo_krumen=Tepo Krumen -controlledvocabulary.language.ter_sami=Ter Sami -controlledvocabulary.language.tera=Tera -controlledvocabulary.language.terebu=Terebu -controlledvocabulary.language.terei=Terei -controlledvocabulary.language.tereno=Tereno -controlledvocabulary.language.teressa=Teressa -controlledvocabulary.language.tereweng=Tereweng -controlledvocabulary.language.teribe=Teribe -controlledvocabulary.language.terik=Terik -controlledvocabulary.language.termanu=Termanu -controlledvocabulary.language.ternate=Ternate -controlledvocabulary.language.ternateno=Ternateño -controlledvocabulary.language.tesaka_malagasy=Tesaka Malagasy -controlledvocabulary.language.tese=Tese -controlledvocabulary.language.teshenawa=Teshenawa -controlledvocabulary.language.teso=Teso -controlledvocabulary.language.tetela=Tetela -controlledvocabulary.language.tetelcingo_nahuatl=Tetelcingo Nahuatl -controlledvocabulary.language.tetete=Tetete -controlledvocabulary.language.tetserret=Tetserret -controlledvocabulary.language.tetum=Tetum -controlledvocabulary.language.tetun_dili=Tetun Dili -controlledvocabulary.language.teutila_cuicatec=Teutila Cuicatec -controlledvocabulary.language.tewa_(indonesia)=Tewa (Indonesia) -controlledvocabulary.language.tewa_(usa)=Tewa (USA) -controlledvocabulary.language.tewe=Tewe -controlledvocabulary.language.texcatepec_otomi=Texcatepec Otomi -controlledvocabulary.language.texistepec_popoluca=Texistepec Popoluca -controlledvocabulary.language.texmelucan_zapotec=Texmelucan Zapotec -controlledvocabulary.language.tezoatlan_mixtec=Tezoatlán Mixtec -controlledvocabulary.language.tha=Tha -controlledvocabulary.language.thachanadan=Thachanadan -controlledvocabulary.language.thado_chin=Thado Chin -controlledvocabulary.language.thai=Thai -controlledvocabulary.language.thai_sign_language=Thai Sign Language -controlledvocabulary.language.thai_song=Thai Song -controlledvocabulary.language.thaiphum_chin=Thaiphum Chin -controlledvocabulary.language.thakali=Thakali -controlledvocabulary.language.thangal_naga=Thangal Naga -controlledvocabulary.language.thangmi=Thangmi -controlledvocabulary.language.thao=Thao -controlledvocabulary.language.tharaka=Tharaka -controlledvocabulary.language.thawa=Thawa -controlledvocabulary.language.thaypan=Thaypan -controlledvocabulary.language.thiin=Thiin -controlledvocabulary.language.tho=Tho -controlledvocabulary.language.thompson=Thompson -controlledvocabulary.language.thopho=Thopho -controlledvocabulary.language.thracian=Thracian -controlledvocabulary.language.thu_lao=Thu Lao -controlledvocabulary.language.thulung=Thulung -controlledvocabulary.language.thur=Thur -controlledvocabulary.language.thuri=Thuri -controlledvocabulary.language.tiagbamrin_aizi=Tiagbamrin Aizi -controlledvocabulary.language.tiale=Tiale -controlledvocabulary.language.tiang=Tiang -controlledvocabulary.language.tibea=Tibea -controlledvocabulary.language.tibetan_sign_language=Tibetan Sign Language -controlledvocabulary.language.tibetan,_tibetan_standard,_central=Tibetan, Tibetan Standard, Central -controlledvocabulary.language.tichurong=Tichurong -controlledvocabulary.language.ticuna=Ticuna -controlledvocabulary.language.tidaa_mixtec=Tidaá Mixtec -controlledvocabulary.language.tidikelt_tamazight=Tidikelt Tamazight -controlledvocabulary.language.tidore=Tidore -controlledvocabulary.language.tiemacewe_bozo=Tiemacèwè Bozo -controlledvocabulary.language.tiene=Tiene -controlledvocabulary.language.tifal=Tifal -controlledvocabulary.language.tigak=Tigak -controlledvocabulary.language.tigon_mbembe=Tigon Mbembe -controlledvocabulary.language.tigre=Tigre -controlledvocabulary.language.tigrinya=Tigrinya -controlledvocabulary.language.tii=Tii -controlledvocabulary.language.tijaltepec_mixtec=Tijaltepec Mixtec -controlledvocabulary.language.tikar=Tikar -controlledvocabulary.language.tikopia=Tikopia -controlledvocabulary.language.tilapa_otomi=Tilapa Otomi -controlledvocabulary.language.tillamook=Tillamook -controlledvocabulary.language.tilquiapan_zapotec=Tilquiapan Zapotec -controlledvocabulary.language.tilung=Tilung -controlledvocabulary.language.tima=Tima -controlledvocabulary.language.timbe=Timbe -controlledvocabulary.language.timne=Timne -controlledvocabulary.language.timor_pidgin=Timor Pidgin -controlledvocabulary.language.timucua=Timucua -controlledvocabulary.language.timugon_murut=Timugon Murut -controlledvocabulary.language.tinani=Tinani -controlledvocabulary.language.tindi=Tindi -controlledvocabulary.language.tingui-boto=Tingui-Boto -controlledvocabulary.language.tinigua=Tinigua -controlledvocabulary.language.tinputz=Tinputz -controlledvocabulary.language.tippera=Tippera -controlledvocabulary.language.tira=Tira -controlledvocabulary.language.tirahi=Tirahi -controlledvocabulary.language.tiranige_diga_dogon=Tiranige Diga Dogon -controlledvocabulary.language.tiri=Tiri -controlledvocabulary.language.tirmaga-chai_suri=Tirmaga-Chai Suri -controlledvocabulary.language.tiruray=Tiruray -controlledvocabulary.language.tita=Tita -controlledvocabulary.language.titan=Titan -controlledvocabulary.language.tiv=Tiv -controlledvocabulary.language.tiwa=Tiwa -controlledvocabulary.language.tiwi=Tiwi -controlledvocabulary.language.tiyaa=Tiyaa -controlledvocabulary.language.tiefo=Tiéfo -controlledvocabulary.language.tieyaxo_bozo=Tiéyaxo Bozo -controlledvocabulary.language.tjungundji=Tjungundji -controlledvocabulary.language.tjupany=Tjupany -controlledvocabulary.language.tjurruru=Tjurruru -controlledvocabulary.language.tlachichilco_tepehua=Tlachichilco Tepehua -controlledvocabulary.language.tlacoapa_me'phaa=Tlacoapa Me'phaa -controlledvocabulary.language.tlacoatzintepec_chinantec=Tlacoatzintepec Chinantec -controlledvocabulary.language.tlacolulita_zapotec=Tlacolulita Zapotec -controlledvocabulary.language.tlahuitoltepec_mixe=Tlahuitoltepec Mixe -controlledvocabulary.language.tlamacazapa_nahuatl=Tlamacazapa Nahuatl -controlledvocabulary.language.tlazoyaltepec_mixtec=Tlazoyaltepec Mixtec -controlledvocabulary.language.tlicho=Tlicho -controlledvocabulary.language.tlingit=Tlingit -controlledvocabulary.language.to=To -controlledvocabulary.language.to'abaita=To'abaita -controlledvocabulary.language.toaripi=Toaripi -controlledvocabulary.language.toba=Toba -controlledvocabulary.language.toba-maskoy=Toba-Maskoy -controlledvocabulary.language.tobagonian_creole_english=Tobagonian Creole English -controlledvocabulary.language.tobanga=Tobanga -controlledvocabulary.language.tobati=Tobati -controlledvocabulary.language.tobelo=Tobelo -controlledvocabulary.language.tobian=Tobian -controlledvocabulary.language.tobilung=Tobilung -controlledvocabulary.language.tobo=Tobo -controlledvocabulary.language.tocantins_asurini=Tocantins Asurini -controlledvocabulary.language.tocho=Tocho -controlledvocabulary.language.toda=Toda -controlledvocabulary.language.todrah=Todrah -controlledvocabulary.language.tofanma=Tofanma -controlledvocabulary.language.tofin_gbe=Tofin Gbe -controlledvocabulary.language.togbo-vara_banda=Togbo-Vara Banda -controlledvocabulary.language.togoyo=Togoyo -controlledvocabulary.language.tohono_o'odham=Tohono O'odham -controlledvocabulary.language.tojolabal=Tojolabal -controlledvocabulary.language.tok_pisin=Tok Pisin -controlledvocabulary.language.tokano=Tokano -controlledvocabulary.language.tokelau=Tokelau -controlledvocabulary.language.tokharian_a=Tokharian A -controlledvocabulary.language.tokharian_b=Tokharian B -controlledvocabulary.language.toki_pona=Toki Pona -controlledvocabulary.language.toku-no-shima=Toku-No-Shima -controlledvocabulary.language.tol=Tol -controlledvocabulary.language.tolaki=Tolaki -controlledvocabulary.language.tolomako=Tolomako -controlledvocabulary.language.tolowa=Tolowa -controlledvocabulary.language.toma=Toma -controlledvocabulary.language.tomadino=Tomadino -controlledvocabulary.language.tombelala=Tombelala -controlledvocabulary.language.tombonuo=Tombonuo -controlledvocabulary.language.tombulu=Tombulu -controlledvocabulary.language.tomini=Tomini -controlledvocabulary.language.tommo_so_dogon=Tommo So Dogon -controlledvocabulary.language.tomo_kan_dogon=Tomo Kan Dogon -controlledvocabulary.language.tomoip=Tomoip -controlledvocabulary.language.tondano=Tondano -controlledvocabulary.language.tondi_songway_kiini=Tondi Songway Kiini -controlledvocabulary.language.tonga_(nyasa)=Tonga (Nyasa) -controlledvocabulary.language.tonga_(tonga_islands)=Tonga (Tonga Islands) -controlledvocabulary.language.tonga_(zambia)=Tonga (Zambia) -controlledvocabulary.language.tongwe=Tongwe -controlledvocabulary.language.tonjon=Tonjon -controlledvocabulary.language.tonkawa=Tonkawa -controlledvocabulary.language.tonsawang=Tonsawang -controlledvocabulary.language.tonsea=Tonsea -controlledvocabulary.language.tontemboan=Tontemboan -controlledvocabulary.language.tooro=Tooro -controlledvocabulary.language.topoiyo=Topoiyo -controlledvocabulary.language.toposa=Toposa -controlledvocabulary.language.toraja-sa'dan=Toraja-Sa'dan -controlledvocabulary.language.toram=Toram -controlledvocabulary.language.torau=Torau -controlledvocabulary.language.tornedalen_finnish=Tornedalen Finnish -controlledvocabulary.language.toro=Toro -controlledvocabulary.language.toro_so_dogon=Toro So Dogon -controlledvocabulary.language.toro_tegu_dogon=Toro Tegu Dogon -controlledvocabulary.language.toromono=Toromono -controlledvocabulary.language.torona=Torona -controlledvocabulary.language.torres_strait_creole=Torres Strait Creole -controlledvocabulary.language.torricelli=Torricelli -controlledvocabulary.language.torwali=Torwali -controlledvocabulary.language.tora=Torá -controlledvocabulary.language.tosk_albanian=Tosk Albanian -controlledvocabulary.language.totela=Totela -controlledvocabulary.language.toto=Toto -controlledvocabulary.language.totoli=Totoli -controlledvocabulary.language.totomachapan_zapotec=Totomachapan Zapotec -controlledvocabulary.language.totontepec_mixe=Totontepec Mixe -controlledvocabulary.language.totoro=Totoro -controlledvocabulary.language.touo=Touo -controlledvocabulary.language.toura_(cote_d'ivoire)=Toura (Côte d'Ivoire) -controlledvocabulary.language.toura_(papua_new_guinea)=Toura (Papua New Guinea) -controlledvocabulary.language.towei=Towei -controlledvocabulary.language.transalpine_gaulish=Transalpine Gaulish -controlledvocabulary.language.traveller_danish=Traveller Danish -controlledvocabulary.language.traveller_norwegian=Traveller Norwegian -controlledvocabulary.language.traveller_scottish=Traveller Scottish -controlledvocabulary.language.tregami=Tregami -controlledvocabulary.language.tremembe=Tremembé -controlledvocabulary.language.trieng=Trieng -controlledvocabulary.language.trimuris=Trimuris -controlledvocabulary.language.tring=Tring -controlledvocabulary.language.tringgus-sembaan_bidayuh=Tringgus-Sembaan Bidayuh -controlledvocabulary.language.trinidad_and_tobago_sign_language=Trinidad and Tobago Sign Language -controlledvocabulary.language.trinidadian_creole_english=Trinidadian Creole English -controlledvocabulary.language.trinitario=Trinitario -controlledvocabulary.language.trio=Trió -controlledvocabulary.language.truka=Truká -controlledvocabulary.language.trumai=Trumai -controlledvocabulary.language.ts'un-lao=Ts'ün-Lao -controlledvocabulary.language.tsaangi=Tsaangi -controlledvocabulary.language.tsakhur=Tsakhur -controlledvocabulary.language.tsakonian=Tsakonian -controlledvocabulary.language.tsakwambo=Tsakwambo -controlledvocabulary.language.tsamai=Tsamai -controlledvocabulary.language.tsat=Tsat -controlledvocabulary.language.tseku=Tseku -controlledvocabulary.language.tsetsaut=Tsetsaut -controlledvocabulary.language.tshangla=Tshangla -controlledvocabulary.language.tsikimba=Tsikimba -controlledvocabulary.language.tsimane=Tsimané -controlledvocabulary.language.tsimihety_malagasy=Tsimihety Malagasy -controlledvocabulary.language.tsimshian=Tsimshian -controlledvocabulary.language.tsishingini=Tsishingini -controlledvocabulary.language.tso=Tso -controlledvocabulary.language.tsoa=Tsoa -controlledvocabulary.language.tsogo=Tsogo -controlledvocabulary.language.tsonga=Tsonga -controlledvocabulary.language.tsotso=Tsotso -controlledvocabulary.language.tsou=Tsou -controlledvocabulary.language.tsucuba=Tsucuba -controlledvocabulary.language.tsum=Tsum -controlledvocabulary.language.tsuvadi=Tsuvadi -controlledvocabulary.language.tsuvan=Tsuvan -controlledvocabulary.language.tswa=Tswa -controlledvocabulary.language.tswana=Tswana -controlledvocabulary.language.tswapong=Tswapong -controlledvocabulary.language.tu=Tu -controlledvocabulary.language.tuamotuan=Tuamotuan -controlledvocabulary.language.tubar=Tubar -controlledvocabulary.language.tucano=Tucano -controlledvocabulary.language.tugen=Tugen -controlledvocabulary.language.tugun=Tugun -controlledvocabulary.language.tugutil=Tugutil -controlledvocabulary.language.tukang_besi_north=Tukang Besi North -controlledvocabulary.language.tukang_besi_south=Tukang Besi South -controlledvocabulary.language.tuki=Tuki -controlledvocabulary.language.tukpa=Tukpa -controlledvocabulary.language.tukudede=Tukudede -controlledvocabulary.language.tukumanfed=Tukumanféd -controlledvocabulary.language.tula=Tula -controlledvocabulary.language.tulai=Tulai -controlledvocabulary.language.tulehu=Tulehu -controlledvocabulary.language.tulishi=Tulishi -controlledvocabulary.language.tulu=Tulu -controlledvocabulary.language.tulu-bohuai=Tulu-Bohuai -controlledvocabulary.language.tuma-irumu=Tuma-Irumu -controlledvocabulary.language.tumak=Tumak -controlledvocabulary.language.tumari_kanuri=Tumari Kanuri -controlledvocabulary.language.tumbuka=Tumbuka -controlledvocabulary.language.tumi=Tumi -controlledvocabulary.language.tumleo=Tumleo -controlledvocabulary.language.tumshuqese=Tumshuqese -controlledvocabulary.language.tumtum=Tumtum -controlledvocabulary.language.tumulung_sisaala=Tumulung Sisaala -controlledvocabulary.language.tumzabt=Tumzabt -controlledvocabulary.language.tundra_enets=Tundra Enets -controlledvocabulary.language.tunen=Tunen -controlledvocabulary.language.tungag=Tungag -controlledvocabulary.language.tunggare=Tunggare -controlledvocabulary.language.tunia=Tunia -controlledvocabulary.language.tunica=Tunica -controlledvocabulary.language.tunisian_arabic=Tunisian Arabic -controlledvocabulary.language.tunisian_sign_language=Tunisian Sign Language -controlledvocabulary.language.tunjung=Tunjung -controlledvocabulary.language.tunni=Tunni -controlledvocabulary.language.tunzu=Tunzu -controlledvocabulary.language.tuotomb=Tuotomb -controlledvocabulary.language.tupari=Tuparí -controlledvocabulary.language.tupinamba=Tupinambá -controlledvocabulary.language.tupinikin=Tupinikin -controlledvocabulary.language.tupuri=Tupuri -controlledvocabulary.language.turaka=Turaka -controlledvocabulary.language.turi=Turi -controlledvocabulary.language.turiwara=Turiwára -controlledvocabulary.language.turka=Turka -controlledvocabulary.language.turkana=Turkana -controlledvocabulary.language.turkish=Turkish -controlledvocabulary.language.turkish_sign_language=Turkish Sign Language -controlledvocabulary.language.turkmen=Turkmen -controlledvocabulary.language.turks_and_caicos_creole_english=Turks And Caicos Creole English -controlledvocabulary.language.turoyo=Turoyo -controlledvocabulary.language.turumsa=Turumsa -controlledvocabulary.language.turung=Turung -controlledvocabulary.language.tuscarora=Tuscarora -controlledvocabulary.language.tutelo=Tutelo -controlledvocabulary.language.tutong=Tutong -controlledvocabulary.language.tutsa_naga=Tutsa Naga -controlledvocabulary.language.tutuba=Tutuba -controlledvocabulary.language.tututepec_mixtec=Tututepec Mixtec -controlledvocabulary.language.tututni=Tututni -controlledvocabulary.language.tuvalu=Tuvalu -controlledvocabulary.language.tuvinian=Tuvinian -controlledvocabulary.language.tuwali_ifugao=Tuwali Ifugao -controlledvocabulary.language.tuwari=Tuwari -controlledvocabulary.language.tuwuli=Tuwuli -controlledvocabulary.language.tuxinawa=Tuxináwa -controlledvocabulary.language.tuxa=Tuxá -controlledvocabulary.language.tuyuca=Tuyuca -controlledvocabulary.language.twana=Twana -controlledvocabulary.language.twendi=Twendi -controlledvocabulary.language.twents=Twents -controlledvocabulary.language.twi=Twi -controlledvocabulary.language.tyap=Tyap -controlledvocabulary.language.tz'utujil=Tz'utujil -controlledvocabulary.language.tzeltal=Tzeltal -controlledvocabulary.language.tzotzil=Tzotzil -controlledvocabulary.language.tay=Tày -controlledvocabulary.language.tay_sa_pa=Tày Sa Pa -controlledvocabulary.language.tay_tac=Tày Tac -controlledvocabulary.language.teen=Téén -controlledvocabulary.language.tubatulabal=Tübatulabal -controlledvocabulary.language.u=U -controlledvocabulary.language.uab_meto=Uab Meto -controlledvocabulary.language.uamue=Uamué -controlledvocabulary.language.uare=Uare -controlledvocabulary.language.ubaghara=Ubaghara -controlledvocabulary.language.ubang=Ubang -controlledvocabulary.language.ubi=Ubi -controlledvocabulary.language.ubir=Ubir -controlledvocabulary.language.ubykh=Ubykh -controlledvocabulary.language.ucayali-yurua_asheninka=Ucayali-Yurúa Ashéninka -controlledvocabulary.language.uda=Uda -controlledvocabulary.language.udi=Udi -controlledvocabulary.language.udihe=Udihe -controlledvocabulary.language.udmurt=Udmurt -controlledvocabulary.language.uduk=Uduk -controlledvocabulary.language.ufim=Ufim -controlledvocabulary.language.ugandan_sign_language=Ugandan Sign Language -controlledvocabulary.language.ugaritic=Ugaritic -controlledvocabulary.language.ughele=Ughele -controlledvocabulary.language.ugong=Ugong -controlledvocabulary.language.uhami=Uhami -controlledvocabulary.language.uighur,_uyghur=Uighur, Uyghur -controlledvocabulary.language.uisai=Uisai -controlledvocabulary.language.ujir=Ujir -controlledvocabulary.language.ukaan=Ukaan -controlledvocabulary.language.ukhwejo=Ukhwejo -controlledvocabulary.language.ukit=Ukit -controlledvocabulary.language.ukpe-bayobiri=Ukpe-Bayobiri -controlledvocabulary.language.ukpet-ehom=Ukpet-Ehom -controlledvocabulary.language.ukrainian=Ukrainian -controlledvocabulary.language.ukrainian_sign_language=Ukrainian Sign Language -controlledvocabulary.language.ukue=Ukue -controlledvocabulary.language.ukuriguma=Ukuriguma -controlledvocabulary.language.ukwa=Ukwa -controlledvocabulary.language.ukwuani-aboh-ndoni=Ukwuani-Aboh-Ndoni -controlledvocabulary.language.ulau-suain=Ulau-Suain -controlledvocabulary.language.ulch=Ulch -controlledvocabulary.language.ulithian=Ulithian -controlledvocabulary.language.ullatan=Ullatan -controlledvocabulary.language.ulukwumi=Ulukwumi -controlledvocabulary.language.ulumanda'=Ulumanda' -controlledvocabulary.language.ulwa=Ulwa -controlledvocabulary.language.uma=Uma -controlledvocabulary.language.uma'_lasan=Uma' Lasan -controlledvocabulary.language.uma'_lung=Uma' Lung -controlledvocabulary.language.umanakaina=Umanakaina -controlledvocabulary.language.umatilla=Umatilla -controlledvocabulary.language.umbindhamu=Umbindhamu -controlledvocabulary.language.umbrian=Umbrian -controlledvocabulary.language.umbu-ungu=Umbu-Ungu -controlledvocabulary.language.umbugarla=Umbugarla -controlledvocabulary.language.umbundu=Umbundu -controlledvocabulary.language.ume_sami=Ume Sami -controlledvocabulary.language.umeda=Umeda -controlledvocabulary.language.umiida=Umiida -controlledvocabulary.language.umiray_dumaget_agta=Umiray Dumaget Agta -controlledvocabulary.language.umon=Umon -controlledvocabulary.language.umotina=Umotína -controlledvocabulary.language.umpila=Umpila -controlledvocabulary.language.una=Una -controlledvocabulary.language.unami=Unami -controlledvocabulary.language.uncoded_languages=Uncoded languages -controlledvocabulary.language.unde_kaili=Unde Kaili -controlledvocabulary.language.undetermined=Undetermined -controlledvocabulary.language.uneapa=Uneapa -controlledvocabulary.language.uneme=Uneme -controlledvocabulary.language.unggaranggu=Unggaranggu -controlledvocabulary.language.unggumi=Unggumi -controlledvocabulary.language.uni=Uni -controlledvocabulary.language.unserdeutsch=Unserdeutsch -controlledvocabulary.language.unua=Unua -controlledvocabulary.language.unubahe=Unubahe -controlledvocabulary.language.upper_chehalis=Upper Chehalis -controlledvocabulary.language.upper_grand_valley_dani=Upper Grand Valley Dani -controlledvocabulary.language.upper_guinea_crioulo=Upper Guinea Crioulo -controlledvocabulary.language.upper_kinabatangan=Upper Kinabatangan -controlledvocabulary.language.upper_kuskokwim=Upper Kuskokwim -controlledvocabulary.language.upper_necaxa_totonac=Upper Necaxa Totonac -controlledvocabulary.language.upper_saxon=Upper Saxon -controlledvocabulary.language.upper_sorbian=Upper Sorbian -controlledvocabulary.language.upper_ta'oih=Upper Ta'oih -controlledvocabulary.language.upper_tanana=Upper Tanana -controlledvocabulary.language.upper_taromi=Upper Taromi -controlledvocabulary.language.upper_umpqua=Upper Umpqua -controlledvocabulary.language.ura_(papua_new_guinea)=Ura (Papua New Guinea) -controlledvocabulary.language.ura_(vanuatu)=Ura (Vanuatu) -controlledvocabulary.language.uradhi=Uradhi -controlledvocabulary.language.urak_lawoi'=Urak Lawoi' -controlledvocabulary.language.urali=Urali -controlledvocabulary.language.urapmin=Urapmin -controlledvocabulary.language.urarina=Urarina -controlledvocabulary.language.urartian=Urartian -controlledvocabulary.language.urat=Urat -controlledvocabulary.language.urdu=Urdu -controlledvocabulary.language.urhobo=Urhobo -controlledvocabulary.language.uri=Uri -controlledvocabulary.language.urigina=Urigina -controlledvocabulary.language.urim=Urim -controlledvocabulary.language.urimo=Urimo -controlledvocabulary.language.uripiv-wala-rano-atchin=Uripiv-Wala-Rano-Atchin -controlledvocabulary.language.urningangg=Urningangg -controlledvocabulary.language.uru=Uru -controlledvocabulary.language.uru-eu-wau-wau=Uru-Eu-Wau-Wau -controlledvocabulary.language.uru-pa-in=Uru-Pa-In -controlledvocabulary.language.uruangnirin=Uruangnirin -controlledvocabulary.language.uruava=Uruava -controlledvocabulary.language.urubu-kaapor=Urubú-Kaapor -controlledvocabulary.language.urubu-kaapor_sign_language=Urubú-Kaapor Sign Language -controlledvocabulary.language.uruguayan_sign_language=Uruguayan Sign Language -controlledvocabulary.language.urum=Urum -controlledvocabulary.language.urumi=Urumi -controlledvocabulary.language.usaghade=Usaghade -controlledvocabulary.language.usan=Usan -controlledvocabulary.language.usarufa=Usarufa -controlledvocabulary.language.ushojo=Ushojo -controlledvocabulary.language.usila_chinantec=Usila Chinantec -controlledvocabulary.language.usku=Usku -controlledvocabulary.language.uspanteco=Uspanteco -controlledvocabulary.language.usui=Usui -controlledvocabulary.language.utarmbung=Utarmbung -controlledvocabulary.language.ute-southern_paiute=Ute-Southern Paiute -controlledvocabulary.language.utu=Utu -controlledvocabulary.language.uvbie=Uvbie -controlledvocabulary.language.uya=Uya -controlledvocabulary.language.uyajitaya=Uyajitaya -controlledvocabulary.language.uzbek=Uzbek -controlledvocabulary.language.uzbeki_arabic=Uzbeki Arabic -controlledvocabulary.language.uzekwe=Uzekwe -controlledvocabulary.language.vaagri_booli=Vaagri Booli -controlledvocabulary.language.vafsi=Vafsi -controlledvocabulary.language.vaghri=Vaghri -controlledvocabulary.language.vaghua=Vaghua -controlledvocabulary.language.vagla=Vagla -controlledvocabulary.language.vai=Vai -controlledvocabulary.language.vaiphei=Vaiphei -controlledvocabulary.language.vale=Vale -controlledvocabulary.language.valencian_sign_language=Valencian Sign Language -controlledvocabulary.language.valle_nacional_chinantec=Valle Nacional Chinantec -controlledvocabulary.language.valley_maidu=Valley Maidu -controlledvocabulary.language.valman=Valman -controlledvocabulary.language.valpei=Valpei -controlledvocabulary.language.vamale=Vamale -controlledvocabulary.language.vame=Vame -controlledvocabulary.language.vandalic=Vandalic -controlledvocabulary.language.vangunu=Vangunu -controlledvocabulary.language.vanimo=Vanimo -controlledvocabulary.language.vano=Vano -controlledvocabulary.language.vanuma=Vanuma -controlledvocabulary.language.vao=Vao -controlledvocabulary.language.varhadi-nagpuri=Varhadi-Nagpuri -controlledvocabulary.language.varisi=Varisi -controlledvocabulary.language.varli=Varli -controlledvocabulary.language.vasavi=Vasavi -controlledvocabulary.language.veddah=Veddah -controlledvocabulary.language.vedic_sanskrit=Vedic Sanskrit -controlledvocabulary.language.vehes=Vehes -controlledvocabulary.language.veluws=Veluws -controlledvocabulary.language.vemgo-mabas=Vemgo-Mabas -controlledvocabulary.language.venda=Venda -controlledvocabulary.language.venetian=Venetian -controlledvocabulary.language.venetic=Venetic -controlledvocabulary.language.venezuelan_sign_language=Venezuelan Sign Language -controlledvocabulary.language.vengo=Vengo -controlledvocabulary.language.ventureno=Ventureño -controlledvocabulary.language.veps=Veps -controlledvocabulary.language.vera'a=Vera'a -controlledvocabulary.language.vestinian=Vestinian -controlledvocabulary.language.vidunda=Vidunda -controlledvocabulary.language.viemo=Viemo -controlledvocabulary.language.vietnamese=Vietnamese -controlledvocabulary.language.vilela=Vilela -controlledvocabulary.language.vili=Vili -controlledvocabulary.language.villa_viciosa_agta=Villa Viciosa Agta -controlledvocabulary.language.vincentian_creole_english=Vincentian Creole English -controlledvocabulary.language.vinmavis=Vinmavis -controlledvocabulary.language.vinza=Vinza -controlledvocabulary.language.virgin_islands_creole_english=Virgin Islands Creole English -controlledvocabulary.language.vishavan=Vishavan -controlledvocabulary.language.viti=Viti -controlledvocabulary.language.vitou=Vitou -controlledvocabulary.language.vitu=Vitu -controlledvocabulary.language.vlaams=Vlaams -controlledvocabulary.language.vlaamse_gebarentaal=Vlaamse Gebarentaal -controlledvocabulary.language.vlax_romani=Vlax Romani -controlledvocabulary.language.volapuk=Volapük -controlledvocabulary.language.volscian=Volscian -controlledvocabulary.language.vono=Vono -controlledvocabulary.language.voro=Voro -controlledvocabulary.language.votic=Votic -controlledvocabulary.language.vumbu=Vumbu -controlledvocabulary.language.vunapu=Vunapu -controlledvocabulary.language.vunjo=Vunjo -controlledvocabulary.language.vures=Vurës -controlledvocabulary.language.vute=Vute -controlledvocabulary.language.vwanji=Vwanji -controlledvocabulary.language.wa=Wa -controlledvocabulary.language.wa'ema=Wa'ema -controlledvocabulary.language.waama=Waama -controlledvocabulary.language.waamwang=Waamwang -controlledvocabulary.language.waata=Waata -controlledvocabulary.language.wab=Wab -controlledvocabulary.language.wabo=Wabo -controlledvocabulary.language.waboda=Waboda -controlledvocabulary.language.waci_gbe=Waci Gbe -controlledvocabulary.language.wadaginam=Wadaginam -controlledvocabulary.language.waddar=Waddar -controlledvocabulary.language.wadi_wadi=Wadi Wadi -controlledvocabulary.language.wadikali=Wadikali -controlledvocabulary.language.wadiyara_koli=Wadiyara Koli -controlledvocabulary.language.wadjabangayi=Wadjabangayi -controlledvocabulary.language.wadjiginy=Wadjiginy -controlledvocabulary.language.wadjigu=Wadjigu -controlledvocabulary.language.wae_rana=Wae Rana -controlledvocabulary.language.waffa=Waffa -controlledvocabulary.language.wagawaga=Wagawaga -controlledvocabulary.language.wagaya=Wagaya -controlledvocabulary.language.wagdi=Wagdi -controlledvocabulary.language.wagi=Wagi -controlledvocabulary.language.wagiman=Wagiman -controlledvocabulary.language.wahau_kayan=Wahau Kayan -controlledvocabulary.language.wahau_kenyah=Wahau Kenyah -controlledvocabulary.language.wahgi=Wahgi -controlledvocabulary.language.waigali=Waigali -controlledvocabulary.language.waigeo=Waigeo -controlledvocabulary.language.wailaki=Wailaki -controlledvocabulary.language.wailapa=Wailapa -controlledvocabulary.language.waima=Waima -controlledvocabulary.language.waima'a=Waima'a -controlledvocabulary.language.waimaha=Waimaha -controlledvocabulary.language.waimiri-atroari=Waimiri-Atroari -controlledvocabulary.language.waioli=Waioli -controlledvocabulary.language.waiwai=Waiwai -controlledvocabulary.language.waja=Waja -controlledvocabulary.language.wajarri=Wajarri -controlledvocabulary.language.wajuk=Wajuk -controlledvocabulary.language.waka=Waka -controlledvocabulary.language.wakabunga=Wakabunga -controlledvocabulary.language.wakawaka=Wakawaka -controlledvocabulary.language.wakde=Wakde -controlledvocabulary.language.wakhi=Wakhi -controlledvocabulary.language.wakona=Wakoná -controlledvocabulary.language.wala=Wala -controlledvocabulary.language.walak=Walak -controlledvocabulary.language.walangama=Walangama -controlledvocabulary.language.wali_(ghana)=Wali (Ghana) -controlledvocabulary.language.wali_(sudan)=Wali (Sudan) -controlledvocabulary.language.waling=Waling -controlledvocabulary.language.walio=Walio -controlledvocabulary.language.walla_walla=Walla Walla -controlledvocabulary.language.wallisian=Wallisian -controlledvocabulary.language.walloon=Walloon -controlledvocabulary.language.walmajarri=Walmajarri -controlledvocabulary.language.walser=Walser -controlledvocabulary.language.walungge=Walungge -controlledvocabulary.language.waluwarra=Waluwarra -controlledvocabulary.language.wamas=Wamas -controlledvocabulary.language.wambaya=Wambaya -controlledvocabulary.language.wambon=Wambon -controlledvocabulary.language.wambule=Wambule -controlledvocabulary.language.wamesa=Wamesa -controlledvocabulary.language.wamey=Wamey -controlledvocabulary.language.wamin=Wamin -controlledvocabulary.language.wampanoag=Wampanoag -controlledvocabulary.language.wampar=Wampar -controlledvocabulary.language.wampur=Wampur -controlledvocabulary.language.wan=Wan -controlledvocabulary.language.wanap=Wanap -controlledvocabulary.language.wancho_naga=Wancho Naga -controlledvocabulary.language.wanda=Wanda -controlledvocabulary.language.wandala=Wandala -controlledvocabulary.language.wandarang=Wandarang -controlledvocabulary.language.wandji=Wandji -controlledvocabulary.language.waneci=Waneci -controlledvocabulary.language.wanga=Wanga -controlledvocabulary.language.wangaaybuwan-ngiyambaa=Wangaaybuwan-Ngiyambaa -controlledvocabulary.language.wanggamala=Wanggamala -controlledvocabulary.language.wanggom=Wanggom -controlledvocabulary.language.wangkangurru=Wangkangurru -controlledvocabulary.language.wangkayutyuru=Wangkayutyuru -controlledvocabulary.language.wangkumara=Wangkumara -controlledvocabulary.language.wannu=Wannu -controlledvocabulary.language.wano=Wano -controlledvocabulary.language.wantoat=Wantoat -controlledvocabulary.language.wanukaka=Wanukaka -controlledvocabulary.language.wanyi=Wanyi -controlledvocabulary.language.wane=Wané -controlledvocabulary.language.waorani=Waorani -controlledvocabulary.language.wapan=Wapan -controlledvocabulary.language.wapishana=Wapishana -controlledvocabulary.language.wappo=Wappo -controlledvocabulary.language.war-jaintia=War-Jaintia -controlledvocabulary.language.wara=Wara -controlledvocabulary.language.warao=Warao -controlledvocabulary.language.waray_(australia)=Waray (Australia) -controlledvocabulary.language.waray_(philippines)=Waray (Philippines) -controlledvocabulary.language.wardaman=Wardaman -controlledvocabulary.language.wardandi=Wardandi -controlledvocabulary.language.warembori=Warembori -controlledvocabulary.language.wares=Wares -controlledvocabulary.language.waris=Waris -controlledvocabulary.language.waritai=Waritai -controlledvocabulary.language.wariyangga=Wariyangga -controlledvocabulary.language.warji=Warji -controlledvocabulary.language.warkay-bipim=Warkay-Bipim -controlledvocabulary.language.warlmanpa=Warlmanpa -controlledvocabulary.language.warlpiri=Warlpiri -controlledvocabulary.language.warnang=Warnang -controlledvocabulary.language.warnman=Warnman -controlledvocabulary.language.waropen=Waropen -controlledvocabulary.language.warrgamay=Warrgamay -controlledvocabulary.language.warrwa=Warrwa -controlledvocabulary.language.waru=Waru -controlledvocabulary.language.warumungu=Warumungu -controlledvocabulary.language.waruna=Waruna -controlledvocabulary.language.warungu=Warungu -controlledvocabulary.language.warwar_feni=Warwar Feni -controlledvocabulary.language.wasa=Wasa -controlledvocabulary.language.wasco-wishram=Wasco-Wishram -controlledvocabulary.language.wasembo=Wasembo -controlledvocabulary.language.washo=Washo -controlledvocabulary.language.waskia=Waskia -controlledvocabulary.language.wasu=Wasu -controlledvocabulary.language.watakataui=Watakataui -controlledvocabulary.language.watam=Watam -controlledvocabulary.language.wathawurrung=Wathawurrung -controlledvocabulary.language.watiwa=Watiwa -controlledvocabulary.language.watubela=Watubela -controlledvocabulary.language.waube=Waube -controlledvocabulary.language.waura=Waurá -controlledvocabulary.language.wauyai=Wauyai -controlledvocabulary.language.wawa=Wawa -controlledvocabulary.language.wawonii=Wawonii -controlledvocabulary.language.waxianghua=Waxianghua -controlledvocabulary.language.wayampi=Wayampi -controlledvocabulary.language.wayana=Wayana -controlledvocabulary.language.wayanad_chetti=Wayanad Chetti -controlledvocabulary.language.wayoro=Wayoró -controlledvocabulary.language.wayu=Wayu -controlledvocabulary.language.wayuu=Wayuu -controlledvocabulary.language.wedau=Wedau -controlledvocabulary.language.weh=Weh -controlledvocabulary.language.wejewa=Wejewa -controlledvocabulary.language.welaun=Welaun -controlledvocabulary.language.weliki=Weliki -controlledvocabulary.language.welsh=Welsh -controlledvocabulary.language.welsh_romani=Welsh Romani -controlledvocabulary.language.wemale=Wemale -controlledvocabulary.language.wemba_wemba=Wemba Wemba -controlledvocabulary.language.weme_gbe=Weme Gbe -controlledvocabulary.language.wendat=Wendat -controlledvocabulary.language.wergaia=Wergaia -controlledvocabulary.language.weri=Weri -controlledvocabulary.language.wersing=Wersing -controlledvocabulary.language.west_albay_bikol=West Albay Bikol -controlledvocabulary.language.west_ambae=West Ambae -controlledvocabulary.language.west_bengal_sign_language=West Bengal Sign Language -controlledvocabulary.language.west_berawan=West Berawan -controlledvocabulary.language.west_central_banda=West Central Banda -controlledvocabulary.language.west_central_oromo=West Central Oromo -controlledvocabulary.language.west_coast_bajau=West Coast Bajau -controlledvocabulary.language.west_damar=West Damar -controlledvocabulary.language.west_goodenough=West Goodenough -controlledvocabulary.language.west_kewa=West Kewa -controlledvocabulary.language.west_lembata=West Lembata -controlledvocabulary.language.west_makian=West Makian -controlledvocabulary.language.west_masela=West Masela -controlledvocabulary.language.west_tarangan=West Tarangan -controlledvocabulary.language.west_uvean=West Uvean -controlledvocabulary.language.west_yugur=West Yugur -controlledvocabulary.language.west-central_limba=West-Central Limba -controlledvocabulary.language.western_abnaki=Western Abnaki -controlledvocabulary.language.western_apache=Western Apache -controlledvocabulary.language.western_armenian=Western Armenian -controlledvocabulary.language.western_arrarnta=Western Arrarnta -controlledvocabulary.language.western_balochi=Western Balochi -controlledvocabulary.language.western_bolivian_guarani=Western Bolivian Guaraní -controlledvocabulary.language.western_bru=Western Bru -controlledvocabulary.language.western_bukidnon_manobo=Western Bukidnon Manobo -controlledvocabulary.language.western_cham=Western Cham -controlledvocabulary.language.western_dani=Western Dani -controlledvocabulary.language.western_durango_nahuatl=Western Durango Nahuatl -controlledvocabulary.language.western_fijian=Western Fijian -controlledvocabulary.language.western_frisian=Western Frisian -controlledvocabulary.language.western_highland_chatino=Western Highland Chatino -controlledvocabulary.language.western_highland_purepecha=Western Highland Purepecha -controlledvocabulary.language.western_huasteca_nahuatl=Western Huasteca Nahuatl -controlledvocabulary.language.western_juxtlahuaca_mixtec=Western Juxtlahuaca Mixtec -controlledvocabulary.language.western_kanjobal=Western Kanjobal -controlledvocabulary.language.western_karaboro=Western Karaboro -controlledvocabulary.language.western_katu=Western Katu -controlledvocabulary.language.western_kayah=Western Kayah -controlledvocabulary.language.western_keres=Western Keres -controlledvocabulary.language.western_krahn=Western Krahn -controlledvocabulary.language.western_lalu=Western Lalu -controlledvocabulary.language.western_lawa=Western Lawa -controlledvocabulary.language.western_magar=Western Magar -controlledvocabulary.language.western_maninkakan=Western Maninkakan -controlledvocabulary.language.western_mari=Western Mari -controlledvocabulary.language.western_mashan_hmong=Western Mashan Hmong -controlledvocabulary.language.western_meohang=Western Meohang -controlledvocabulary.language.western_minyag=Western Minyag -controlledvocabulary.language.western_muria=Western Muria -controlledvocabulary.language.western_neo-aramaic=Western Neo-Aramaic -controlledvocabulary.language.western_niger_fulfulde=Western Niger Fulfulde -controlledvocabulary.language.western_ojibwa=Western Ojibwa -controlledvocabulary.language.western_panjabi=Western Panjabi -controlledvocabulary.language.western_parbate_kham=Western Parbate Kham -controlledvocabulary.language.western_penan=Western Penan -controlledvocabulary.language.western_sisaala=Western Sisaala -controlledvocabulary.language.western_subanon=Western Subanon -controlledvocabulary.language.western_tamang=Western Tamang -controlledvocabulary.language.western_tawbuid=Western Tawbuid -controlledvocabulary.language.western_tlacolula_valley_zapotec=Western Tlacolula Valley Zapotec -controlledvocabulary.language.western_totonac=Western Totonac -controlledvocabulary.language.western_tunebo=Western Tunebo -controlledvocabulary.language.western_xiangxi_miao=Western Xiangxi Miao -controlledvocabulary.language.western_xwla_gbe=Western Xwla Gbe -controlledvocabulary.language.western_yiddish=Western Yiddish -controlledvocabulary.language.westphalien=Westphalien -controlledvocabulary.language.wetamut=Wetamut -controlledvocabulary.language.wewaw=Wewaw -controlledvocabulary.language.weyto=Weyto -controlledvocabulary.language.white_gelao=White Gelao -controlledvocabulary.language.white_lachi=White Lachi -controlledvocabulary.language.whitesands=Whitesands -controlledvocabulary.language.wiarumus=Wiarumus -controlledvocabulary.language.wichita=Wichita -controlledvocabulary.language.wichi_lhamtes_guisnay=Wichí Lhamtés Güisnay -controlledvocabulary.language.wichi_lhamtes_nocten=Wichí Lhamtés Nocten -controlledvocabulary.language.wichi_lhamtes_vejoz=Wichí Lhamtés Vejoz -controlledvocabulary.language.wik_ngathan=Wik Ngathan -controlledvocabulary.language.wik-epa=Wik-Epa -controlledvocabulary.language.wik-iiyanh=Wik-Iiyanh -controlledvocabulary.language.wik-keyangan=Wik-Keyangan -controlledvocabulary.language.wik-me'anha=Wik-Me'anha -controlledvocabulary.language.wik-mungkan=Wik-Mungkan -controlledvocabulary.language.wikalkan=Wikalkan -controlledvocabulary.language.wikngenchera=Wikngenchera -controlledvocabulary.language.wilawila=Wilawila -controlledvocabulary.language.wintu=Wintu -controlledvocabulary.language.winye=Winyé -controlledvocabulary.language.wipi=Wipi -controlledvocabulary.language.wiradjuri=Wiradjuri -controlledvocabulary.language.wirafed=Wiraféd -controlledvocabulary.language.wirangu=Wirangu -controlledvocabulary.language.wiru=Wiru -controlledvocabulary.language.wiyot=Wiyot -controlledvocabulary.language.woccon=Woccon -controlledvocabulary.language.wogamusin=Wogamusin -controlledvocabulary.language.wogeo=Wogeo -controlledvocabulary.language.woi=Woi -controlledvocabulary.language.woiwurrung=Woiwurrung -controlledvocabulary.language.wojenaka=Wojenaka -controlledvocabulary.language.wolane=Wolane -controlledvocabulary.language.wolani=Wolani -controlledvocabulary.language.wolaytta=Wolaytta -controlledvocabulary.language.woleaian=Woleaian -controlledvocabulary.language.wolio=Wolio -controlledvocabulary.language.wolof=Wolof -controlledvocabulary.language.wom_(nigeria)=Wom (Nigeria) -controlledvocabulary.language.wom_(papua_new_guinea)=Wom (Papua New Guinea) -controlledvocabulary.language.womo=Womo -controlledvocabulary.language.wongo=Wongo -controlledvocabulary.language.woods_cree=Woods Cree -controlledvocabulary.language.woria=Woria -controlledvocabulary.language.worimi=Worimi -controlledvocabulary.language.worodougou=Worodougou -controlledvocabulary.language.worrorra=Worrorra -controlledvocabulary.language.wotapuri-katarqalai=Wotapuri-Katarqalai -controlledvocabulary.language.wotjobaluk=Wotjobaluk -controlledvocabulary.language.wotu=Wotu -controlledvocabulary.language.woun_meu=Woun Meu -controlledvocabulary.language.written_oirat=Written Oirat -controlledvocabulary.language.wu_chinese=Wu Chinese -controlledvocabulary.language.wuding-luquan_yi=Wuding-Luquan Yi -controlledvocabulary.language.wudu=Wudu -controlledvocabulary.language.wuliwuli=Wuliwuli -controlledvocabulary.language.wulna=Wulna -controlledvocabulary.language.wumboko=Wumboko -controlledvocabulary.language.wumbvu=Wumbvu -controlledvocabulary.language.wumeng_nasu=Wumeng Nasu -controlledvocabulary.language.wunai_bunu=Wunai Bunu -controlledvocabulary.language.wunambal=Wunambal -controlledvocabulary.language.wunumara=Wunumara -controlledvocabulary.language.wurrugu=Wurrugu -controlledvocabulary.language.wusa_nasu=Wusa Nasu -controlledvocabulary.language.wushi=Wushi -controlledvocabulary.language.wusi=Wusi -controlledvocabulary.language.wutung=Wutung -controlledvocabulary.language.wutunhua=Wutunhua -controlledvocabulary.language.wuvulu-aua=Wuvulu-Aua -controlledvocabulary.language.wuzlam=Wuzlam -controlledvocabulary.language.wyandot=Wyandot -controlledvocabulary.language.wymysorys=Wymysorys -controlledvocabulary.language.wapha=Wãpha -controlledvocabulary.language.we_northern=Wè Northern -controlledvocabulary.language.we_southern=Wè Southern -controlledvocabulary.language.we_western=Wè Western -controlledvocabulary.language.xaasongaxango=Xaasongaxango -controlledvocabulary.language.xadani_zapotec=Xadani Zapotec -controlledvocabulary.language.xakriaba=Xakriabá -controlledvocabulary.language.xamtanga=Xamtanga -controlledvocabulary.language.xanaguia_zapotec=Xanaguía Zapotec -controlledvocabulary.language.xavante=Xavánte -controlledvocabulary.language.xerente=Xerénte -controlledvocabulary.language.xeta=Xetá -controlledvocabulary.language.xhosa=Xhosa -controlledvocabulary.language.xiang_chinese=Xiang Chinese -controlledvocabulary.language.xibe=Xibe -controlledvocabulary.language.xicotepec_de_juarez_totonac=Xicotepec De Juárez Totonac -controlledvocabulary.language.xinca=Xinca -controlledvocabulary.language.xingu_asurini=Xingú Asuriní -controlledvocabulary.language.xipaya=Xipaya -controlledvocabulary.language.xiri=Xiri -controlledvocabulary.language.xiriana=Xiriâna -controlledvocabulary.language.xishanba_lalo=Xishanba Lalo -controlledvocabulary.language.xokleng=Xokleng -controlledvocabulary.language.xukuru=Xukurú -controlledvocabulary.language.xwela_gbe=Xwela Gbe -controlledvocabulary.language.xaracuu=Xârâcùù -controlledvocabulary.language.xaragure=Xârâgurè -controlledvocabulary.language.yaaku=Yaaku -controlledvocabulary.language.yabarana=Yabarana -controlledvocabulary.language.yabaana=Yabaâna -controlledvocabulary.language.yabem=Yabem -controlledvocabulary.language.yaben=Yaben -controlledvocabulary.language.yabong=Yabong -controlledvocabulary.language.yabula_yabula=Yabula Yabula -controlledvocabulary.language.yace=Yace -controlledvocabulary.language.yaeyama=Yaeyama -controlledvocabulary.language.yafi=Yafi -controlledvocabulary.language.yagara=Yagara -controlledvocabulary.language.yagaria=Yagaria -controlledvocabulary.language.yagnobi=Yagnobi -controlledvocabulary.language.yagomi=Yagomi -controlledvocabulary.language.yagua=Yagua -controlledvocabulary.language.yagwoia=Yagwoia -controlledvocabulary.language.yahadian=Yahadian -controlledvocabulary.language.yahang=Yahang -controlledvocabulary.language.yahuna=Yahuna -controlledvocabulary.language.yaka_(central_african_republic)=Yaka (Central African Republic) -controlledvocabulary.language.yaka_(congo)=Yaka (Congo) -controlledvocabulary.language.yaka_(democratic_republic_of_congo)=Yaka (Democratic Republic of Congo) -controlledvocabulary.language.yakaikeke=Yakaikeke -controlledvocabulary.language.yakama=Yakama -controlledvocabulary.language.yakan=Yakan -controlledvocabulary.language.yakha=Yakha -controlledvocabulary.language.yakoma=Yakoma -controlledvocabulary.language.yakut=Yakut -controlledvocabulary.language.yala=Yala -controlledvocabulary.language.yalahatan=Yalahatan -controlledvocabulary.language.yalakalore=Yalakalore -controlledvocabulary.language.yalarnnga=Yalarnnga -controlledvocabulary.language.yale=Yale -controlledvocabulary.language.yaleba=Yaleba -controlledvocabulary.language.yalunka=Yalunka -controlledvocabulary.language.yalalag_zapotec=Yalálag Zapotec -controlledvocabulary.language.yamap=Yamap -controlledvocabulary.language.yamba=Yamba -controlledvocabulary.language.yambes=Yambes -controlledvocabulary.language.yambeta=Yambeta -controlledvocabulary.language.yamdena=Yamdena -controlledvocabulary.language.yameo=Yameo -controlledvocabulary.language.yami=Yami -controlledvocabulary.language.yaminahua=Yaminahua -controlledvocabulary.language.yamna=Yamna -controlledvocabulary.language.yamongeri=Yamongeri -controlledvocabulary.language.yamphu=Yamphu -controlledvocabulary.language.yan-nhangu=Yan-nhangu -controlledvocabulary.language.yan-nhaŋu_sign_language=Yan-nhaŋu Sign Language -controlledvocabulary.language.yana=Yana -controlledvocabulary.language.yanahuanca_pasco_quechua=Yanahuanca Pasco Quechua -controlledvocabulary.language.yanda=Yanda -controlledvocabulary.language.yanda_dom_dogon=Yanda Dom Dogon -controlledvocabulary.language.yandjibara=Yandjibara -controlledvocabulary.language.yandruwandha=Yandruwandha -controlledvocabulary.language.yanesha'=Yanesha' -controlledvocabulary.language.yang_zhuang=Yang Zhuang -controlledvocabulary.language.yangben=Yangben -controlledvocabulary.language.yangkam=Yangkam -controlledvocabulary.language.yangman=Yangman -controlledvocabulary.language.yango=Yango -controlledvocabulary.language.yangulam=Yangulam -controlledvocabulary.language.yangum_dey=Yangum Dey -controlledvocabulary.language.yangum_gel=Yangum Gel -controlledvocabulary.language.yangum_mon=Yangum Mon -controlledvocabulary.language.yankunytjatjara=Yankunytjatjara -controlledvocabulary.language.yanomamo=Yanomamö -controlledvocabulary.language.yanomami=Yanomámi -controlledvocabulary.language.yansi=Yansi -controlledvocabulary.language.yanyuwa=Yanyuwa -controlledvocabulary.language.yao=Yao -controlledvocabulary.language.yaosakor_asmat=Yaosakor Asmat -controlledvocabulary.language.yaoure=Yaouré -controlledvocabulary.language.yapese=Yapese -controlledvocabulary.language.yapunda=Yapunda -controlledvocabulary.language.yaqay=Yaqay -controlledvocabulary.language.yaqui=Yaqui -controlledvocabulary.language.yarawata=Yarawata -controlledvocabulary.language.yardliyawarra=Yardliyawarra -controlledvocabulary.language.yareba=Yareba -controlledvocabulary.language.yareni_zapotec=Yareni Zapotec -controlledvocabulary.language.yarluyandi=Yarluyandi -controlledvocabulary.language.yaroame=Yaroamë -controlledvocabulary.language.yarsun=Yarsun -controlledvocabulary.language.yasa=Yasa -controlledvocabulary.language.yassic=Yassic -controlledvocabulary.language.yatay=Yatay -controlledvocabulary.language.yatee_zapotec=Yatee Zapotec -controlledvocabulary.language.yatzachi_zapotec=Yatzachi Zapotec -controlledvocabulary.language.yau_(morobe_province)=Yau (Morobe Province) -controlledvocabulary.language.yau_(sandaun_province)=Yau (Sandaun Province) -controlledvocabulary.language.yaul=Yaul -controlledvocabulary.language.yauma=Yauma -controlledvocabulary.language.yaur=Yaur -controlledvocabulary.language.yautepec_zapotec=Yautepec Zapotec -controlledvocabulary.language.yauyos_quechua=Yauyos Quechua -controlledvocabulary.language.yavitero=Yavitero -controlledvocabulary.language.yawa=Yawa -controlledvocabulary.language.yawalapiti=Yawalapití -controlledvocabulary.language.yawanawa=Yawanawa -controlledvocabulary.language.yawarawarga=Yawarawarga -controlledvocabulary.language.yaweyuha=Yaweyuha -controlledvocabulary.language.yawijibaya=Yawijibaya -controlledvocabulary.language.yawiyo=Yawiyo -controlledvocabulary.language.yawuru=Yawuru -controlledvocabulary.language.yaygir=Yaygir -controlledvocabulary.language.yazgulyam=Yazgulyam -controlledvocabulary.language.yecuatla_totonac=Yecuatla Totonac -controlledvocabulary.language.yei=Yei -controlledvocabulary.language.yekhee=Yekhee -controlledvocabulary.language.yekora=Yekora -controlledvocabulary.language.yela=Yela -controlledvocabulary.language.yele=Yele -controlledvocabulary.language.yelmek=Yelmek -controlledvocabulary.language.yelogu=Yelogu -controlledvocabulary.language.yemba=Yemba -controlledvocabulary.language.yemsa=Yemsa -controlledvocabulary.language.yendang=Yendang -controlledvocabulary.language.yeni=Yeni -controlledvocabulary.language.yeniche=Yeniche -controlledvocabulary.language.yerakai=Yerakai -controlledvocabulary.language.yeretuar=Yeretuar -controlledvocabulary.language.yerong=Yerong -controlledvocabulary.language.yerukula=Yerukula -controlledvocabulary.language.yessan-mayo=Yessan-Mayo -controlledvocabulary.language.yetfa=Yetfa -controlledvocabulary.language.yevanic=Yevanic -controlledvocabulary.language.yeyi=Yeyi -controlledvocabulary.language.yiddish=Yiddish -controlledvocabulary.language.yidgha=Yidgha -controlledvocabulary.language.yidiny=Yidiny -controlledvocabulary.language.yil=Yil -controlledvocabulary.language.yilan_creole=Yilan Creole -controlledvocabulary.language.yimas=Yimas -controlledvocabulary.language.yimchungru_naga=Yimchungru Naga -controlledvocabulary.language.yinbaw_karen=Yinbaw Karen -controlledvocabulary.language.yindjibarndi=Yindjibarndi -controlledvocabulary.language.yindjilandji=Yindjilandji -controlledvocabulary.language.yine=Yine -controlledvocabulary.language.yinggarda=Yinggarda -controlledvocabulary.language.yinhawangka=Yinhawangka -controlledvocabulary.language.yiningayi=Yiningayi -controlledvocabulary.language.yintale_karen=Yintale Karen -controlledvocabulary.language.yinwum=Yinwum -controlledvocabulary.language.yir_yoront=Yir Yoront -controlledvocabulary.language.yirandali=Yirandali -controlledvocabulary.language.yirrk-mel=Yirrk-Mel -controlledvocabulary.language.yis=Yis -controlledvocabulary.language.yitha_yitha=Yitha Yitha -controlledvocabulary.language.yoba=Yoba -controlledvocabulary.language.yocoboue_dida=Yocoboué Dida -controlledvocabulary.language.yogad=Yogad -controlledvocabulary.language.yoidik=Yoidik -controlledvocabulary.language.yoke=Yoke -controlledvocabulary.language.yokuts=Yokuts -controlledvocabulary.language.yola=Yola -controlledvocabulary.language.yoloxochitl_mixtec=Yoloxochitl Mixtec -controlledvocabulary.language.yolŋu_sign_language=Yolŋu Sign Language -controlledvocabulary.language.yom=Yom -controlledvocabulary.language.yombe=Yombe -controlledvocabulary.language.yonaguni=Yonaguni -controlledvocabulary.language.yong=Yong -controlledvocabulary.language.yongbei_zhuang=Yongbei Zhuang -controlledvocabulary.language.yongkom=Yongkom -controlledvocabulary.language.yongnan_zhuang=Yongnan Zhuang -controlledvocabulary.language.yopno=Yopno -controlledvocabulary.language.yora=Yora -controlledvocabulary.language.yoron=Yoron -controlledvocabulary.language.yorta_yorta=Yorta Yorta -controlledvocabulary.language.yoruba=Yoruba -controlledvocabulary.language.yosondua_mixtec=Yosondúa Mixtec -controlledvocabulary.language.yotti=Yotti -controlledvocabulary.language.youjiang_zhuang=Youjiang Zhuang -controlledvocabulary.language.youle_jinuo=Youle Jinuo -controlledvocabulary.language.younuo_bunu=Younuo Bunu -controlledvocabulary.language.yout_wam=Yout Wam -controlledvocabulary.language.yoy=Yoy -controlledvocabulary.language.yuanga=Yuanga -controlledvocabulary.language.yucatec_maya_sign_language=Yucatec Maya Sign Language -controlledvocabulary.language.yucateco=Yucateco -controlledvocabulary.language.yuchi=Yuchi -controlledvocabulary.language.yucuane_mixtec=Yucuañe Mixtec -controlledvocabulary.language.yucuna=Yucuna -controlledvocabulary.language.yue_chinese=Yue Chinese -controlledvocabulary.language.yug=Yug -controlledvocabulary.language.yugambal=Yugambal -controlledvocabulary.language.yugoslavian_sign_language=Yugoslavian Sign Language -controlledvocabulary.language.yugul=Yugul -controlledvocabulary.language.yuhup=Yuhup -controlledvocabulary.language.yuki=Yuki -controlledvocabulary.language.yukpa=Yukpa -controlledvocabulary.language.yukuben=Yukuben -controlledvocabulary.language.yulu=Yulu -controlledvocabulary.language.yuqui=Yuqui -controlledvocabulary.language.yuracare=Yuracare -controlledvocabulary.language.yurats=Yurats -controlledvocabulary.language.yurok=Yurok -controlledvocabulary.language.yuru=Yuru -controlledvocabulary.language.yuruti=Yurutí -controlledvocabulary.language.yutanduchi_mixtec=Yutanduchi Mixtec -controlledvocabulary.language.yuwana=Yuwana -controlledvocabulary.language.yuyu=Yuyu -controlledvocabulary.language.ywom=Ywom -controlledvocabulary.language.yamana=Yámana -controlledvocabulary.language.zaachila_zapotec=Zaachila Zapotec -controlledvocabulary.language.zabana=Zabana -controlledvocabulary.language.zacatepec_chatino=Zacatepec Chatino -controlledvocabulary.language.zacatlan-ahuacatlan-tepetzintla_nahuatl=Zacatlán-Ahuacatlán-Tepetzintla Nahuatl -controlledvocabulary.language.zaghawa=Zaghawa -controlledvocabulary.language.zaiwa=Zaiwa -controlledvocabulary.language.zakhring=Zakhring -controlledvocabulary.language.zambian_sign_language=Zambian Sign Language -controlledvocabulary.language.zan_gula=Zan Gula -controlledvocabulary.language.zanaki=Zanaki -controlledvocabulary.language.zande_(individual_language)=Zande (individual language) -controlledvocabulary.language.zangskari=Zangskari -controlledvocabulary.language.zangwal=Zangwal -controlledvocabulary.language.zaniza_zapotec=Zaniza Zapotec -controlledvocabulary.language.zapotec=Zapotec -controlledvocabulary.language.zaramo=Zaramo -controlledvocabulary.language.zari=Zari -controlledvocabulary.language.zarma=Zarma -controlledvocabulary.language.zarphatic=Zarphatic -controlledvocabulary.language.zauzou=Zauzou -controlledvocabulary.language.zay=Zay -controlledvocabulary.language.zayein_karen=Zayein Karen -controlledvocabulary.language.zayse-zergulla=Zayse-Zergulla -controlledvocabulary.language.zaza=Zaza -controlledvocabulary.language.zazao=Zazao -controlledvocabulary.language.zeem=Zeem -controlledvocabulary.language.zeeuws=Zeeuws -controlledvocabulary.language.zemba=Zemba -controlledvocabulary.language.zeme_naga=Zeme Naga -controlledvocabulary.language.zemgalian=Zemgalian -controlledvocabulary.language.zenag=Zenag -controlledvocabulary.language.zenaga=Zenaga -controlledvocabulary.language.zenzontepec_chatino=Zenzontepec Chatino -controlledvocabulary.language.zerenkel=Zerenkel -controlledvocabulary.language.zhaba=Zhaba -controlledvocabulary.language.zhang-zhung=Zhang-Zhung -controlledvocabulary.language.zhire=Zhire -controlledvocabulary.language.zhoa=Zhoa -controlledvocabulary.language.zhuang,_chuang=Zhuang, Chuang -controlledvocabulary.language.zia=Zia -controlledvocabulary.language.zialo=Zialo -controlledvocabulary.language.zigula=Zigula -controlledvocabulary.language.zimakani=Zimakani -controlledvocabulary.language.zimba=Zimba -controlledvocabulary.language.zimbabwe_sign_language=Zimbabwe Sign Language -controlledvocabulary.language.zinza=Zinza -controlledvocabulary.language.zire=Zire -controlledvocabulary.language.zizilivakan=Zizilivakan -controlledvocabulary.language.zo'e=Zo'é -controlledvocabulary.language.zokhuo=Zokhuo -controlledvocabulary.language.zoogocho_zapotec=Zoogocho Zapotec -controlledvocabulary.language.zoroastrian_dari=Zoroastrian Dari -controlledvocabulary.language.zotung_chin=Zotung Chin -controlledvocabulary.language.zou=Zou -controlledvocabulary.language.zul=Zul -controlledvocabulary.language.zula=Zula -controlledvocabulary.language.zulgo-gemzek=Zulgo-Gemzek -controlledvocabulary.language.zulu=Zulu -controlledvocabulary.language.zumaya=Zumaya -controlledvocabulary.language.zumbun=Zumbun -controlledvocabulary.language.zuni=Zuni -controlledvocabulary.language.zuojiang_zhuang=Zuojiang Zhuang -controlledvocabulary.language.zyphe_chin=Zyphe Chin -controlledvocabulary.language.zaparo=Záparo -controlledvocabulary.language.stodsde=sTodsde -controlledvocabulary.language.us-saare=us-Saare -controlledvocabulary.language.ut-hun=ut-Hun -controlledvocabulary.language.ut-ma'in=ut-Ma'in -controlledvocabulary.language.ahan=Àhàn -controlledvocabulary.language.anca=Áncá -controlledvocabulary.language.omie=Ömie -controlledvocabulary.language.onge=Önge -controlledvocabulary.language.ǀgwi=ǀGwi -controlledvocabulary.language.ǀxam=ǀXam -controlledvocabulary.language.ǁani=ǁAni -controlledvocabulary.language.ǁgana=ǁGana -controlledvocabulary.language.ǁxegwi=ǁXegwi -controlledvocabulary.language.ǂhua=ǂHua -controlledvocabulary.language.ǂungkue=ǂUngkue -controlledvocabulary.language.ǃxoo=ǃXóõ +controlledvocabulary.language.'Are'are='Are'are +controlledvocabulary.language.'Auhelawa='Auhelawa +controlledvocabulary.language.A'ou=A'ou +controlledvocabulary.language.A-Pucikwar=A-Pucikwar +controlledvocabulary.language.Aari=Aari +controlledvocabulary.language.Aas�x=Aas�x +controlledvocabulary.language.Abadi=Abadi +controlledvocabulary.language.Abaga=Abaga +controlledvocabulary.language.Abai_Sungai=Abai Sungai +controlledvocabulary.language.Abanyom=Abanyom +controlledvocabulary.language.Abar=Abar +controlledvocabulary.language.Abau=Abau +controlledvocabulary.language.Abaza=Abaza +controlledvocabulary.language.Abellen_Ayta=Abellen Ayta +controlledvocabulary.language.Abidji=Abidji +controlledvocabulary.language.Abinomn=Abinomn +controlledvocabulary.language.Abipon=Abipon +controlledvocabulary.language.Abishira=Abishira +controlledvocabulary.language.Abkhaz=Abkhaz +controlledvocabulary.language.Abom=Abom +controlledvocabulary.language.Abon=Abon +controlledvocabulary.language.Abron=Abron +controlledvocabulary.language.Abu=Abu +controlledvocabulary.language.Abu'_Arapesh=Abu' Arapesh +controlledvocabulary.language.Abua=Abua +controlledvocabulary.language.Abui=Abui +controlledvocabulary.language.Abun=Abun +controlledvocabulary.language.Abure=Abure +controlledvocabulary.language.Abureni=Abureni +controlledvocabulary.language.Ab�=Ab� +controlledvocabulary.language.Acatepec_Me'phaa=Acatepec Me'phaa +controlledvocabulary.language.Achagua=Achagua +controlledvocabulary.language.Achang=Achang +controlledvocabulary.language.Ache=Ache +controlledvocabulary.language.Acheron=Acheron +controlledvocabulary.language.Achi=Achi +controlledvocabulary.language.Achinese=Achinese +controlledvocabulary.language.Achterhoeks=Achterhoeks +controlledvocabulary.language.Achuar-Shiwiar=Achuar-Shiwiar +controlledvocabulary.language.Achumawi=Achumawi +controlledvocabulary.language.Ach�=Ach� +controlledvocabulary.language.Acoli=Acoli +controlledvocabulary.language.Acro�=Acro� +controlledvocabulary.language.Adai=Adai +controlledvocabulary.language.Adamawa_Fulfulde=Adamawa Fulfulde +controlledvocabulary.language.Adamorobe_Sign_Language=Adamorobe Sign Language +controlledvocabulary.language.Adang=Adang +controlledvocabulary.language.Adangbe=Adangbe +controlledvocabulary.language.Adangme=Adangme +controlledvocabulary.language.Adara=Adara +controlledvocabulary.language.Adasen=Adasen +controlledvocabulary.language.Adele=Adele +controlledvocabulary.language.Adhola=Adhola +controlledvocabulary.language.Adi=Adi +controlledvocabulary.language.Adilabad_Gondi=Adilabad Gondi +controlledvocabulary.language.Adioukrou=Adioukrou +controlledvocabulary.language.Adithinngithigh=Adithinngithigh +controlledvocabulary.language.Adivasi_Oriya=Adivasi Oriya +controlledvocabulary.language.Adiwasi_Garasia=Adiwasi Garasia +controlledvocabulary.language.Adnyamathanha=Adnyamathanha +controlledvocabulary.language.Adonara=Adonara +controlledvocabulary.language.Aduge=Aduge +controlledvocabulary.language.Adyghe=Adyghe +controlledvocabulary.language.Adzera=Adzera +controlledvocabulary.language.Aeka=Aeka +controlledvocabulary.language.Aekyom=Aekyom +controlledvocabulary.language.Aequian=Aequian +controlledvocabulary.language.Aer=Aer +controlledvocabulary.language.Afade=Afade +controlledvocabulary.language.Afar=Afar +controlledvocabulary.language.Afghan_Sign_Language=Afghan Sign Language +controlledvocabulary.language.Afitti=Afitti +controlledvocabulary.language.Afrihili=Afrihili +controlledvocabulary.language.Afrikaans=Afrikaans +controlledvocabulary.language.Afro-Seminole_Creole=Afro-Seminole Creole +controlledvocabulary.language.Agarabi=Agarabi +controlledvocabulary.language.Agariya=Agariya +controlledvocabulary.language.Agatu=Agatu +controlledvocabulary.language.Agavotaguerra=Agavotaguerra +controlledvocabulary.language.Aghem=Aghem +controlledvocabulary.language.Aghu=Aghu +controlledvocabulary.language.Aghu-Tharnggala=Aghu-Tharnggala +controlledvocabulary.language.Aghul=Aghul +controlledvocabulary.language.Aghwan=Aghwan +controlledvocabulary.language.Agi=Agi +controlledvocabulary.language.Agob=Agob +controlledvocabulary.language.Agoi=Agoi +controlledvocabulary.language.Aguacateco=Aguacateco +controlledvocabulary.language.Aguano=Aguano +controlledvocabulary.language.Aguaruna=Aguaruna +controlledvocabulary.language.Aguna=Aguna +controlledvocabulary.language.Agusan_Manobo=Agusan Manobo +controlledvocabulary.language.Agutaynen=Agutaynen +controlledvocabulary.language.Agwagwune=Agwagwune +controlledvocabulary.language.Ahanta=Ahanta +controlledvocabulary.language.Aheri_Gondi=Aheri Gondi +controlledvocabulary.language.Aheu=Aheu +controlledvocabulary.language.Ahirani=Ahirani +controlledvocabulary.language.Ahom=Ahom +controlledvocabulary.language.Ahtena=Ahtena +controlledvocabulary.language.Ahwai=Ahwai +controlledvocabulary.language.Ai-Cham=Ai-Cham +controlledvocabulary.language.Aighon=Aighon +controlledvocabulary.language.Aikan�=Aikan� +controlledvocabulary.language.Aiklep=Aiklep +controlledvocabulary.language.Aimaq=Aimaq +controlledvocabulary.language.Aimele=Aimele +controlledvocabulary.language.Aimol=Aimol +controlledvocabulary.language.Ainbai=Ainbai +controlledvocabulary.language.Ainu_(China)=Ainu (China) +controlledvocabulary.language.Ainu_(Japan)=Ainu (Japan) +controlledvocabulary.language.Aiome=Aiome +controlledvocabulary.language.Airoran=Airoran +controlledvocabulary.language.Aiton=Aiton +controlledvocabulary.language.Aja_(Benin)=Aja (Benin) +controlledvocabulary.language.Aja_(South_Sudan)=Aja (South Sudan) +controlledvocabulary.language.Ajawa=Ajawa +controlledvocabulary.language.Aji�=Aji� +controlledvocabulary.language.Ajumbu=Ajumbu +controlledvocabulary.language.Ajy�ninka_Apurucayali=Ajy�ninka Apurucayali +controlledvocabulary.language.Ak=Ak +controlledvocabulary.language.Aka=Aka +controlledvocabulary.language.Aka-Bea=Aka-Bea +controlledvocabulary.language.Aka-Bo=Aka-Bo +controlledvocabulary.language.Aka-Cari=Aka-Cari +controlledvocabulary.language.Aka-Jeru=Aka-Jeru +controlledvocabulary.language.Aka-Kede=Aka-Kede +controlledvocabulary.language.Aka-Kol=Aka-Kol +controlledvocabulary.language.Aka-Kora=Aka-Kora +controlledvocabulary.language.Akan=Akan +controlledvocabulary.language.Akar-Bale=Akar-Bale +controlledvocabulary.language.Akaselem=Akaselem +controlledvocabulary.language.Akawaio=Akawaio +controlledvocabulary.language.Ake=Ake +controlledvocabulary.language.Akebu=Akebu +controlledvocabulary.language.Akei=Akei +controlledvocabulary.language.Akeu=Akeu +controlledvocabulary.language.Akha=Akha +controlledvocabulary.language.Akhvakh=Akhvakh +controlledvocabulary.language.Akkadian=Akkadian +controlledvocabulary.language.Akkala_Sami=Akkala Sami +controlledvocabulary.language.Aklanon=Aklanon +controlledvocabulary.language.Akolet=Akolet +controlledvocabulary.language.Akoose=Akoose +controlledvocabulary.language.Akoye=Akoye +controlledvocabulary.language.Akpa=Akpa +controlledvocabulary.language.Akpes=Akpes +controlledvocabulary.language.Akrukay=Akrukay +controlledvocabulary.language.Akukem=Akukem +controlledvocabulary.language.Akuku=Akuku +controlledvocabulary.language.Akum=Akum +controlledvocabulary.language.Akuntsu=Akuntsu +controlledvocabulary.language.Akurio=Akurio +controlledvocabulary.language.Akwa=Akwa +controlledvocabulary.language.Akyaung_Ari_Naga=Akyaung Ari Naga +controlledvocabulary.language.Al-Sayyid_Bedouin_Sign_Language=Al-Sayyid Bedouin Sign Language +controlledvocabulary.language.Alaba-Kabeena=Alaba-K?abeena +controlledvocabulary.language.Alabama=Alabama +controlledvocabulary.language.Alabat_Island_Agta=Alabat Island Agta +controlledvocabulary.language.Alacatlatzala_Mixtec=Alacatlatzala Mixtec +controlledvocabulary.language.Alago=Alago +controlledvocabulary.language.Alagwa=Alagwa +controlledvocabulary.language.Alak=Alak +controlledvocabulary.language.Alamblak=Alamblak +controlledvocabulary.language.Alangan=Alangan +controlledvocabulary.language.Alanic=Alanic +controlledvocabulary.language.Alapmunte=Alapmunte +controlledvocabulary.language.Alawa=Alawa +controlledvocabulary.language.Albanian=Albanian +controlledvocabulary.language.Albanian_Sign_Language=Albanian Sign Language +controlledvocabulary.language.Albarradas_Sign_Language=Albarradas Sign Language +controlledvocabulary.language.Alcozauca_Mixtec=Alcozauca Mixtec +controlledvocabulary.language.Alege=Alege +controlledvocabulary.language.Alekano=Alekano +controlledvocabulary.language.Aleut=Aleut +controlledvocabulary.language.Algerian_Arabic=Algerian Arabic +controlledvocabulary.language.Algerian_Jewish_Sign_Language=Algerian Jewish Sign Language +controlledvocabulary.language.Algerian_Saharan_Arabic=Algerian Saharan Arabic +controlledvocabulary.language.Algerian_Sign_Language=Algerian Sign Language +controlledvocabulary.language.Algonquin=Algonquin +controlledvocabulary.language.Ali=Ali +controlledvocabulary.language.Alladian=Alladian +controlledvocabulary.language.Allar=Allar +controlledvocabulary.language.Alngith=Alngith +controlledvocabulary.language.Alo_Phola=Alo Phola +controlledvocabulary.language.Alor=Alor +controlledvocabulary.language.Alo�pam_Zapotec=Alo�pam Zapotec +controlledvocabulary.language.Alsea=Alsea +controlledvocabulary.language.Alu_Kurumba=Alu Kurumba +controlledvocabulary.language.Alugu=Alugu +controlledvocabulary.language.Alumu-Tesu=Alumu-Tesu +controlledvocabulary.language.Alune=Alune +controlledvocabulary.language.Aluo=Aluo +controlledvocabulary.language.Alur=Alur +controlledvocabulary.language.Alutor=Alutor +controlledvocabulary.language.Alviri-Vidari=Alviri-Vidari +controlledvocabulary.language.Alyawarr=Alyawarr +controlledvocabulary.language.Ama_(Papua_New_Guinea)=Ama (Papua New Guinea) +controlledvocabulary.language.Ama_(Sudan)=Ama (Sudan) +controlledvocabulary.language.Amahai=Amahai +controlledvocabulary.language.Amahuaca=Amahuaca +controlledvocabulary.language.Amaimon=Amaimon +controlledvocabulary.language.Amal=Amal +controlledvocabulary.language.Amami_Koniya_Sign_Language=Amami Koniya Sign Language +controlledvocabulary.language.Amanab=Amanab +controlledvocabulary.language.Amanay�=Amanay� +controlledvocabulary.language.Amara=Amara +controlledvocabulary.language.Amarakaeri=Amarakaeri +controlledvocabulary.language.Amarasi=Amarasi +controlledvocabulary.language.Amatl�n_Zapotec=Amatl�n Zapotec +controlledvocabulary.language.Amba_(Solomon_Islands)=Amba (Solomon Islands) +controlledvocabulary.language.Amba_(Uganda)=Amba (Uganda) +controlledvocabulary.language.Ambai=Ambai +controlledvocabulary.language.Ambakich=Ambakich +controlledvocabulary.language.Ambala_Ayta=Ambala Ayta +controlledvocabulary.language.Ambelau=Ambelau +controlledvocabulary.language.Ambele=Ambele +controlledvocabulary.language.Amblong=Amblong +controlledvocabulary.language.Ambo=Ambo +controlledvocabulary.language.Ambo-Pasco_Quechua=Ambo-Pasco Quechua +controlledvocabulary.language.Ambonese_Malay=Ambonese Malay +controlledvocabulary.language.Ambrak=Ambrak +controlledvocabulary.language.Ambul=Ambul +controlledvocabulary.language.Ambulas=Ambulas +controlledvocabulary.language.Amdang=Amdang +controlledvocabulary.language.Amdo_Tibetan=Amdo Tibetan +controlledvocabulary.language.Amele=Amele +controlledvocabulary.language.American_Sign_Language=American Sign Language +controlledvocabulary.language.Amganad_Ifugao=Amganad Ifugao +controlledvocabulary.language.Amharic=Amharic +controlledvocabulary.language.Ami=Ami +controlledvocabulary.language.Amis=Amis +controlledvocabulary.language.Amo=Amo +controlledvocabulary.language.Amol=Amol +controlledvocabulary.language.Amoltepec_Mixtec=Amoltepec Mixtec +controlledvocabulary.language.Ampanang=Ampanang +controlledvocabulary.language.Ampari_Dogon=Ampari Dogon +controlledvocabulary.language.Amri_Karbi=Amri Karbi +controlledvocabulary.language.Amto=Amto +controlledvocabulary.language.Amundava=Amundava +controlledvocabulary.language.Amurdak=Amurdak +controlledvocabulary.language.Ana_Tinga_Dogon=Ana Tinga Dogon +controlledvocabulary.language.Anaang=Anaang +controlledvocabulary.language.Anakalangu=Anakalangu +controlledvocabulary.language.Anal=Anal +controlledvocabulary.language.Anam=Anam +controlledvocabulary.language.Anamb�=Anamb� +controlledvocabulary.language.Anamgura=Anamgura +controlledvocabulary.language.Anasi=Anasi +controlledvocabulary.language.Ancient_Greek_(to_1453)=Ancient Greek (to 1453) +controlledvocabulary.language.Ancient_Hebrew=Ancient Hebrew +controlledvocabulary.language.Ancient_Macedonian=Ancient Macedonian +controlledvocabulary.language.Ancient_North_Arabian=Ancient North Arabian +controlledvocabulary.language.Ancient_Zapotec=Ancient Zapotec +controlledvocabulary.language.Andaandi=Andaandi +controlledvocabulary.language.Andai=Andai +controlledvocabulary.language.Andajin=Andajin +controlledvocabulary.language.Andalusian_Arabic=Andalusian Arabic +controlledvocabulary.language.Andaman_Creole_Hindi=Andaman Creole Hindi +controlledvocabulary.language.Andaqui=Andaqui +controlledvocabulary.language.Andarum=Andarum +controlledvocabulary.language.Andegerebinha=Andegerebinha +controlledvocabulary.language.Andh=Andh +controlledvocabulary.language.Andi=Andi +controlledvocabulary.language.Andio=Andio +controlledvocabulary.language.Andoa=Andoa +controlledvocabulary.language.Andoque=Andoque +controlledvocabulary.language.Andra-Hus=Andra-Hus +controlledvocabulary.language.Aneityum=Aneityum +controlledvocabulary.language.Anem=Anem +controlledvocabulary.language.Aneme_Wake=Aneme Wake +controlledvocabulary.language.Anfillo=Anfillo +controlledvocabulary.language.Angaataha=Angaataha +controlledvocabulary.language.Angait�=Angait� +controlledvocabulary.language.Angal=Angal +controlledvocabulary.language.Angal_Enen=Angal Enen +controlledvocabulary.language.Angal_Heneng=Angal Heneng +controlledvocabulary.language.Angami_Naga=Angami Naga +controlledvocabulary.language.Angguruk_Yali=Angguruk Yali +controlledvocabulary.language.Angika=Angika +controlledvocabulary.language.Angkamuthi=Angkamuthi +controlledvocabulary.language.Anglo-Norman=Anglo-Norman +controlledvocabulary.language.Angloromani=Angloromani +controlledvocabulary.language.Angolar=Angolar +controlledvocabulary.language.Angor=Angor +controlledvocabulary.language.Angoram=Angoram +controlledvocabulary.language.Angosturas_Tunebo=Angosturas Tunebo +controlledvocabulary.language.Anguthimri=Anguthimri +controlledvocabulary.language.Ani_Phowa=Ani Phowa +controlledvocabulary.language.Anii=Anii +controlledvocabulary.language.Animere=Animere +controlledvocabulary.language.Anindilyakwa=Anindilyakwa +controlledvocabulary.language.Aninka=Aninka +controlledvocabulary.language.Anjam=Anjam +controlledvocabulary.language.Ankave=Ankave +controlledvocabulary.language.Anmatyerre=Anmatyerre +controlledvocabulary.language.Anong=Anong +controlledvocabulary.language.Anor=Anor +controlledvocabulary.language.Anserma=Anserma +controlledvocabulary.language.Ansus=Ansus +controlledvocabulary.language.Antakarinya=Antakarinya +controlledvocabulary.language.Antankarana_Malagasy=Antankarana Malagasy +controlledvocabulary.language.Antigua_and_Barbuda_Creole_English=Antigua and Barbuda Creole English +controlledvocabulary.language.Anu-Hkongso_Chin=Anu-Hkongso Chin +controlledvocabulary.language.Anuak=Anuak +controlledvocabulary.language.Anufo=Anufo +controlledvocabulary.language.Anuki=Anuki +controlledvocabulary.language.Anus=Anus +controlledvocabulary.language.Anuta=Anuta +controlledvocabulary.language.Anyin=Anyin +controlledvocabulary.language.Anyin_Morofo=Anyin Morofo +controlledvocabulary.language.Ao_Naga=Ao Naga +controlledvocabulary.language.Aoheng=Aoheng +controlledvocabulary.language.Aore=Aore +controlledvocabulary.language.Ap_Ma=Ap Ma +controlledvocabulary.language.Apalachee=Apalachee +controlledvocabulary.language.Apala�=Apala� +controlledvocabulary.language.Apali=Apali +controlledvocabulary.language.Apasco-Apoala_Mixtec=Apasco-Apoala Mixtec +controlledvocabulary.language.Apatani=Apatani +controlledvocabulary.language.Apiak�=Apiak� +controlledvocabulary.language.Apinay�=Apinay� +controlledvocabulary.language.Apma=Apma +controlledvocabulary.language.Aproumu_Aizi=Aproumu Aizi +controlledvocabulary.language.Apurin�=Apurin� +controlledvocabulary.language.Aputai=Aputai +controlledvocabulary.language.Aquitanian=Aquitanian +controlledvocabulary.language.Arabana=Arabana +controlledvocabulary.language.Arabela=Arabela +controlledvocabulary.language.Arabic=Arabic +controlledvocabulary.language.Aragonese=Aragonese +controlledvocabulary.language.Araki=Araki +controlledvocabulary.language.Arakwal=Arakwal +controlledvocabulary.language.Aralle-Tabulahan=Aralle-Tabulahan +controlledvocabulary.language.Arammba=Arammba +controlledvocabulary.language.Aranadan=Aranadan +controlledvocabulary.language.Aranama-Tamique=Aranama-Tamique +controlledvocabulary.language.Arandai=Arandai +controlledvocabulary.language.Araona=Araona +controlledvocabulary.language.Arapaho=Arapaho +controlledvocabulary.language.Arapaso=Arapaso +controlledvocabulary.language.Ararandew�ra=Ararandew�ra +controlledvocabulary.language.Arawak=Arawak +controlledvocabulary.language.Arawet�=Arawet� +controlledvocabulary.language.Arawum=Arawum +controlledvocabulary.language.Arbore=Arbore +controlledvocabulary.language.Arb�resh�_Albanian=Arb�resh� Albanian +controlledvocabulary.language.Archi=Archi +controlledvocabulary.language.Ardhamgadh_Prkrit=Ardham?gadh? Pr?krit +controlledvocabulary.language.Are=Are +controlledvocabulary.language.Areba=Areba +controlledvocabulary.language.Arem=Arem +controlledvocabulary.language.Arequipa-La_Uni�n_Quechua=Arequipa-La Uni�n Quechua +controlledvocabulary.language.Argentine_Sign_Language=Argentine Sign Language +controlledvocabulary.language.Argobba=Argobba +controlledvocabulary.language.Arguni=Arguni +controlledvocabulary.language.Arhuaco=Arhuaco +controlledvocabulary.language.Arh�=Arh� +controlledvocabulary.language.Arh�=Arh� +controlledvocabulary.language.Ari=Ari +controlledvocabulary.language.Aribwatsa=Aribwatsa +controlledvocabulary.language.Aribwaung=Aribwaung +controlledvocabulary.language.Arifama-Miniafia=Arifama-Miniafia +controlledvocabulary.language.Arigidi=Arigidi +controlledvocabulary.language.Arikap�=Arikap� +controlledvocabulary.language.Arikara=Arikara +controlledvocabulary.language.Arikem=Arikem +controlledvocabulary.language.Arin=Arin +controlledvocabulary.language.Aringa=Aringa +controlledvocabulary.language.Armazic=Armazic +controlledvocabulary.language.Armenian=Armenian +controlledvocabulary.language.Armenian_Sign_Language=Armenian Sign Language +controlledvocabulary.language.Arop-Lokep=Arop-Lokep +controlledvocabulary.language.Arop-Sissano=Arop-Sissano +controlledvocabulary.language.Arosi=Arosi +controlledvocabulary.language.Arpitan=Arpitan +controlledvocabulary.language.Arritinngithigh=Arritinngithigh +controlledvocabulary.language.Arta=Arta +controlledvocabulary.language.Aruamu=Aruamu +controlledvocabulary.language.Aruek=Aruek +controlledvocabulary.language.Aruop=Aruop +controlledvocabulary.language.Arutani=Arutani +controlledvocabulary.language.Aru�_(Amazonas_State)=Aru� (Amazonas State) +controlledvocabulary.language.Aru�_(Rodonia_State)=Aru� (Rodonia State) +controlledvocabulary.language.Arvanitika_Albanian=Arvanitika Albanian +controlledvocabulary.language.As=As +controlledvocabulary.language.Asaro'o=Asaro'o +controlledvocabulary.language.Ashe=Ashe +controlledvocabulary.language.Ashkun=Ashkun +controlledvocabulary.language.Asho_Chin=Asho Chin +controlledvocabulary.language.Ashtiani=Ashtiani +controlledvocabulary.language.Ash�ninka=Ash�ninka +controlledvocabulary.language.Ash�ninka_Pajonal=Ash�ninka Pajonal +controlledvocabulary.language.Ash�ninka_Peren�=Ash�ninka Peren� +controlledvocabulary.language.Asilulu=Asilulu +controlledvocabulary.language.Askopan=Askopan +controlledvocabulary.language.Asoa=Asoa +controlledvocabulary.language.Assamese=Assamese +controlledvocabulary.language.Assangori=Assangori +controlledvocabulary.language.Assiniboine=Assiniboine +controlledvocabulary.language.Assyrian_Neo-Aramaic=Assyrian Neo-Aramaic +controlledvocabulary.language.Asturian=Asturian +controlledvocabulary.language.Asu_(Nigeria)=Asu (Nigeria) +controlledvocabulary.language.Asu_(Tanzania)=Asu (Tanzania) +controlledvocabulary.language.Asue_Awyu=Asue Awyu +controlledvocabulary.language.Asumboa=Asumboa +controlledvocabulary.language.Asunci�n_Mixtepec_Zapotec=Asunci�n Mixtepec Zapotec +controlledvocabulary.language.Asuri=Asuri +controlledvocabulary.language.Ata=Ata +controlledvocabulary.language.Ata_Manobo=Ata Manobo +controlledvocabulary.language.Atakapa=Atakapa +controlledvocabulary.language.Atampaya=Atampaya +controlledvocabulary.language.Atatl�huca_Mixtec=Atatl�huca Mixtec +controlledvocabulary.language.Atauran=Atauran +controlledvocabulary.language.Atayal=Atayal +controlledvocabulary.language.Atemble=Atemble +controlledvocabulary.language.Athpariya=Athpariya +controlledvocabulary.language.Ati=Ati +controlledvocabulary.language.Atikamekw=Atikamekw +controlledvocabulary.language.Atohwaim=Atohwaim +controlledvocabulary.language.Atong_(Cameroon)=Atong (Cameroon) +controlledvocabulary.language.Atong_(India)=Atong (India) +controlledvocabulary.language.Atorada=Atorada +controlledvocabulary.language.Atsahuaca=Atsahuaca +controlledvocabulary.language.Atsam=Atsam +controlledvocabulary.language.Atsugewi=Atsugewi +controlledvocabulary.language.Attapady_Kurumba=Attapady Kurumba +controlledvocabulary.language.Atti�=Atti� +controlledvocabulary.language.Atzingo_Matlatzinca=Atzingo Matlatzinca +controlledvocabulary.language.Au=Au +controlledvocabulary.language.Aulua=Aulua +controlledvocabulary.language.Aur�=Aur� +controlledvocabulary.language.Aushi=Aushi +controlledvocabulary.language.Aushiri=Aushiri +controlledvocabulary.language.Auslan=Auslan +controlledvocabulary.language.Austral=Austral +controlledvocabulary.language.Australian_Aborigines_Sign_Language=Australian Aborigines Sign Language +controlledvocabulary.language.Austrian_Sign_Language=Austrian Sign Language +controlledvocabulary.language.Auwe=Auwe +controlledvocabulary.language.Auye=Auye +controlledvocabulary.language.Auyokawa=Auyokawa +controlledvocabulary.language.Avaric=Avaric +controlledvocabulary.language.Avatime=Avatime +controlledvocabulary.language.Avau=Avau +controlledvocabulary.language.Avestan=Avestan +controlledvocabulary.language.Avikam=Avikam +controlledvocabulary.language.Avokaya=Avokaya +controlledvocabulary.language.Av�-Canoeiro=Av�-Canoeiro +controlledvocabulary.language.Awa_(China)=Awa (China) +controlledvocabulary.language.Awa_(Papua_New_Guinea)=Awa (Papua New Guinea) +controlledvocabulary.language.Awa-Cuaiquer=Awa-Cuaiquer +controlledvocabulary.language.Awabakal=Awabakal +controlledvocabulary.language.Awad_Bing=Awad Bing +controlledvocabulary.language.Awadhi=Awadhi +controlledvocabulary.language.Awak=Awak +controlledvocabulary.language.Awar=Awar +controlledvocabulary.language.Awara=Awara +controlledvocabulary.language.Awbono=Awbono +controlledvocabulary.language.Aweer=Aweer +controlledvocabulary.language.Awera=Awera +controlledvocabulary.language.Awet�=Awet� +controlledvocabulary.language.Awing=Awing +controlledvocabulary.language.Awiyaana=Awiyaana +controlledvocabulary.language.Awjilah=Awjilah +controlledvocabulary.language.Awngi=Awngi +controlledvocabulary.language.Awngthim=Awngthim +controlledvocabulary.language.Awtuw=Awtuw +controlledvocabulary.language.Awu=Awu +controlledvocabulary.language.Awun=Awun +controlledvocabulary.language.Awutu=Awutu +controlledvocabulary.language.Awyi=Awyi +controlledvocabulary.language.Axamb=Axamb +controlledvocabulary.language.Axi_Yi=Axi Yi +controlledvocabulary.language.Ayabadhu=Ayabadhu +controlledvocabulary.language.Ayacucho_Quechua=Ayacucho Quechua +controlledvocabulary.language.Ayautla_Mazatec=Ayautla Mazatec +controlledvocabulary.language.Ayere=Ayere +controlledvocabulary.language.Ayerrerenge=Ayerrerenge +controlledvocabulary.language.Ayi_(Papua_New_Guinea)=Ayi (Papua New Guinea) +controlledvocabulary.language.Ayiwo=Ayiwo +controlledvocabulary.language.Ayizi=Ayizi +controlledvocabulary.language.Ayizo_Gbe=Ayizo Gbe +controlledvocabulary.language.Aymara=Aymara +controlledvocabulary.language.Ayoquesco_Zapotec=Ayoquesco Zapotec +controlledvocabulary.language.Ayoreo=Ayoreo +controlledvocabulary.language.Ayu=Ayu +controlledvocabulary.language.Ayutla_Mixtec=Ayutla Mixtec +controlledvocabulary.language.Azerbaijani=Azerbaijani +controlledvocabulary.language.Azha=Azha +controlledvocabulary.language.Azhe=Azhe +controlledvocabulary.language.Azoy�_Me'phaa=Azoy� Me'phaa +controlledvocabulary.language.Baan=Baan +controlledvocabulary.language.Baangi=Baangi +controlledvocabulary.language.Baatonum=Baatonum +controlledvocabulary.language.Baba=Baba +controlledvocabulary.language.Baba_Malay=Baba Malay +controlledvocabulary.language.Babango=Babango +controlledvocabulary.language.Babanki=Babanki +controlledvocabulary.language.Babatana=Babatana +controlledvocabulary.language.Babine=Babine +controlledvocabulary.language.Babuza=Babuza +controlledvocabulary.language.Bacama=Bacama +controlledvocabulary.language.Bacanese_Malay=Bacanese Malay +controlledvocabulary.language.Bactrian=Bactrian +controlledvocabulary.language.Bada_(Indonesia)=Bada (Indonesia) +controlledvocabulary.language.Bada_(Nigeria)=Bada (Nigeria) +controlledvocabulary.language.Badaga=Badaga +controlledvocabulary.language.Bade=Bade +controlledvocabulary.language.Badeshi=Badeshi +controlledvocabulary.language.Badimaya=Badimaya +controlledvocabulary.language.Badjiri=Badjiri +controlledvocabulary.language.Badui=Badui +controlledvocabulary.language.Badyara=Badyara +controlledvocabulary.language.Baeggu=Baeggu +controlledvocabulary.language.Baelelea=Baelelea +controlledvocabulary.language.Baetora=Baetora +controlledvocabulary.language.Bafanji=Bafanji +controlledvocabulary.language.Bafaw-Balong=Bafaw-Balong +controlledvocabulary.language.Bafia=Bafia +controlledvocabulary.language.Bafut=Bafut +controlledvocabulary.language.Baga_Kaloum=Baga Kaloum +controlledvocabulary.language.Baga_Koga=Baga Koga +controlledvocabulary.language.Baga_Manduri=Baga Manduri +controlledvocabulary.language.Baga_Pokur=Baga Pokur +controlledvocabulary.language.Baga_Sitemu=Baga Sitemu +controlledvocabulary.language.Baga_Soban�=Baga Soban� +controlledvocabulary.language.Bagheli=Bagheli +controlledvocabulary.language.Bagirmi=Bagirmi +controlledvocabulary.language.Bagirmi_Fulfulde=Bagirmi Fulfulde +controlledvocabulary.language.Bago-Kusuntu=Bago-Kusuntu +controlledvocabulary.language.Bagri=Bagri +controlledvocabulary.language.Bagupi=Bagupi +controlledvocabulary.language.Bagusa=Bagusa +controlledvocabulary.language.Bagvalal=Bagvalal +controlledvocabulary.language.Baha_Buyang=Baha Buyang +controlledvocabulary.language.Baham=Baham +controlledvocabulary.language.Bahamas_Creole_English=Bahamas Creole English +controlledvocabulary.language.Baharna_Arabic=Baharna Arabic +controlledvocabulary.language.Bahau=Bahau +controlledvocabulary.language.Bahinemo=Bahinemo +controlledvocabulary.language.Bahing=Bahing +controlledvocabulary.language.Bahnar=Bahnar +controlledvocabulary.language.Bahonsuai=Bahonsuai +controlledvocabulary.language.Bai_(South_Sudan)=Bai (South Sudan) +controlledvocabulary.language.Baibai=Baibai +controlledvocabulary.language.Baikeno=Baikeno +controlledvocabulary.language.Baima=Baima +controlledvocabulary.language.Baimak=Baimak +controlledvocabulary.language.Bainouk-Gunyaamolo=Bainouk-Gunyaamolo +controlledvocabulary.language.Bainouk-Gunyu�o=Bainouk-Gunyu�o +controlledvocabulary.language.Bainouk-Samik=Bainouk-Samik +controlledvocabulary.language.Baiso=Baiso +controlledvocabulary.language.Baissa_Fali=Baissa Fali +controlledvocabulary.language.Bajan=Bajan +controlledvocabulary.language.Bajelani=Bajelani +controlledvocabulary.language.Bajjika=Bajjika +controlledvocabulary.language.Baka_(Cameroon)=Baka (Cameroon) +controlledvocabulary.language.Baka_(South_Sudan)=Baka (South Sudan) +controlledvocabulary.language.Bakair�=Bakair� +controlledvocabulary.language.Bakaka=Bakaka +controlledvocabulary.language.Bakhtiari=Bakhtiari +controlledvocabulary.language.Baki=Baki +controlledvocabulary.language.Bakoko=Bakoko +controlledvocabulary.language.Bakole=Bakole +controlledvocabulary.language.Bakpinka=Bakpinka +controlledvocabulary.language.Bakumpai=Bakumpai +controlledvocabulary.language.Bakw�=Bakw� +controlledvocabulary.language.Balaesang=Balaesang +controlledvocabulary.language.Balaibalan=Balaibalan +controlledvocabulary.language.Balangao=Balangao +controlledvocabulary.language.Balangingi=Balangingi +controlledvocabulary.language.Balanta-Ganja=Balanta-Ganja +controlledvocabulary.language.Balanta-Kentohe=Balanta-Kentohe +controlledvocabulary.language.Balantak=Balantak +controlledvocabulary.language.Baldemu=Baldemu +controlledvocabulary.language.Bali_(Democratic_Republic_of_Congo)=Bali (Democratic Republic of Congo) +controlledvocabulary.language.Bali_(Nigeria)=Bali (Nigeria) +controlledvocabulary.language.Balinese=Balinese +controlledvocabulary.language.Balinese_Malay=Balinese Malay +controlledvocabulary.language.Balkan_Gagauz_Turkish=Balkan Gagauz Turkish +controlledvocabulary.language.Balkan_Romani=Balkan Romani +controlledvocabulary.language.Balo=Balo +controlledvocabulary.language.Baloi=Baloi +controlledvocabulary.language.Balti=Balti +controlledvocabulary.language.Baltic_Romani=Baltic Romani +controlledvocabulary.language.Baluan-Pam=Baluan-Pam +controlledvocabulary.language.Baluchi=Baluchi +controlledvocabulary.language.Bamako_Sign_Language=Bamako Sign Language +controlledvocabulary.language.Bamali=Bamali +controlledvocabulary.language.Bambalang=Bambalang +controlledvocabulary.language.Bambam=Bambam +controlledvocabulary.language.Bambara=Bambara +controlledvocabulary.language.Bambassi=Bambassi +controlledvocabulary.language.Bambili-Bambui=Bambili-Bambui +controlledvocabulary.language.Bamenyam=Bamenyam +controlledvocabulary.language.Bamu=Bamu +controlledvocabulary.language.Bamukumbit=Bamukumbit +controlledvocabulary.language.Bamun=Bamun +controlledvocabulary.language.Bamunka=Bamunka +controlledvocabulary.language.Bamwe=Bamwe +controlledvocabulary.language.Ban_Khor_Sign_Language=Ban Khor Sign Language +controlledvocabulary.language.Bana=Bana +controlledvocabulary.language.Banao_Itneg=Banao Itneg +controlledvocabulary.language.Banaro=Banaro +controlledvocabulary.language.Banda_(Indonesia)=Banda (Indonesia) +controlledvocabulary.language.Banda_Malay=Banda Malay +controlledvocabulary.language.Banda-Bambari=Banda-Bambari +controlledvocabulary.language.Banda-Banda=Banda-Banda +controlledvocabulary.language.Banda-Mbr�s=Banda-Mbr�s +controlledvocabulary.language.Banda-Nd�l�=Banda-Nd�l� +controlledvocabulary.language.Banda-Yangere=Banda-Yangere +controlledvocabulary.language.Bandi=Bandi +controlledvocabulary.language.Bandial=Bandial +controlledvocabulary.language.Bandjalang=Bandjalang +controlledvocabulary.language.Bangala=Bangala +controlledvocabulary.language.Bangandu=Bangandu +controlledvocabulary.language.Bangba=Bangba +controlledvocabulary.language.Banggai=Banggai +controlledvocabulary.language.Banggarla=Banggarla +controlledvocabulary.language.Bangi=Bangi +controlledvocabulary.language.Bangime=Bangime +controlledvocabulary.language.Bangka=Bangka +controlledvocabulary.language.Bangolan=Bangolan +controlledvocabulary.language.Bangubangu=Bangubangu +controlledvocabulary.language.Bangwinji=Bangwinji +controlledvocabulary.language.Baniva=Baniva +controlledvocabulary.language.Baniwa=Baniwa +controlledvocabulary.language.Banjar=Banjar +controlledvocabulary.language.Bankagooma=Bankagooma +controlledvocabulary.language.Bankal=Bankal +controlledvocabulary.language.Bankan_Tey_Dogon=Bankan Tey Dogon +controlledvocabulary.language.Bankon=Bankon +controlledvocabulary.language.Bannoni=Bannoni +controlledvocabulary.language.Bantawa=Bantawa +controlledvocabulary.language.Bantayanon=Bantayanon +controlledvocabulary.language.Bantik=Bantik +controlledvocabulary.language.Bantoanon=Bantoanon +controlledvocabulary.language.Banyjima=Banyjima +controlledvocabulary.language.Baoul�=Baoul� +controlledvocabulary.language.Bara_Malagasy=Bara Malagasy +controlledvocabulary.language.Baraamu=Baraamu +controlledvocabulary.language.Barababaraba=Barababaraba +controlledvocabulary.language.Barai=Barai +controlledvocabulary.language.Barakai=Barakai +controlledvocabulary.language.Baram_Kayan=Baram Kayan +controlledvocabulary.language.Barama=Barama +controlledvocabulary.language.Barambu=Barambu +controlledvocabulary.language.Baramu=Baramu +controlledvocabulary.language.Barapasi=Barapasi +controlledvocabulary.language.Baras=Baras +controlledvocabulary.language.Barasana-Eduria=Barasana-Eduria +controlledvocabulary.language.Barbaram=Barbaram +controlledvocabulary.language.Barbare�o=Barbare�o +controlledvocabulary.language.Barclayville_Grebo=Barclayville Grebo +controlledvocabulary.language.Bardi=Bardi +controlledvocabulary.language.Barein=Barein +controlledvocabulary.language.Bargam=Bargam +controlledvocabulary.language.Bari=Bari +controlledvocabulary.language.Bariai=Bariai +controlledvocabulary.language.Bariji=Bariji +controlledvocabulary.language.Barikanchi=Barikanchi +controlledvocabulary.language.Barikewa=Barikewa +controlledvocabulary.language.Barok=Barok +controlledvocabulary.language.Barombi=Barombi +controlledvocabulary.language.Barro_Negro_Tunebo=Barro Negro Tunebo +controlledvocabulary.language.Barrow_Point=Barrow Point +controlledvocabulary.language.Baruga=Baruga +controlledvocabulary.language.Baruya=Baruya +controlledvocabulary.language.Barwe=Barwe +controlledvocabulary.language.Barzani_Jewish_Neo-Aramaic=Barzani Jewish Neo-Aramaic +controlledvocabulary.language.Bar�=Bar� +controlledvocabulary.language.Bar�=Bar� +controlledvocabulary.language.Basa_(Cameroon)=Basa (Cameroon) +controlledvocabulary.language.Basa_(Nigeria)=Basa (Nigeria) +controlledvocabulary.language.Basa-Gumna=Basa-Gumna +controlledvocabulary.language.Basa-Gurmana=Basa-Gurmana +controlledvocabulary.language.Basap=Basap +controlledvocabulary.language.Basay=Basay +controlledvocabulary.language.Bashkardi=Bashkardi +controlledvocabulary.language.Bashkir=Bashkir +controlledvocabulary.language.Basketo=Basketo +controlledvocabulary.language.Basque=Basque +controlledvocabulary.language.Bassa=Bassa +controlledvocabulary.language.Bassa-Kontagora=Bassa-Kontagora +controlledvocabulary.language.Bassari=Bassari +controlledvocabulary.language.Bassossi=Bassossi +controlledvocabulary.language.Bata=Bata +controlledvocabulary.language.Batad_Ifugao=Batad Ifugao +controlledvocabulary.language.Batak=Batak +controlledvocabulary.language.Batak_Alas-Kluet=Batak Alas-Kluet +controlledvocabulary.language.Batak_Angkola=Batak Angkola +controlledvocabulary.language.Batak_Dairi=Batak Dairi +controlledvocabulary.language.Batak_Karo=Batak Karo +controlledvocabulary.language.Batak_Mandailing=Batak Mandailing +controlledvocabulary.language.Batak_Simalungun=Batak Simalungun +controlledvocabulary.language.Batak_Toba=Batak Toba +controlledvocabulary.language.Batanga=Batanga +controlledvocabulary.language.Batek=Batek +controlledvocabulary.language.Bateri=Bateri +controlledvocabulary.language.Bathari=Bathari +controlledvocabulary.language.Bati_(Cameroon)=Bati (Cameroon) +controlledvocabulary.language.Bati_(Indonesia)=Bati (Indonesia) +controlledvocabulary.language.Batjala=Batjala +controlledvocabulary.language.Bats=Bats +controlledvocabulary.language.Batu=Batu +controlledvocabulary.language.Batui=Batui +controlledvocabulary.language.Batuley=Batuley +controlledvocabulary.language.Bau=Bau +controlledvocabulary.language.Bau_Bidayuh=Bau Bidayuh +controlledvocabulary.language.Bauchi=Bauchi +controlledvocabulary.language.Bauni=Bauni +controlledvocabulary.language.Baure=Baure +controlledvocabulary.language.Bauria=Bauria +controlledvocabulary.language.Bauwaki=Bauwaki +controlledvocabulary.language.Bauzi=Bauzi +controlledvocabulary.language.Bavarian=Bavarian +controlledvocabulary.language.Bawm_Chin=Bawm Chin +controlledvocabulary.language.Bay_Miwok=Bay Miwok +controlledvocabulary.language.Bayali=Bayali +controlledvocabulary.language.Baybayanon=Baybayanon +controlledvocabulary.language.Baygo=Baygo +controlledvocabulary.language.Bayono=Bayono +controlledvocabulary.language.Bayot=Bayot +controlledvocabulary.language.Bayungu=Bayungu +controlledvocabulary.language.Bazigar=Bazigar +controlledvocabulary.language.Beami=Beami +controlledvocabulary.language.Beaver=Beaver +controlledvocabulary.language.Beba=Beba +controlledvocabulary.language.Bebele=Bebele +controlledvocabulary.language.Bebeli=Bebeli +controlledvocabulary.language.Bebil=Bebil +controlledvocabulary.language.Bedjond=Bedjond +controlledvocabulary.language.Bedoanas=Bedoanas +controlledvocabulary.language.Beeke=Beeke +controlledvocabulary.language.Beele=Beele +controlledvocabulary.language.Beembe=Beembe +controlledvocabulary.language.Beezen=Beezen +controlledvocabulary.language.Befang=Befang +controlledvocabulary.language.Beginci=Beginci +controlledvocabulary.language.Beja=Beja +controlledvocabulary.language.Bekati'=Bekati' +controlledvocabulary.language.Bekwarra=Bekwarra +controlledvocabulary.language.Bekwel=Bekwel +controlledvocabulary.language.Belait=Belait +controlledvocabulary.language.Belanda_Bor=Belanda Bor +controlledvocabulary.language.Belanda_Viri=Belanda Viri +controlledvocabulary.language.Belarusian=Belarusian +controlledvocabulary.language.Belhariya=Belhariya +controlledvocabulary.language.Beli_(Papua_New_Guinea)=Beli (Papua New Guinea) +controlledvocabulary.language.Beli_(South_Sudan)=Beli (South Sudan) +controlledvocabulary.language.Belize_Kriol_English=Belize Kriol English +controlledvocabulary.language.Bella_Coola=Bella Coola +controlledvocabulary.language.Bellari=Bellari +controlledvocabulary.language.Belning=Belning +controlledvocabulary.language.Bemba_(Zambia)=Bemba (Zambia) +controlledvocabulary.language.Bembe=Bembe +controlledvocabulary.language.Ben_Tey_Dogon=Ben Tey Dogon +controlledvocabulary.language.Bena_(Nigeria)=Bena (Nigeria) +controlledvocabulary.language.Bena_(Tanzania)=Bena (Tanzania) +controlledvocabulary.language.Benabena=Benabena +controlledvocabulary.language.Benamanga=Benamanga +controlledvocabulary.language.Bench=Bench +controlledvocabulary.language.Bende=Bende +controlledvocabulary.language.Bendi=Bendi +controlledvocabulary.language.Beng=Beng +controlledvocabulary.language.Benga=Benga +controlledvocabulary.language.Bengali,_Bangla=Bengali, Bangla +controlledvocabulary.language.Benggoi=Benggoi +controlledvocabulary.language.Bengkala_Sign_Language=Bengkala Sign Language +controlledvocabulary.language.Bentong=Bentong +controlledvocabulary.language.Benyadu'=Benyadu' +controlledvocabulary.language.Beothuk=Beothuk +controlledvocabulary.language.Bepour=Bepour +controlledvocabulary.language.Berakou=Berakou +controlledvocabulary.language.Berau_Malay=Berau Malay +controlledvocabulary.language.Berbice_Creole_Dutch=Berbice Creole Dutch +controlledvocabulary.language.Berik=Berik +controlledvocabulary.language.Berinomo=Berinomo +controlledvocabulary.language.Berom=Berom +controlledvocabulary.language.Berta=Berta +controlledvocabulary.language.Berti=Berti +controlledvocabulary.language.Besisi=Besisi +controlledvocabulary.language.Besme=Besme +controlledvocabulary.language.Besoa=Besoa +controlledvocabulary.language.Betaf=Betaf +controlledvocabulary.language.Betawi=Betawi +controlledvocabulary.language.Bete=Bete +controlledvocabulary.language.Bete-Bendi=Bete-Bendi +controlledvocabulary.language.Beti_(C�te_d'Ivoire)=Beti (C�te d'Ivoire) +controlledvocabulary.language.Betta_Kurumba=Betta Kurumba +controlledvocabulary.language.Bezhta=Bezhta +controlledvocabulary.language.Bhadrawahi=Bhadrawahi +controlledvocabulary.language.Bhalay=Bhalay +controlledvocabulary.language.Bharia=Bharia +controlledvocabulary.language.Bhatri=Bhatri +controlledvocabulary.language.Bhattiyali=Bhattiyali +controlledvocabulary.language.Bhaya=Bhaya +controlledvocabulary.language.Bhele=Bhele +controlledvocabulary.language.Bhilali=Bhilali +controlledvocabulary.language.Bhili=Bhili +controlledvocabulary.language.Bhojpuri=Bhojpuri +controlledvocabulary.language.Bhoti_Kinnauri=Bhoti Kinnauri +controlledvocabulary.language.Bhujel=Bhujel +controlledvocabulary.language.Bhunjia=Bhunjia +controlledvocabulary.language.Biafada=Biafada +controlledvocabulary.language.Biage=Biage +controlledvocabulary.language.Biak=Biak +controlledvocabulary.language.Biali=Biali +controlledvocabulary.language.Bian_Marind=Bian Marind +controlledvocabulary.language.Biangai=Biangai +controlledvocabulary.language.Biao=Biao +controlledvocabulary.language.Biao_Mon=Biao Mon +controlledvocabulary.language.Biao-Jiao_Mien=Biao-Jiao Mien +controlledvocabulary.language.Biatah_Bidayuh=Biatah Bidayuh +controlledvocabulary.language.Bibbulman=Bibbulman +controlledvocabulary.language.Bidhawal=Bidhawal +controlledvocabulary.language.Bidiyo=Bidiyo +controlledvocabulary.language.Bidjara=Bidjara +controlledvocabulary.language.Bidyogo=Bidyogo +controlledvocabulary.language.Biem=Biem +controlledvocabulary.language.Bierebo=Bierebo +controlledvocabulary.language.Bieria=Bieria +controlledvocabulary.language.Biete=Biete +controlledvocabulary.language.Big_Nambas=Big Nambas +controlledvocabulary.language.Biga=Biga +controlledvocabulary.language.Bigambal=Bigambal +controlledvocabulary.language.Bih=Bih +controlledvocabulary.language.Bihari=Bihari +controlledvocabulary.language.Bijim=Bijim +controlledvocabulary.language.Bijori=Bijori +controlledvocabulary.language.Bikol=Bikol +controlledvocabulary.language.Bikya=Bikya +controlledvocabulary.language.Bila=Bila +controlledvocabulary.language.Bilakura=Bilakura +controlledvocabulary.language.Bilaspuri=Bilaspuri +controlledvocabulary.language.Bilba=Bilba +controlledvocabulary.language.Bilbil=Bilbil +controlledvocabulary.language.Bile=Bile +controlledvocabulary.language.Bilin=Bilin +controlledvocabulary.language.Bilma_Kanuri=Bilma Kanuri +controlledvocabulary.language.Biloxi=Biloxi +controlledvocabulary.language.Bilua=Bilua +controlledvocabulary.language.Bilur=Bilur +controlledvocabulary.language.Bima=Bima +controlledvocabulary.language.Bimin=Bimin +controlledvocabulary.language.Bimoba=Bimoba +controlledvocabulary.language.Bina_(Nigeria)=Bina (Nigeria) +controlledvocabulary.language.Bina_(Papua_New_Guinea)=Bina (Papua New Guinea) +controlledvocabulary.language.Binahari=Binahari +controlledvocabulary.language.Binandere=Binandere +controlledvocabulary.language.Bindal=Bindal +controlledvocabulary.language.Bine=Bine +controlledvocabulary.language.Bini=Bini +controlledvocabulary.language.Binji=Binji +controlledvocabulary.language.Binongan_Itneg=Binongan Itneg +controlledvocabulary.language.Bintauna=Bintauna +controlledvocabulary.language.Bintulu=Bintulu +controlledvocabulary.language.Binukid=Binukid +controlledvocabulary.language.Binumarien=Binumarien +controlledvocabulary.language.Bipi=Bipi +controlledvocabulary.language.Bira=Bira +controlledvocabulary.language.Birale=Birale +controlledvocabulary.language.Birao=Birao +controlledvocabulary.language.Birgit=Birgit +controlledvocabulary.language.Birhor=Birhor +controlledvocabulary.language.Biri=Biri +controlledvocabulary.language.Biritai=Biritai +controlledvocabulary.language.Birked=Birked +controlledvocabulary.language.Birri=Birri +controlledvocabulary.language.Birrpayi=Birrpayi +controlledvocabulary.language.Birwa=Birwa +controlledvocabulary.language.Biseni=Biseni +controlledvocabulary.language.Bishnupriya=Bishnupriya +controlledvocabulary.language.Bishuo=Bishuo +controlledvocabulary.language.Bisis=Bisis +controlledvocabulary.language.Bislama=Bislama +controlledvocabulary.language.Bisorio=Bisorio +controlledvocabulary.language.Bissa=Bissa +controlledvocabulary.language.Bisu=Bisu +controlledvocabulary.language.Bit=Bit +controlledvocabulary.language.Bitare=Bitare +controlledvocabulary.language.Bitur=Bitur +controlledvocabulary.language.Biwat=Biwat +controlledvocabulary.language.Biyo=Biyo +controlledvocabulary.language.Biyom=Biyom +controlledvocabulary.language.Blablanga=Blablanga +controlledvocabulary.language.Blafe=Blafe +controlledvocabulary.language.Blagar=Blagar +controlledvocabulary.language.Blang=Blang +controlledvocabulary.language.Blissymbols=Blissymbols +controlledvocabulary.language.Bo_(Laos)=Bo (Laos) +controlledvocabulary.language.Bo_(Papua_New_Guinea)=Bo (Papua New Guinea) +controlledvocabulary.language.Bo-Rukul=Bo-Rukul +controlledvocabulary.language.Bo-Ung=Bo-Ung +controlledvocabulary.language.Boano_(Maluku)=Boano (Maluku) +controlledvocabulary.language.Boano_(Sulawesi)=Boano (Sulawesi) +controlledvocabulary.language.Bobongko=Bobongko +controlledvocabulary.language.Bobot=Bobot +controlledvocabulary.language.Bodo_(Central_African_Republic)=Bodo (Central African Republic) +controlledvocabulary.language.Bodo_(India)=Bodo (India) +controlledvocabulary.language.Bodo_Gadaba=Bodo Gadaba +controlledvocabulary.language.Bodo_Parja=Bodo Parja +controlledvocabulary.language.Bofi=Bofi +controlledvocabulary.language.Boga=Boga +controlledvocabulary.language.Bogaya=Bogaya +controlledvocabulary.language.Boghom=Boghom +controlledvocabulary.language.Boguru=Boguru +controlledvocabulary.language.Bohtan_Neo-Aramaic=Bohtan Neo-Aramaic +controlledvocabulary.language.Boikin=Boikin +controlledvocabulary.language.Bokha=Bokha +controlledvocabulary.language.Boko_(Benin)=Boko (Benin) +controlledvocabulary.language.Boko_(Democratic_Republic_of_Congo)=Boko (Democratic Republic of Congo) +controlledvocabulary.language.Bokobaru=Bokobaru +controlledvocabulary.language.Bokoto=Bokoto +controlledvocabulary.language.Bokyi=Bokyi +controlledvocabulary.language.Bola=Bola +controlledvocabulary.language.Bolango=Bolango +controlledvocabulary.language.Bole=Bole +controlledvocabulary.language.Bolgarian=Bolgarian +controlledvocabulary.language.Bolgo=Bolgo +controlledvocabulary.language.Bolia=Bolia +controlledvocabulary.language.Bolinao=Bolinao +controlledvocabulary.language.Bolivian_Sign_Language=Bolivian Sign Language +controlledvocabulary.language.Boloki=Boloki +controlledvocabulary.language.Bolon=Bolon +controlledvocabulary.language.Bolondo=Bolondo +controlledvocabulary.language.Bolongan=Bolongan +controlledvocabulary.language.Bolyu=Bolyu +controlledvocabulary.language.Bom-Kim=Bom-Kim +controlledvocabulary.language.Boma=Boma +controlledvocabulary.language.Bomboli=Bomboli +controlledvocabulary.language.Bomboma=Bomboma +controlledvocabulary.language.Bomitaba=Bomitaba +controlledvocabulary.language.Bomu=Bomu +controlledvocabulary.language.Bomwali=Bomwali +controlledvocabulary.language.Bon_Gula=Bon Gula +controlledvocabulary.language.Bonan=Bonan +controlledvocabulary.language.Bondei=Bondei +controlledvocabulary.language.Bondo=Bondo +controlledvocabulary.language.Bondoukou_Kulango=Bondoukou Kulango +controlledvocabulary.language.Bondum_Dom_Dogon=Bondum Dom Dogon +controlledvocabulary.language.Bonerate=Bonerate +controlledvocabulary.language.Bonerif=Bonerif +controlledvocabulary.language.Bonggi=Bonggi +controlledvocabulary.language.Bonggo=Bonggo +controlledvocabulary.language.Bongili=Bongili +controlledvocabulary.language.Bongo=Bongo +controlledvocabulary.language.Bongu=Bongu +controlledvocabulary.language.Bonjo=Bonjo +controlledvocabulary.language.Bonkeng=Bonkeng +controlledvocabulary.language.Bonkiman=Bonkiman +controlledvocabulary.language.Bontok=Bontok +controlledvocabulary.language.Bookan=Bookan +controlledvocabulary.language.Boon=Boon +controlledvocabulary.language.Boor=Boor +controlledvocabulary.language.Bora=Bora +controlledvocabulary.language.Borana-Arsi-Guji_Oromo=Borana-Arsi-Guji Oromo +controlledvocabulary.language.Border_Kuna=Border Kuna +controlledvocabulary.language.Borei=Borei +controlledvocabulary.language.Borgu_Fulfulde=Borgu Fulfulde +controlledvocabulary.language.Boro_(Ethiopia)=Boro (Ethiopia) +controlledvocabulary.language.Boro_(Ghana)=Boro (Ghana) +controlledvocabulary.language.Borong=Borong +controlledvocabulary.language.Boruca=Boruca +controlledvocabulary.language.Bor�ro=Bor�ro +controlledvocabulary.language.Boselewa=Boselewa +controlledvocabulary.language.Bosngun=Bosngun +controlledvocabulary.language.Bosnian=Bosnian +controlledvocabulary.language.Bote-Majhi=Bote-Majhi +controlledvocabulary.language.Botlikh=Botlikh +controlledvocabulary.language.Botolan_Sambal=Botolan Sambal +controlledvocabulary.language.Bouna_Kulango=Bouna Kulango +controlledvocabulary.language.Bouni=Bouni +controlledvocabulary.language.Bouyei=Bouyei +controlledvocabulary.language.Bozaba=Bozaba +controlledvocabulary.language.Bragat=Bragat +controlledvocabulary.language.Brahui=Brahui +controlledvocabulary.language.Braj=Braj +controlledvocabulary.language.Brao=Brao +controlledvocabulary.language.Brazilian_Sign_Language=Brazilian Sign Language +controlledvocabulary.language.Brem=Brem +controlledvocabulary.language.Breri=Breri +controlledvocabulary.language.Breton=Breton +controlledvocabulary.language.Bribri=Bribri +controlledvocabulary.language.Bribri_Sign_Language=Bribri Sign Language +controlledvocabulary.language.Brithenig=Brithenig +controlledvocabulary.language.British_Sign_Language=British Sign Language +controlledvocabulary.language.Brokkat=Brokkat +controlledvocabulary.language.Brokpake=Brokpake +controlledvocabulary.language.Brokskat=Brokskat +controlledvocabulary.language.Brooke's_Point_Palawano=Brooke's Point Palawano +controlledvocabulary.language.Broome_Pearling_Lugger_Pidgin=Broome Pearling Lugger Pidgin +controlledvocabulary.language.Brunca_Sign_Language=Brunca Sign Language +controlledvocabulary.language.Brunei=Brunei +controlledvocabulary.language.Brunei_Bisaya=Brunei Bisaya +controlledvocabulary.language.Bruny_Island_Tasmanian=Bruny Island Tasmanian +controlledvocabulary.language.Bu_(Bauchi_State)=Bu (Bauchi State) +controlledvocabulary.language.Bu_(Kaduna_State)=Bu (Kaduna State) +controlledvocabulary.language.Bu-Nao_Bunu=Bu-Nao Bunu +controlledvocabulary.language.Bua=Bua +controlledvocabulary.language.Bualkhaw_Chin=Bualkhaw Chin +controlledvocabulary.language.Buamu=Buamu +controlledvocabulary.language.Bube=Bube +controlledvocabulary.language.Bubi=Bubi +controlledvocabulary.language.Bubia=Bubia +controlledvocabulary.language.Budeh_Stieng=Budeh Stieng +controlledvocabulary.language.Budibud=Budibud +controlledvocabulary.language.Budong-Budong=Budong-Budong +controlledvocabulary.language.Budu=Budu +controlledvocabulary.language.Budukh=Budukh +controlledvocabulary.language.Buduma=Buduma +controlledvocabulary.language.Budza=Budza +controlledvocabulary.language.Bugan=Bugan +controlledvocabulary.language.Bugawac=Bugawac +controlledvocabulary.language.Bughotu=Bughotu +controlledvocabulary.language.Buginese=Buginese +controlledvocabulary.language.Buglere=Buglere +controlledvocabulary.language.Bugun=Bugun +controlledvocabulary.language.Buhi'non_Bikol=Buhi'non Bikol +controlledvocabulary.language.Buhid=Buhid +controlledvocabulary.language.Buhutu=Buhutu +controlledvocabulary.language.Bukar-Sadung_Bidayuh=Bukar-Sadung Bidayuh +controlledvocabulary.language.Bukat=Bukat +controlledvocabulary.language.Bukharic=Bukharic +controlledvocabulary.language.Bukit_Malay=Bukit Malay +controlledvocabulary.language.Bukitan=Bukitan +controlledvocabulary.language.Bukiyip=Bukiyip +controlledvocabulary.language.Buksa=Buksa +controlledvocabulary.language.Bukusu=Bukusu +controlledvocabulary.language.Bukwen=Bukwen +controlledvocabulary.language.Bulgarian=Bulgarian +controlledvocabulary.language.Bulgarian_Sign_Language=Bulgarian Sign Language +controlledvocabulary.language.Bulgebi=Bulgebi +controlledvocabulary.language.Buli=Buli +controlledvocabulary.language.Buli_(Ghana)=Buli (Ghana) +controlledvocabulary.language.Buli_(Indonesia)=Buli (Indonesia) +controlledvocabulary.language.Bullom_So=Bullom So +controlledvocabulary.language.Bulo_Stieng=Bulo Stieng +controlledvocabulary.language.Bulu_(Cameroon)=Bulu (Cameroon) +controlledvocabulary.language.Bulu_(Papua_New_Guinea)=Bulu (Papua New Guinea) +controlledvocabulary.language.Bum=Bum +controlledvocabulary.language.Bumaji=Bumaji +controlledvocabulary.language.Bumang=Bumang +controlledvocabulary.language.Bumbita_Arapesh=Bumbita Arapesh +controlledvocabulary.language.Bumthangkha=Bumthangkha +controlledvocabulary.language.Bun=Bun +controlledvocabulary.language.Buna=Buna +controlledvocabulary.language.Bunak=Bunak +controlledvocabulary.language.Bunama=Bunama +controlledvocabulary.language.Bundeli=Bundeli +controlledvocabulary.language.Bung=Bung +controlledvocabulary.language.Bungain=Bungain +controlledvocabulary.language.Bunganditj=Bunganditj +controlledvocabulary.language.Bungku=Bungku +controlledvocabulary.language.Bungu=Bungu +controlledvocabulary.language.Bunoge_Dogon=Bunoge Dogon +controlledvocabulary.language.Bunuba=Bunuba +controlledvocabulary.language.Bunun=Bunun +controlledvocabulary.language.Buol=Buol +controlledvocabulary.language.Bura-Pabir=Bura-Pabir +controlledvocabulary.language.Burak=Burak +controlledvocabulary.language.Buraka=Buraka +controlledvocabulary.language.Burarra=Burarra +controlledvocabulary.language.Burate=Burate +controlledvocabulary.language.Burduna=Burduna +controlledvocabulary.language.Bure=Bure +controlledvocabulary.language.Buriat=Buriat +controlledvocabulary.language.Burji=Burji +controlledvocabulary.language.Burmbar=Burmbar +controlledvocabulary.language.Burmese=Burmese +controlledvocabulary.language.Burmeso=Burmeso +controlledvocabulary.language.Buru_(Indonesia)=Buru (Indonesia) +controlledvocabulary.language.Buru_(Nigeria)=Buru (Nigeria) +controlledvocabulary.language.Burui=Burui +controlledvocabulary.language.Burumakok=Burumakok +controlledvocabulary.language.Burun=Burun +controlledvocabulary.language.Burundian_Sign_Language=Burundian Sign Language +controlledvocabulary.language.Burunge=Burunge +controlledvocabulary.language.Burushaski=Burushaski +controlledvocabulary.language.Burusu=Burusu +controlledvocabulary.language.Buruwai=Buruwai +controlledvocabulary.language.Busa=Busa +controlledvocabulary.language.Busam=Busam +controlledvocabulary.language.Busami=Busami +controlledvocabulary.language.Busang_Kayan=Busang Kayan +controlledvocabulary.language.Bushi=Bushi +controlledvocabulary.language.Bushoong=Bushoong +controlledvocabulary.language.Buso=Buso +controlledvocabulary.language.Busoa=Busoa +controlledvocabulary.language.Bussa=Bussa +controlledvocabulary.language.Busuu=Busuu +controlledvocabulary.language.Butbut_Kalinga=Butbut Kalinga +controlledvocabulary.language.Butmas-Tur=Butmas-Tur +controlledvocabulary.language.Butuanon=Butuanon +controlledvocabulary.language.Buwal=Buwal +controlledvocabulary.language.Buyu=Buyu +controlledvocabulary.language.Buyuan_Jinuo=Buyuan Jinuo +controlledvocabulary.language.Bwa=Bwa +controlledvocabulary.language.Bwaidoka=Bwaidoka +controlledvocabulary.language.Bwanabwana=Bwanabwana +controlledvocabulary.language.Bwatoo=Bwatoo +controlledvocabulary.language.Bwe_Karen=Bwe Karen +controlledvocabulary.language.Bwela=Bwela +controlledvocabulary.language.Bwile=Bwile +controlledvocabulary.language.Bwisi=Bwisi +controlledvocabulary.language.Byangsi=Byangsi +controlledvocabulary.language.Byep=Byep +controlledvocabulary.language.B�di_Kanum=B�di Kanum +controlledvocabulary.language.C'Lela=C'Lela +controlledvocabulary.language.Caac=Caac +controlledvocabulary.language.Cabiyar�=Cabiyar� +controlledvocabulary.language.Cab�car=Cab�car +controlledvocabulary.language.Cacaloxtepec_Mixtec=Cacaloxtepec Mixtec +controlledvocabulary.language.Cacaopera=Cacaopera +controlledvocabulary.language.Cacgia_Roglai=Cacgia Roglai +controlledvocabulary.language.Cacua=Cacua +controlledvocabulary.language.Caddo=Caddo +controlledvocabulary.language.Cafundo_Creole=Cafundo Creole +controlledvocabulary.language.Cahuarano=Cahuarano +controlledvocabulary.language.Cahuilla=Cahuilla +controlledvocabulary.language.Cajamarca_Quechua=Cajamarca Quechua +controlledvocabulary.language.Cajatambo_North_Lima_Quechua=Cajatambo North Lima Quechua +controlledvocabulary.language.Cajonos_Zapotec=Cajonos Zapotec +controlledvocabulary.language.Cajun_French=Cajun French +controlledvocabulary.language.Caka=Caka +controlledvocabulary.language.Cakchiquel-Quich�_Mixed_Language=Cakchiquel-Quich� Mixed Language +controlledvocabulary.language.Cakfem-Mushere=Cakfem-Mushere +controlledvocabulary.language.Calamian_Tagbanwa=Calamian Tagbanwa +controlledvocabulary.language.Calder�n_Highland_Quichua=Calder�n Highland Quichua +controlledvocabulary.language.Callawalla=Callawalla +controlledvocabulary.language.Caluyanun=Caluyanun +controlledvocabulary.language.Cal�=Cal� +controlledvocabulary.language.Cambodian_Sign_Language=Cambodian Sign Language +controlledvocabulary.language.Cameroon_Mambila=Cameroon Mambila +controlledvocabulary.language.Cameroon_Pidgin=Cameroon Pidgin +controlledvocabulary.language.Camling=Camling +controlledvocabulary.language.Campalagian=Campalagian +controlledvocabulary.language.Campidanese_Sardinian=Campidanese Sardinian +controlledvocabulary.language.Cams�=Cams� +controlledvocabulary.language.Camtho=Camtho +controlledvocabulary.language.Camunic=Camunic +controlledvocabulary.language.Candoshi-Shapra=Candoshi-Shapra +controlledvocabulary.language.Canela=Canela +controlledvocabulary.language.Canichana=Canichana +controlledvocabulary.language.Cao_Lan=Cao Lan +controlledvocabulary.language.Cao_Miao=Cao Miao +controlledvocabulary.language.Capanahua=Capanahua +controlledvocabulary.language.Capiznon=Capiznon +controlledvocabulary.language.Cappadocian_Greek=Cappadocian Greek +controlledvocabulary.language.Caquinte=Caquinte +controlledvocabulary.language.Car_Nicobarese=Car Nicobarese +controlledvocabulary.language.Cara=Cara +controlledvocabulary.language.Carabayo=Carabayo +controlledvocabulary.language.Caramanta=Caramanta +controlledvocabulary.language.Carapana=Carapana +controlledvocabulary.language.Carian=Carian +controlledvocabulary.language.Caribbean_Hindustani=Caribbean Hindustani +controlledvocabulary.language.Caribbean_Javanese=Caribbean Javanese +controlledvocabulary.language.Carijona=Carijona +controlledvocabulary.language.Carolina_Algonquian=Carolina Algonquian +controlledvocabulary.language.Carolinian=Carolinian +controlledvocabulary.language.Carpathian_Romani=Carpathian Romani +controlledvocabulary.language.Carrier=Carrier +controlledvocabulary.language.Cashibo-Cacataibo=Cashibo-Cacataibo +controlledvocabulary.language.Cashinahua=Cashinahua +controlledvocabulary.language.Casiguran_Dumagat_Agta=Casiguran Dumagat Agta +controlledvocabulary.language.Casuarina_Coast_Asmat=Casuarina Coast Asmat +controlledvocabulary.language.Catalan_Sign_Language=Catalan Sign Language +controlledvocabulary.language.Catalan,_Valencian=Catalan, Valencian +controlledvocabulary.language.Catawba=Catawba +controlledvocabulary.language.Cavine�a=Cavine�a +controlledvocabulary.language.Cayubaba=Cayubaba +controlledvocabulary.language.Cayuga=Cayuga +controlledvocabulary.language.Cayuse=Cayuse +controlledvocabulary.language.Ca�ar_Highland_Quichua=Ca�ar Highland Quichua +controlledvocabulary.language.Cahungwarya=Ca?hungwa?rya? +controlledvocabulary.language.Cebaara_Senoufo=Cebaara Senoufo +controlledvocabulary.language.Cebuano=Cebuano +controlledvocabulary.language.Celtiberian=Celtiberian +controlledvocabulary.language.Cemuh�=Cemuh� +controlledvocabulary.language.Cen=Cen +controlledvocabulary.language.Central_Asmat=Central Asmat +controlledvocabulary.language.Central_Atlas_Tamazight=Central Atlas Tamazight +controlledvocabulary.language.Central_Awyu=Central Awyu +controlledvocabulary.language.Central_Aymara=Central Aymara +controlledvocabulary.language.Central_Bai=Central Bai +controlledvocabulary.language.Central_Berawan=Central Berawan +controlledvocabulary.language.Central_Bikol=Central Bikol +controlledvocabulary.language.Central_Bontok=Central Bontok +controlledvocabulary.language.Central_Cagayan_Agta=Central Cagayan Agta +controlledvocabulary.language.Central_Grebo=Central Grebo +controlledvocabulary.language.Central_Hongshuihe_Zhuang=Central Hongshuihe Zhuang +controlledvocabulary.language.Central_Huasteca_Nahuatl=Central Huasteca Nahuatl +controlledvocabulary.language.Central_Huishui_Hmong=Central Huishui Hmong +controlledvocabulary.language.Central_Kanuri=Central Kanuri +controlledvocabulary.language.Central_Kurdish=Central Kurdish +controlledvocabulary.language.Central_Maewo=Central Maewo +controlledvocabulary.language.Central_Malay=Central Malay +controlledvocabulary.language.Central_Masela=Central Masela +controlledvocabulary.language.Central_Mashan_Hmong=Central Mashan Hmong +controlledvocabulary.language.Central_Mazahua=Central Mazahua +controlledvocabulary.language.Central_Melanau=Central Melanau +controlledvocabulary.language.Central_Mnong=Central Mnong +controlledvocabulary.language.Central_Nahuatl=Central Nahuatl +controlledvocabulary.language.Central_Nicobarese=Central Nicobarese +controlledvocabulary.language.Central_Ojibwa=Central Ojibwa +controlledvocabulary.language.Central_Okinawan=Central Okinawan +controlledvocabulary.language.Central_Palawano=Central Palawano +controlledvocabulary.language.Central_Pame=Central Pame +controlledvocabulary.language.Central_Pashto=Central Pashto +controlledvocabulary.language.Central_Pomo=Central Pomo +controlledvocabulary.language.Central_Puebla_Nahuatl=Central Puebla Nahuatl +controlledvocabulary.language.Central_Sama=Central Sama +controlledvocabulary.language.Central_Siberian_Yupik=Central Siberian Yupik +controlledvocabulary.language.Central_Sierra_Miwok=Central Sierra Miwok +controlledvocabulary.language.Central_Subanen=Central Subanen +controlledvocabulary.language.Central_Tagbanwa=Central Tagbanwa +controlledvocabulary.language.Central_Tarahumara=Central Tarahumara +controlledvocabulary.language.Central_Tunebo=Central Tunebo +controlledvocabulary.language.Central_Yupik=Central Yupik +controlledvocabulary.language.Central-Eastern_Niger_Fulfulde=Central-Eastern Niger Fulfulde +controlledvocabulary.language.Cent��m=Cent��m +controlledvocabulary.language.Cerma=Cerma +controlledvocabulary.language.Cha'ari=Cha'ari +controlledvocabulary.language.Chabu=Chabu +controlledvocabulary.language.Chachapoyas_Quechua=Chachapoyas Quechua +controlledvocabulary.language.Chachi=Chachi +controlledvocabulary.language.Chadian_Arabic=Chadian Arabic +controlledvocabulary.language.Chadian_Sign_Language=Chadian Sign Language +controlledvocabulary.language.Chadong=Chadong +controlledvocabulary.language.Chagatai=Chagatai +controlledvocabulary.language.Chaima=Chaima +controlledvocabulary.language.Chak=Chak +controlledvocabulary.language.Chakali=Chakali +controlledvocabulary.language.Chakavian=Chakavian +controlledvocabulary.language.Chakma=Chakma +controlledvocabulary.language.Chala=Chala +controlledvocabulary.language.Chaldean_Neo-Aramaic=Chaldean Neo-Aramaic +controlledvocabulary.language.Chalikha=Chalikha +controlledvocabulary.language.Chamacoco=Chamacoco +controlledvocabulary.language.Chamalal=Chamalal +controlledvocabulary.language.Chambeali=Chambeali +controlledvocabulary.language.Chambri=Chambri +controlledvocabulary.language.Chamicuro=Chamicuro +controlledvocabulary.language.Chamorro=Chamorro +controlledvocabulary.language.Chang_Naga=Chang Naga +controlledvocabulary.language.Changriwa=Changriwa +controlledvocabulary.language.Changthang=Changthang +controlledvocabulary.language.Chantyal=Chantyal +controlledvocabulary.language.Chan�=Chan� +controlledvocabulary.language.Chara=Chara +controlledvocabulary.language.Chaudangsi=Chaudangsi +controlledvocabulary.language.Chaura=Chaura +controlledvocabulary.language.Chavacano=Chavacano +controlledvocabulary.language.Chayahuita=Chayahuita +controlledvocabulary.language.Chayuco_Mixtec=Chayuco Mixtec +controlledvocabulary.language.Chazumba_Mixtec=Chazumba Mixtec +controlledvocabulary.language.Che=Che +controlledvocabulary.language.Chechen=Chechen +controlledvocabulary.language.Cheke_Holo=Cheke Holo +controlledvocabulary.language.Chemakum=Chemakum +controlledvocabulary.language.Chenapian=Chenapian +controlledvocabulary.language.Chenchu=Chenchu +controlledvocabulary.language.Chenoua=Chenoua +controlledvocabulary.language.Chepang=Chepang +controlledvocabulary.language.Chepya=Chepya +controlledvocabulary.language.Cherepon=Cherepon +controlledvocabulary.language.Cherokee=Cherokee +controlledvocabulary.language.Chesu=Chesu +controlledvocabulary.language.Chetco=Chetco +controlledvocabulary.language.Chewong=Chewong +controlledvocabulary.language.Cheyenne=Cheyenne +controlledvocabulary.language.Chhattisgarhi=Chhattisgarhi +controlledvocabulary.language.Chhintange=Chhintange +controlledvocabulary.language.Chhulung=Chhulung +controlledvocabulary.language.Chiangmai_Sign_Language=Chiangmai Sign Language +controlledvocabulary.language.Chiapanec=Chiapanec +controlledvocabulary.language.Chibcha=Chibcha +controlledvocabulary.language.Chicahuaxtla_Triqui=Chicahuaxtla Triqui +controlledvocabulary.language.Chichewa,_Chewa,_Nyanja=Chichewa, Chewa, Nyanja +controlledvocabulary.language.Chichicapan_Zapotec=Chichicapan Zapotec +controlledvocabulary.language.Chichimeca-Jonaz=Chichimeca-Jonaz +controlledvocabulary.language.Chickasaw=Chickasaw +controlledvocabulary.language.Chicomuceltec=Chicomuceltec +controlledvocabulary.language.Chiga=Chiga +controlledvocabulary.language.Chigmecatitl�n_Mixtec=Chigmecatitl�n Mixtec +controlledvocabulary.language.Chilcotin=Chilcotin +controlledvocabulary.language.Chilean_Sign_Language=Chilean Sign Language +controlledvocabulary.language.Chilisso=Chilisso +controlledvocabulary.language.Chiltepec_Chinantec=Chiltepec Chinantec +controlledvocabulary.language.Chimalapa_Zoque=Chimalapa Zoque +controlledvocabulary.language.Chimariko=Chimariko +controlledvocabulary.language.Chimborazo_Highland_Quichua=Chimborazo Highland Quichua +controlledvocabulary.language.Chimila=Chimila +controlledvocabulary.language.China_Buriat=China Buriat +controlledvocabulary.language.Chinali=Chinali +controlledvocabulary.language.Chinbon_Chin=Chinbon Chin +controlledvocabulary.language.Chincha_Quechua=Chincha Quechua +controlledvocabulary.language.Chinese=Chinese +controlledvocabulary.language.Chinese_Pidgin_English=Chinese Pidgin English +controlledvocabulary.language.Chinese_Sign_Language=Chinese Sign Language +controlledvocabulary.language.Chinook=Chinook +controlledvocabulary.language.Chinook_jargon=Chinook jargon +controlledvocabulary.language.Chipaya=Chipaya +controlledvocabulary.language.Chipewyan=Chipewyan +controlledvocabulary.language.Chippewa=Chippewa +controlledvocabulary.language.Chiquihuitl�n_Mazatec=Chiquihuitl�n Mazatec +controlledvocabulary.language.Chiquitano=Chiquitano +controlledvocabulary.language.Chiqui�n_Ancash_Quechua=Chiqui�n Ancash Quechua +controlledvocabulary.language.Chirip�=Chirip� +controlledvocabulary.language.Chiru=Chiru +controlledvocabulary.language.Chitimacha=Chitimacha +controlledvocabulary.language.Chitkuli_Kinnauri=Chitkuli Kinnauri +controlledvocabulary.language.Chittagonian=Chittagonian +controlledvocabulary.language.Chitwania_Tharu=Chitwania Tharu +controlledvocabulary.language.Choapan_Zapotec=Choapan Zapotec +controlledvocabulary.language.Chocangacakha=Chocangacakha +controlledvocabulary.language.Chochotec=Chochotec +controlledvocabulary.language.Choctaw=Choctaw +controlledvocabulary.language.Chodri=Chodri +controlledvocabulary.language.Chokri_Naga=Chokri Naga +controlledvocabulary.language.Chokwe=Chokwe +controlledvocabulary.language.Chol=Chol +controlledvocabulary.language.Chol�n=Chol�n +controlledvocabulary.language.Chong=Chong +controlledvocabulary.language.Choni=Choni +controlledvocabulary.language.Chonyi-Dzihana-Kauma=Chonyi-Dzihana-Kauma +controlledvocabulary.language.Chopi=Chopi +controlledvocabulary.language.Chorasmian=Chorasmian +controlledvocabulary.language.Chort�=Chort� +controlledvocabulary.language.Chothe_Naga=Chothe Naga +controlledvocabulary.language.Chrau=Chrau +controlledvocabulary.language.Chru=Chru +controlledvocabulary.language.Chuanqiandian_Cluster_Miao=Chuanqiandian Cluster Miao +controlledvocabulary.language.Chuave=Chuave +controlledvocabulary.language.Chug=Chug +controlledvocabulary.language.Chuj=Chuj +controlledvocabulary.language.Chuka=Chuka +controlledvocabulary.language.Chukot=Chukot +controlledvocabulary.language.Chukwa=Chukwa +controlledvocabulary.language.Chulym=Chulym +controlledvocabulary.language.Chumburung=Chumburung +controlledvocabulary.language.Chung=Chung +controlledvocabulary.language.Churahi=Churahi +controlledvocabulary.language.Chut=Chut +controlledvocabulary.language.Chuukese=Chuukese +controlledvocabulary.language.Chuvantsy=Chuvantsy +controlledvocabulary.language.Chuvash=Chuvash +controlledvocabulary.language.Chuwabu=Chuwabu +controlledvocabulary.language.Ch�cobo=Ch�cobo +controlledvocabulary.language.Ci_Gbe=Ci Gbe +controlledvocabulary.language.Cia-Cia=Cia-Cia +controlledvocabulary.language.Cibak=Cibak +controlledvocabulary.language.Cicipu=Cicipu +controlledvocabulary.language.Cimbrian=Cimbrian +controlledvocabulary.language.Cinda-Regi-Tiyal=Cinda-Regi-Tiyal +controlledvocabulary.language.Cineni=Cineni +controlledvocabulary.language.Cinta_Larga=Cinta Larga +controlledvocabulary.language.Cisalpine_Gaulish=Cisalpine Gaulish +controlledvocabulary.language.Cishingini=Cishingini +controlledvocabulary.language.Citak=Citak +controlledvocabulary.language.Ciwogai=Ciwogai +controlledvocabulary.language.Clallam=Clallam +controlledvocabulary.language.Classical_Armenian=Classical Armenian +controlledvocabulary.language.Classical_Mandaic=Classical Mandaic +controlledvocabulary.language.Classical_Mongolian=Classical Mongolian +controlledvocabulary.language.Classical_Nahuatl=Classical Nahuatl +controlledvocabulary.language.Classical_Newari=Classical Newari +controlledvocabulary.language.Classical_Quechua=Classical Quechua +controlledvocabulary.language.Classical_Sanskrit=Classical Sanskrit +controlledvocabulary.language.Classical_Syriac=Classical Syriac +controlledvocabulary.language.Classical_Tibetan=Classical Tibetan +controlledvocabulary.language.Coahuilteco=Coahuilteco +controlledvocabulary.language.Coast_Miwok=Coast Miwok +controlledvocabulary.language.Coastal_Konjo=Coastal Konjo +controlledvocabulary.language.Coatecas_Altas_Zapotec=Coatecas Altas Zapotec +controlledvocabulary.language.Coatepec_Nahuatl=Coatepec Nahuatl +controlledvocabulary.language.Coatl�n_Mixe=Coatl�n Mixe +controlledvocabulary.language.Coatl�n_Zapotec=Coatl�n Zapotec +controlledvocabulary.language.Coatzospan_Mixtec=Coatzospan Mixtec +controlledvocabulary.language.Cocama-Cocamilla=Cocama-Cocamilla +controlledvocabulary.language.Cochimi=Cochimi +controlledvocabulary.language.Cocopa=Cocopa +controlledvocabulary.language.Cocos_Islands_Malay=Cocos Islands Malay +controlledvocabulary.language.Coeur_d'Alene=Coeur d'Alene +controlledvocabulary.language.Cof�n=Cof�n +controlledvocabulary.language.Cogui=Cogui +controlledvocabulary.language.Col=Col +controlledvocabulary.language.Colombian_Sign_Language=Colombian Sign Language +controlledvocabulary.language.Colonia_Tovar_German=Colonia Tovar German +controlledvocabulary.language.Colorado=Colorado +controlledvocabulary.language.Columbia-Wenatchi=Columbia-Wenatchi +controlledvocabulary.language.Comaltepec_Chinantec=Comaltepec Chinantec +controlledvocabulary.language.Comanche=Comanche +controlledvocabulary.language.Comecrudo=Comecrudo +controlledvocabulary.language.Como_Karim=Como Karim +controlledvocabulary.language.Comox=Comox +controlledvocabulary.language.Con=Con +controlledvocabulary.language.Congo_Swahili=Congo Swahili +controlledvocabulary.language.Coos=Coos +controlledvocabulary.language.Copainal�_Zoque=Copainal� Zoque +controlledvocabulary.language.Copala_Triqui=Copala Triqui +controlledvocabulary.language.Coptic=Coptic +controlledvocabulary.language.Coquille=Coquille +controlledvocabulary.language.Cori=Cori +controlledvocabulary.language.Cornish=Cornish +controlledvocabulary.language.Corongo_Ancash_Quechua=Corongo Ancash Quechua +controlledvocabulary.language.Corsican=Corsican +controlledvocabulary.language.Costa_Rican_Sign_Language=Costa Rican Sign Language +controlledvocabulary.language.Cotabato_Manobo=Cotabato Manobo +controlledvocabulary.language.Cotoname=Cotoname +controlledvocabulary.language.Cowlitz=Cowlitz +controlledvocabulary.language.Coyotepec_Popoloca=Coyotepec Popoloca +controlledvocabulary.language.Coyutla_Totonac=Coyutla Totonac +controlledvocabulary.language.Cree=Cree +controlledvocabulary.language.Creek=Creek +controlledvocabulary.language.Crimean_Tatar=Crimean Tatar +controlledvocabulary.language.Croatia_Sign_Language=Croatia Sign Language +controlledvocabulary.language.Croatian=Croatian +controlledvocabulary.language.Cross_River_Mbembe=Cross River Mbembe +controlledvocabulary.language.Crow=Crow +controlledvocabulary.language.Cruze�o=Cruze�o +controlledvocabulary.language.Cua=Cua +controlledvocabulary.language.Cuba_Sign_Language=Cuba Sign Language +controlledvocabulary.language.Cubeo=Cubeo +controlledvocabulary.language.Cuiba=Cuiba +controlledvocabulary.language.Cuitlatec=Cuitlatec +controlledvocabulary.language.Culina=Culina +controlledvocabulary.language.Cumanagoto=Cumanagoto +controlledvocabulary.language.Cumbric=Cumbric +controlledvocabulary.language.Cun=Cun +controlledvocabulary.language.Cuneiform_Luwian=Cuneiform Luwian +controlledvocabulary.language.Cupe�o=Cupe�o +controlledvocabulary.language.Curonian=Curonian +controlledvocabulary.language.Curripaco=Curripaco +controlledvocabulary.language.Cusco_Quechua=Cusco Quechua +controlledvocabulary.language.Cutchi-Swahili=Cutchi-Swahili +controlledvocabulary.language.Cuvok=Cuvok +controlledvocabulary.language.Cuyamecalco_Mixtec=Cuyamecalco Mixtec +controlledvocabulary.language.Cuyonon=Cuyonon +controlledvocabulary.language.Cwi_Bwamu=Cwi Bwamu +controlledvocabulary.language.Cypriot_Arabic=Cypriot Arabic +controlledvocabulary.language.Czech=Czech +controlledvocabulary.language.Czech_Sign_Language=Czech Sign Language +controlledvocabulary.language.C��ng=C��ng +controlledvocabulary.language.Da'a_Kaili=Da'a Kaili +controlledvocabulary.language.Daai_Chin=Daai Chin +controlledvocabulary.language.Daakaka=Daakaka +controlledvocabulary.language.Daantanai'=Daantanai' +controlledvocabulary.language.Daasanach=Daasanach +controlledvocabulary.language.Daatsiin=Daats?i?in +controlledvocabulary.language.Daba=Daba +controlledvocabulary.language.Dabarre=Dabarre +controlledvocabulary.language.Dabe=Dabe +controlledvocabulary.language.Dacian=Dacian +controlledvocabulary.language.Dadi_Dadi=Dadi Dadi +controlledvocabulary.language.Dadibi=Dadibi +controlledvocabulary.language.Dadiya=Dadiya +controlledvocabulary.language.Daga=Daga +controlledvocabulary.language.Dagaari_Dioula=Dagaari Dioula +controlledvocabulary.language.Dagba=Dagba +controlledvocabulary.language.Dagbani=Dagbani +controlledvocabulary.language.Dagik=Dagik +controlledvocabulary.language.Dagoman=Dagoman +controlledvocabulary.language.Dahalik=Dahalik +controlledvocabulary.language.Dahalo=Dahalo +controlledvocabulary.language.Daho-Doo=Daho-Doo +controlledvocabulary.language.Dai=Dai +controlledvocabulary.language.Dai_Zhuang=Dai Zhuang +controlledvocabulary.language.Dair=Dair +controlledvocabulary.language.Dakka=Dakka +controlledvocabulary.language.Dakota=Dakota +controlledvocabulary.language.Dakpakha=Dakpakha +controlledvocabulary.language.Dalabon=Dalabon +controlledvocabulary.language.Dalmatian=Dalmatian +controlledvocabulary.language.Daloa_B�t�=Daloa B�t� +controlledvocabulary.language.Dama=Dama +controlledvocabulary.language.Damakawa=Damakawa +controlledvocabulary.language.Damal=Damal +controlledvocabulary.language.Dambi=Dambi +controlledvocabulary.language.Dameli=Dameli +controlledvocabulary.language.Dampelas=Dampelas +controlledvocabulary.language.Dan=Dan +controlledvocabulary.language.Danaru=Danaru +controlledvocabulary.language.Danau=Danau +controlledvocabulary.language.Dandami_Maria=Dandami Maria +controlledvocabulary.language.Dangal�at=Dangal�at +controlledvocabulary.language.Dangaura_Tharu=Dangaura Tharu +controlledvocabulary.language.Danish=Danish +controlledvocabulary.language.Danish_Sign_Language=Danish Sign Language +controlledvocabulary.language.Dano=Dano +controlledvocabulary.language.Danu=Danu +controlledvocabulary.language.Dao=Dao +controlledvocabulary.language.Daonda=Daonda +controlledvocabulary.language.Dar_Daju_Daju=Dar Daju Daju +controlledvocabulary.language.Dar_Fur_Daju=Dar Fur Daju +controlledvocabulary.language.Dar_Sila_Daju=Dar Sila Daju +controlledvocabulary.language.Darai=Darai +controlledvocabulary.language.Dargwa=Dargwa +controlledvocabulary.language.Dari=Dari +controlledvocabulary.language.Darkinyung=Darkinyung +controlledvocabulary.language.Darlong=Darlong +controlledvocabulary.language.Darmiya=Darmiya +controlledvocabulary.language.Daro-Matu_Melanau=Daro-Matu Melanau +controlledvocabulary.language.Dass=Dass +controlledvocabulary.language.Datooga=Datooga +controlledvocabulary.language.Daungwurrung=Daungwurrung +controlledvocabulary.language.Daur=Daur +controlledvocabulary.language.Davawenyo=Davawenyo +controlledvocabulary.language.Dawawa=Dawawa +controlledvocabulary.language.Dawera-Daweloor=Dawera-Daweloor +controlledvocabulary.language.Dawik_Kui=Dawik Kui +controlledvocabulary.language.Dawro=Dawro +controlledvocabulary.language.Day=Day +controlledvocabulary.language.Dayi=Dayi +controlledvocabulary.language.Daza=Daza +controlledvocabulary.language.Dazaga=Dazaga +controlledvocabulary.language.Deccan=Deccan +controlledvocabulary.language.Dedua=Dedua +controlledvocabulary.language.Defaka=Defaka +controlledvocabulary.language.Defi_Gbe=Defi Gbe +controlledvocabulary.language.Deg=Deg +controlledvocabulary.language.Degema=Degema +controlledvocabulary.language.Degenan=Degenan +controlledvocabulary.language.Degexit'an=Degexit'an +controlledvocabulary.language.Dehu=Dehu +controlledvocabulary.language.Dehwari=Dehwari +controlledvocabulary.language.Dek=Dek +controlledvocabulary.language.Dela-Oenale=Dela-Oenale +controlledvocabulary.language.Delaware=Delaware +controlledvocabulary.language.Delo=Delo +controlledvocabulary.language.Dem=Dem +controlledvocabulary.language.Dema=Dema +controlledvocabulary.language.Demisa=Demisa +controlledvocabulary.language.Demta=Demta +controlledvocabulary.language.Dendi_(Benin)=Dendi (Benin) +controlledvocabulary.language.Dendi_(Central_African_Republic)=Dendi (Central African Republic) +controlledvocabulary.language.Dengese=Dengese +controlledvocabulary.language.Dengka=Dengka +controlledvocabulary.language.Deno=Deno +controlledvocabulary.language.Denya=Denya +controlledvocabulary.language.Den�=Den� +controlledvocabulary.language.Deori=Deori +controlledvocabulary.language.Dera_(Indonesia)=Dera (Indonesia) +controlledvocabulary.language.Dera_(Nigeria)=Dera (Nigeria) +controlledvocabulary.language.Desano=Desano +controlledvocabulary.language.Desiya=Desiya +controlledvocabulary.language.Dewas_Rai=Dewas Rai +controlledvocabulary.language.Dewoin=Dewoin +controlledvocabulary.language.Dezfuli=Dezfuli +controlledvocabulary.language.Dghwede=Dghwede +controlledvocabulary.language.Dhaiso=Dhaiso +controlledvocabulary.language.Dhalandji=Dhalandji +controlledvocabulary.language.Dhangu-Djangu=Dhangu-Djangu +controlledvocabulary.language.Dhanki=Dhanki +controlledvocabulary.language.Dhanwar_(Nepal)=Dhanwar (Nepal) +controlledvocabulary.language.Dhao=Dhao +controlledvocabulary.language.Dharawal=Dharawal +controlledvocabulary.language.Dhargari=Dhargari +controlledvocabulary.language.Dharuk=Dharuk +controlledvocabulary.language.Dharumbal=Dharumbal +controlledvocabulary.language.Dhatki=Dhatki +controlledvocabulary.language.Dhimal=Dhimal +controlledvocabulary.language.Dhodia=Dhodia +controlledvocabulary.language.Dhofari_Arabic=Dhofari Arabic +controlledvocabulary.language.Dhudhuroa=Dhudhuroa +controlledvocabulary.language.Dhundari=Dhundari +controlledvocabulary.language.Dhungaloo=Dhungaloo +controlledvocabulary.language.Dhurga=Dhurga +controlledvocabulary.language.Dhuwal=Dhuwal +controlledvocabulary.language.Dhuwaya=Dhuwaya +controlledvocabulary.language.Dia=Dia +controlledvocabulary.language.Dibabawon_Manobo=Dibabawon Manobo +controlledvocabulary.language.Dibiyaso=Dibiyaso +controlledvocabulary.language.Dibo=Dibo +controlledvocabulary.language.Dibole=Dibole +controlledvocabulary.language.Dicamay_Agta=Dicamay Agta +controlledvocabulary.language.Didinga=Didinga +controlledvocabulary.language.Dido=Dido +controlledvocabulary.language.Dieri=Dieri +controlledvocabulary.language.Digaro-Mishmi=Digaro-Mishmi +controlledvocabulary.language.Digo=Digo +controlledvocabulary.language.Dii=Dii +controlledvocabulary.language.Dijim-Bwilim=Dijim-Bwilim +controlledvocabulary.language.Dilling=Dilling +controlledvocabulary.language.Dima=Dima +controlledvocabulary.language.Dimasa=Dimasa +controlledvocabulary.language.Dimbong=Dimbong +controlledvocabulary.language.Dime=Dime +controlledvocabulary.language.Dimli_(individual_language)=Dimli (individual language) +controlledvocabulary.language.Ding=Ding +controlledvocabulary.language.Dinka=Dinka +controlledvocabulary.language.Dir-Nyamzak-Mbarimi=Dir-Nyamzak-Mbarimi +controlledvocabulary.language.Dirasha=Dirasha +controlledvocabulary.language.Diri=Diri +controlledvocabulary.language.Diriku=Diriku +controlledvocabulary.language.Dirim=Dirim +controlledvocabulary.language.Disa=Disa +controlledvocabulary.language.Ditammari=Ditammari +controlledvocabulary.language.Ditidaht=Ditidaht +controlledvocabulary.language.Diuwe=Diuwe +controlledvocabulary.language.Diuxi-Tilantongo_Mixtec=Diuxi-Tilantongo Mixtec +controlledvocabulary.language.Dixon_Reef=Dixon Reef +controlledvocabulary.language.Dizin=Dizin +controlledvocabulary.language.Djabugay=Djabugay +controlledvocabulary.language.Djabwurrung=Djabwurrung +controlledvocabulary.language.Djadjawurrung=Djadjawurrung +controlledvocabulary.language.Djambarrpuyngu=Djambarrpuyngu +controlledvocabulary.language.Djamindjung=Djamindjung +controlledvocabulary.language.Djangun=Djangun +controlledvocabulary.language.Djawi=Djawi +controlledvocabulary.language.Djeebbana=Djeebbana +controlledvocabulary.language.Djimini_Senoufo=Djimini Senoufo +controlledvocabulary.language.Djinang=Djinang +controlledvocabulary.language.Djinba=Djinba +controlledvocabulary.language.Djiwarli=Djiwarli +controlledvocabulary.language.Dobel=Dobel +controlledvocabulary.language.Dobu=Dobu +controlledvocabulary.language.Doe=Doe +controlledvocabulary.language.Doga=Doga +controlledvocabulary.language.Doghoro=Doghoro +controlledvocabulary.language.Dogoso=Dogoso +controlledvocabulary.language.Dogos�=Dogos� +controlledvocabulary.language.Dogri_(individual_language)=Dogri (individual language) +controlledvocabulary.language.Dogri_(macrolanguage)=Dogri (macrolanguage) +controlledvocabulary.language.Dogul_Dom_Dogon=Dogul Dom Dogon +controlledvocabulary.language.Doka=Doka +controlledvocabulary.language.Doko-Uyanga=Doko-Uyanga +controlledvocabulary.language.Dokshi=Dokshi +controlledvocabulary.language.Dolgan=Dolgan +controlledvocabulary.language.Dolpo=Dolpo +controlledvocabulary.language.Dom=Dom +controlledvocabulary.language.Domaaki=Domaaki +controlledvocabulary.language.Domari=Domari +controlledvocabulary.language.Dombe=Dombe +controlledvocabulary.language.Dominican_Sign_Language=Dominican Sign Language +controlledvocabulary.language.Dompo=Dompo +controlledvocabulary.language.Domu=Domu +controlledvocabulary.language.Domung=Domung +controlledvocabulary.language.Dondo=Dondo +controlledvocabulary.language.Dong=Dong +controlledvocabulary.language.Dongo=Dongo +controlledvocabulary.language.Dongotono=Dongotono +controlledvocabulary.language.Dongshanba_Lalo=Dongshanba Lalo +controlledvocabulary.language.Dongxiang=Dongxiang +controlledvocabulary.language.Donno_So_Dogon=Donno So Dogon +controlledvocabulary.language.Doondo=Doondo +controlledvocabulary.language.Dori'o=Dori'o +controlledvocabulary.language.Doromu-Koki=Doromu-Koki +controlledvocabulary.language.Dorze=Dorze +controlledvocabulary.language.Doso=Doso +controlledvocabulary.language.Dotyali=Dotyali +controlledvocabulary.language.Doutai=Doutai +controlledvocabulary.language.Doyayo=Doyayo +controlledvocabulary.language.Drents=Drents +controlledvocabulary.language.Drung=Drung +controlledvocabulary.language.Duala=Duala +controlledvocabulary.language.Duano=Duano +controlledvocabulary.language.Duau=Duau +controlledvocabulary.language.Dubli=Dubli +controlledvocabulary.language.Dubu=Dubu +controlledvocabulary.language.Dugun=Dugun +controlledvocabulary.language.Duguri=Duguri +controlledvocabulary.language.Dugwor=Dugwor +controlledvocabulary.language.Duhwa=Duhwa +controlledvocabulary.language.Duke=Duke +controlledvocabulary.language.Dulbu=Dulbu +controlledvocabulary.language.Duli-Gey=Duli-Gey +controlledvocabulary.language.Duma=Duma +controlledvocabulary.language.Dumbea=Dumbea +controlledvocabulary.language.Dumi=Dumi +controlledvocabulary.language.Dumpas=Dumpas +controlledvocabulary.language.Dumun=Dumun +controlledvocabulary.language.Duna=Duna +controlledvocabulary.language.Dungan=Dungan +controlledvocabulary.language.Dungmali=Dungmali +controlledvocabulary.language.Dungra_Bhil=Dungra Bhil +controlledvocabulary.language.Dungu=Dungu +controlledvocabulary.language.Dupaninan_Agta=Dupaninan Agta +controlledvocabulary.language.Dura=Dura +controlledvocabulary.language.Duri=Duri +controlledvocabulary.language.Duriankere=Duriankere +controlledvocabulary.language.Durop=Durop +controlledvocabulary.language.Duruma=Duruma +controlledvocabulary.language.Duruwa=Duruwa +controlledvocabulary.language.Dusner=Dusner +controlledvocabulary.language.Dusun_Deyah=Dusun Deyah +controlledvocabulary.language.Dusun_Malang=Dusun Malang +controlledvocabulary.language.Dusun_Witu=Dusun Witu +controlledvocabulary.language.Dutch=Dutch +controlledvocabulary.language.Dutch_Sign_Language=Dutch Sign Language +controlledvocabulary.language.Dutton_World_Speedwords=Dutton World Speedwords +controlledvocabulary.language.Duungooma=Duungooma +controlledvocabulary.language.Duupa=Duupa +controlledvocabulary.language.Duvle=Duvle +controlledvocabulary.language.Duwai=Duwai +controlledvocabulary.language.Duwet=Duwet +controlledvocabulary.language.Duya=Du?ya +controlledvocabulary.language.Dwang=Dwang +controlledvocabulary.language.Dyaberdyaber=Dyaberdyaber +controlledvocabulary.language.Dyan=Dyan +controlledvocabulary.language.Dyangadi=Dyangadi +controlledvocabulary.language.Dyarim=Dyarim +controlledvocabulary.language.Dyirbal=Dyirbal +controlledvocabulary.language.Dyugun=Dyugun +controlledvocabulary.language.Dyula=Dyula +controlledvocabulary.language.Dza=Dza +controlledvocabulary.language.Dzalakha=Dzalakha +controlledvocabulary.language.Dzando=Dzando +controlledvocabulary.language.Dzao_Min=Dzao Min +controlledvocabulary.language.Dzongkha=Dzongkha +controlledvocabulary.language.Dz��ngoo=Dz��ngoo +controlledvocabulary.language.D�w=D�w +controlledvocabulary.language.E=E +controlledvocabulary.language.E'ma_Buyang=E'ma Buyang +controlledvocabulary.language.E'�apa_Woromaipu=E'�apa Woromaipu +controlledvocabulary.language.Early_Tripuri=Early Tripuri +controlledvocabulary.language.East_Ambae=East Ambae +controlledvocabulary.language.East_Berawan=East Berawan +controlledvocabulary.language.East_Damar=East Damar +controlledvocabulary.language.East_Futuna=East Futuna +controlledvocabulary.language.East_Kewa=East Kewa +controlledvocabulary.language.East_Limba=East Limba +controlledvocabulary.language.East_Makian=East Makian +controlledvocabulary.language.East_Masela=East Masela +controlledvocabulary.language.East_Nyala=East Nyala +controlledvocabulary.language.East_Tarangan=East Tarangan +controlledvocabulary.language.East_Yugur=East Yugur +controlledvocabulary.language.Eastern_Abnaki=Eastern Abnaki +controlledvocabulary.language.Eastern_Acipa=Eastern Acipa +controlledvocabulary.language.Eastern_Apur�mac_Quechua=Eastern Apur�mac Quechua +controlledvocabulary.language.Eastern_Arrernte=Eastern Arrernte +controlledvocabulary.language.Eastern_Balochi=Eastern Balochi +controlledvocabulary.language.Eastern_Bolivian_Guaran�=Eastern Bolivian Guaran� +controlledvocabulary.language.Eastern_Bontok=Eastern Bontok +controlledvocabulary.language.Eastern_Bru=Eastern Bru +controlledvocabulary.language.Eastern_Canadian_Inuktitut=Eastern Canadian Inuktitut +controlledvocabulary.language.Eastern_Cham=Eastern Cham +controlledvocabulary.language.Eastern_Durango_Nahuatl=Eastern Durango Nahuatl +controlledvocabulary.language.Eastern_Egyptian_Bedawi_Arabic=Eastern Egyptian Bedawi Arabic +controlledvocabulary.language.Eastern_Frisian=Eastern Frisian +controlledvocabulary.language.Eastern_Gorkha_Tamang=Eastern Gorkha Tamang +controlledvocabulary.language.Eastern_Highland_Chatino=Eastern Highland Chatino +controlledvocabulary.language.Eastern_Highland_Otomi=Eastern Highland Otomi +controlledvocabulary.language.Eastern_Hongshuihe_Zhuang=Eastern Hongshuihe Zhuang +controlledvocabulary.language.Eastern_Huasteca_Nahuatl=Eastern Huasteca Nahuatl +controlledvocabulary.language.Eastern_Huishui_Hmong=Eastern Huishui Hmong +controlledvocabulary.language.Eastern_Karaboro=Eastern Karaboro +controlledvocabulary.language.Eastern_Katu=Eastern Katu +controlledvocabulary.language.Eastern_Kayah=Eastern Kayah +controlledvocabulary.language.Eastern_Keres=Eastern Keres +controlledvocabulary.language.Eastern_Khumi_Chin=Eastern Khumi Chin +controlledvocabulary.language.Eastern_Krahn=Eastern Krahn +controlledvocabulary.language.Eastern_Lalu=Eastern Lalu +controlledvocabulary.language.Eastern_Lawa=Eastern Lawa +controlledvocabulary.language.Eastern_Magar=Eastern Magar +controlledvocabulary.language.Eastern_Maninkakan=Eastern Maninkakan +controlledvocabulary.language.Eastern_Mari=Eastern Mari +controlledvocabulary.language.Eastern_Maroon_Creole=Eastern Maroon Creole +controlledvocabulary.language.Eastern_Meohang=Eastern Meohang +controlledvocabulary.language.Eastern_Minyag=Eastern Minyag +controlledvocabulary.language.Eastern_Mnong=Eastern Mnong +controlledvocabulary.language.Eastern_Muria=Eastern Muria +controlledvocabulary.language.Eastern_Ngad'a=Eastern Ngad'a +controlledvocabulary.language.Eastern_Nisu=Eastern Nisu +controlledvocabulary.language.Eastern_Ojibwa=Eastern Ojibwa +controlledvocabulary.language.Eastern_Oromo=Eastern Oromo +controlledvocabulary.language.Eastern_Parbate_Kham=Eastern Parbate Kham +controlledvocabulary.language.Eastern_Penan=Eastern Penan +controlledvocabulary.language.Eastern_Pomo=Eastern Pomo +controlledvocabulary.language.Eastern_Qiandong_Miao=Eastern Qiandong Miao +controlledvocabulary.language.Eastern_Subanen=Eastern Subanen +controlledvocabulary.language.Eastern_Tamang=Eastern Tamang +controlledvocabulary.language.Eastern_Tawbuid=Eastern Tawbuid +controlledvocabulary.language.Eastern_Xiangxi_Miao=Eastern Xiangxi Miao +controlledvocabulary.language.Eastern_Xwla_Gbe=Eastern Xwla Gbe +controlledvocabulary.language.Eastern_Yiddish=Eastern Yiddish +controlledvocabulary.language.Ebira=Ebira +controlledvocabulary.language.Eblan=Eblan +controlledvocabulary.language.Ebri�=Ebri� +controlledvocabulary.language.Ebughu=Ebughu +controlledvocabulary.language.Ecuadorian_Sign_Language=Ecuadorian Sign Language +controlledvocabulary.language.Ede_Cabe=Ede Cabe +controlledvocabulary.language.Ede_Ica=Ede Ica +controlledvocabulary.language.Ede_Idaca=Ede Idaca +controlledvocabulary.language.Ede_Ije=Ede Ije +controlledvocabulary.language.Edera_Awyu=Edera Awyu +controlledvocabulary.language.Edolo=Edolo +controlledvocabulary.language.Edomite=Edomite +controlledvocabulary.language.Edopi=Edopi +controlledvocabulary.language.Efai=Efai +controlledvocabulary.language.Efe=Efe +controlledvocabulary.language.Efik=Efik +controlledvocabulary.language.Efutop=Efutop +controlledvocabulary.language.Ega=Ega +controlledvocabulary.language.Eggon=Eggon +controlledvocabulary.language.Egypt_Sign_Language=Egypt Sign Language +controlledvocabulary.language.Egyptian_(Ancient)=Egyptian (Ancient) +controlledvocabulary.language.Egyptian_Arabic=Egyptian Arabic +controlledvocabulary.language.Ehueun=Ehueun +controlledvocabulary.language.Eipomek=Eipomek +controlledvocabulary.language.Eitiep=Eitiep +controlledvocabulary.language.Ejagham=Ejagham +controlledvocabulary.language.Ejamat=Ejamat +controlledvocabulary.language.Ekai_Chin=Ekai Chin +controlledvocabulary.language.Ekajuk=Ekajuk +controlledvocabulary.language.Ekari=Ekari +controlledvocabulary.language.Eki=Eki +controlledvocabulary.language.Ekit=Ekit +controlledvocabulary.language.Ekpeye=Ekpeye +controlledvocabulary.language.El_Alto_Zapotec=El Alto Zapotec +controlledvocabulary.language.El_Hugeirat=El Hugeirat +controlledvocabulary.language.El_Molo=El Molo +controlledvocabulary.language.El_Nayar_Cora=El Nayar Cora +controlledvocabulary.language.Elamite=Elamite +controlledvocabulary.language.Eleme=Eleme +controlledvocabulary.language.Elepi=Elepi +controlledvocabulary.language.Elfdalian=Elfdalian +controlledvocabulary.language.Elip=Elip +controlledvocabulary.language.Elkei=Elkei +controlledvocabulary.language.Elotepec_Zapotec=Elotepec Zapotec +controlledvocabulary.language.Eloyi=Eloyi +controlledvocabulary.language.Elseng=Elseng +controlledvocabulary.language.Elu=Elu +controlledvocabulary.language.Elymian=Elymian +controlledvocabulary.language.Emae=Emae +controlledvocabulary.language.Emai-Iuleha-Ora=Emai-Iuleha-Ora +controlledvocabulary.language.Eman=Eman +controlledvocabulary.language.Embaloh=Embaloh +controlledvocabulary.language.Ember�-Baud�=Ember�-Baud� +controlledvocabulary.language.Ember�-Cat�o=Ember�-Cat�o +controlledvocabulary.language.Ember�-Cham�=Ember�-Cham� +controlledvocabulary.language.Ember�-Tad�=Ember�-Tad� +controlledvocabulary.language.Embu=Embu +controlledvocabulary.language.Emerillon=Emerillon +controlledvocabulary.language.Emilian=Emilian +controlledvocabulary.language.Emplawas=Emplawas +controlledvocabulary.language.Emumu=Emumu +controlledvocabulary.language.En=En +controlledvocabulary.language.Enawen�-Naw�=Enawen�-Naw� +controlledvocabulary.language.Ende=Ende +controlledvocabulary.language.Enga=Enga +controlledvocabulary.language.Engdewu=Engdewu +controlledvocabulary.language.Engenni=Engenni +controlledvocabulary.language.Enggano=Enggano +controlledvocabulary.language.English=English +controlledvocabulary.language.Enlhet=Enlhet +controlledvocabulary.language.Enrekang=Enrekang +controlledvocabulary.language.Enu=Enu +controlledvocabulary.language.Enwan_(Akwa_Ibom_State)=Enwan (Akwa Ibom State) +controlledvocabulary.language.Enwan_(Edo_State)=Enwan (Edo State) +controlledvocabulary.language.Enxet=Enxet +controlledvocabulary.language.Enya=Enya +controlledvocabulary.language.Epena=Epena +controlledvocabulary.language.Epi-Olmec=Epi-Olmec +controlledvocabulary.language.Epie=Epie +controlledvocabulary.language.Epigraphic_Mayan=Epigraphic Mayan +controlledvocabulary.language.Eravallan=Eravallan +controlledvocabulary.language.Erave=Erave +controlledvocabulary.language.Ere=Ere +controlledvocabulary.language.Eritai=Eritai +controlledvocabulary.language.Erokwanas=Erokwanas +controlledvocabulary.language.Erre=Erre +controlledvocabulary.language.Erromintxela=Erromintxela +controlledvocabulary.language.Ersu=Ersu +controlledvocabulary.language.Eruwa=Eruwa +controlledvocabulary.language.Erzya=Erzya +controlledvocabulary.language.Esan=Esan +controlledvocabulary.language.Ese=Ese +controlledvocabulary.language.Ese_Ejja=Ese Ejja +controlledvocabulary.language.Eshtehardi=Eshtehardi +controlledvocabulary.language.Esimbi=Esimbi +controlledvocabulary.language.Eskayan=Eskayan +controlledvocabulary.language.Esperanto=Esperanto +controlledvocabulary.language.Esselen=Esselen +controlledvocabulary.language.Estado_de_M�xico_Otomi=Estado de M�xico Otomi +controlledvocabulary.language.Estonian=Estonian +controlledvocabulary.language.Estonian_Sign_Language=Estonian Sign Language +controlledvocabulary.language.Esuma=Esuma +controlledvocabulary.language.Etchemin=Etchemin +controlledvocabulary.language.Etebi=Etebi +controlledvocabulary.language.Eten=Eten +controlledvocabulary.language.Eteocretan=Eteocretan +controlledvocabulary.language.Eteocypriot=Eteocypriot +controlledvocabulary.language.Ethiopian_Sign_Language=Ethiopian Sign Language +controlledvocabulary.language.Etkywan=Etkywan +controlledvocabulary.language.Eton_(Cameroon)=Eton (Cameroon) +controlledvocabulary.language.Eton_(Vanuatu)=Eton (Vanuatu) +controlledvocabulary.language.Etruscan=Etruscan +controlledvocabulary.language.Etulo=Etulo +controlledvocabulary.language.Eudeve=Eudeve +controlledvocabulary.language.Evant=Evant +controlledvocabulary.language.Even=Even +controlledvocabulary.language.Evenki=Evenki +controlledvocabulary.language.Eviya=Eviya +controlledvocabulary.language.Ewage-Notu=Ewage-Notu +controlledvocabulary.language.Ewe=Ewe +controlledvocabulary.language.Ewondo=Ewondo +controlledvocabulary.language.Extremaduran=Extremaduran +controlledvocabulary.language.Eyak=Eyak +controlledvocabulary.language.Ezaa=Ezaa +controlledvocabulary.language.Fa_d'Ambu=Fa d'Ambu +controlledvocabulary.language.Fagani=Fagani +controlledvocabulary.language.Faifi=Faifi +controlledvocabulary.language.Faire_Atta=Faire Atta +controlledvocabulary.language.Faita=Faita +controlledvocabulary.language.Faiwol=Faiwol +controlledvocabulary.language.Fala=Fala +controlledvocabulary.language.Falam_Chin=Falam Chin +controlledvocabulary.language.Fali=Fali +controlledvocabulary.language.Faliscan=Faliscan +controlledvocabulary.language.Fam=Fam +controlledvocabulary.language.Fanagalo=Fanagalo +controlledvocabulary.language.Fanamaket=Fanamaket +controlledvocabulary.language.Fanbak=Fanbak +controlledvocabulary.language.Fang_(Cameroon)=Fang (Cameroon) +controlledvocabulary.language.Fang_(Equatorial_Guinea)=Fang (Equatorial Guinea) +controlledvocabulary.language.Fania=Fania +controlledvocabulary.language.Fanti=Fanti +controlledvocabulary.language.Far_Western_Muria=Far Western Muria +controlledvocabulary.language.Farefare=Farefare +controlledvocabulary.language.Faroese=Faroese +controlledvocabulary.language.Fas=Fas +controlledvocabulary.language.Fasu=Fasu +controlledvocabulary.language.Fataleka=Fataleka +controlledvocabulary.language.Fataluku=Fataluku +controlledvocabulary.language.Fayu=Fayu +controlledvocabulary.language.Fe'fe'=Fe'fe' +controlledvocabulary.language.Fembe=Fembe +controlledvocabulary.language.Fernando_Po_Creole_English=Fernando Po Creole English +controlledvocabulary.language.Feroge=Feroge +controlledvocabulary.language.Fiji_Hindi=Fiji Hindi +controlledvocabulary.language.Fijian=Fijian +controlledvocabulary.language.Filipino=Filipino +controlledvocabulary.language.Filomena_Mata-Coahuitl�n_Totonac=Filomena Mata-Coahuitl�n Totonac +controlledvocabulary.language.Finland-Swedish_Sign_Language=Finland-Swedish Sign Language +controlledvocabulary.language.Finnish=Finnish +controlledvocabulary.language.Finnish_Sign_Language=Finnish Sign Language +controlledvocabulary.language.Finongan=Finongan +controlledvocabulary.language.Fipa=Fipa +controlledvocabulary.language.Firan=Firan +controlledvocabulary.language.Fiwaga=Fiwaga +controlledvocabulary.language.Flaaitaal=Flaaitaal +controlledvocabulary.language.Flinders_Island=Flinders Island +controlledvocabulary.language.Foau=Foau +controlledvocabulary.language.Foi=Foi +controlledvocabulary.language.Foia_Foia=Foia Foia +controlledvocabulary.language.Folopa=Folopa +controlledvocabulary.language.Foma=Foma +controlledvocabulary.language.Fon=Fon +controlledvocabulary.language.Fongoro=Fongoro +controlledvocabulary.language.Foodo=Foodo +controlledvocabulary.language.Forak=Forak +controlledvocabulary.language.Fordata=Fordata +controlledvocabulary.language.Fore=Fore +controlledvocabulary.language.Forest_Enets=Forest Enets +controlledvocabulary.language.Fortsenal=Fortsenal +controlledvocabulary.language.Francisco_Le�n_Zoque=Francisco Le�n Zoque +controlledvocabulary.language.Frankish=Frankish +controlledvocabulary.language.French=French +controlledvocabulary.language.French_Sign_Language=French Sign Language +controlledvocabulary.language.Friulian=Friulian +controlledvocabulary.language.Fula,_Fulah=Fula, Fulah +controlledvocabulary.language.Fuliiru=Fuliiru +controlledvocabulary.language.Fulni�=Fulni� +controlledvocabulary.language.Fum=Fum +controlledvocabulary.language.Fungwa=Fungwa +controlledvocabulary.language.Fur=Fur +controlledvocabulary.language.Furu=Furu +controlledvocabulary.language.Futuna-Aniwa=Futuna-Aniwa +controlledvocabulary.language.Fuyug=Fuyug +controlledvocabulary.language.Fwe=Fwe +controlledvocabulary.language.Fw�i=Fw�i +controlledvocabulary.language.Fyam=Fyam +controlledvocabulary.language.Fyer=Fyer +controlledvocabulary.language.Ga=Ga +controlledvocabulary.language.Ga'anda=Ga'anda +controlledvocabulary.language.Ga'dang=Ga'dang +controlledvocabulary.language.Gaa=Gaa +controlledvocabulary.language.Gaam=Gaam +controlledvocabulary.language.Gabi-Gabi=Gabi-Gabi +controlledvocabulary.language.Gabri=Gabri +controlledvocabulary.language.Gabrielino-Fernande�o=Gabrielino-Fernande�o +controlledvocabulary.language.Gadang=Gadang +controlledvocabulary.language.Gaddang=Gaddang +controlledvocabulary.language.Gaddi=Gaddi +controlledvocabulary.language.Gade=Gade +controlledvocabulary.language.Gade_Lohar=Gade Lohar +controlledvocabulary.language.Gadjerawang=Gadjerawang +controlledvocabulary.language.Gadsup=Gadsup +controlledvocabulary.language.Gaelic,_Scottish_Gaelic=Gaelic, Scottish Gaelic +controlledvocabulary.language.Gafat=Gafat +controlledvocabulary.language.Gagadu=Gagadu +controlledvocabulary.language.Gagauz=Gagauz +controlledvocabulary.language.Gagnoa_B�t�=Gagnoa B�t� +controlledvocabulary.language.Gagu=Gagu +controlledvocabulary.language.Gahri=Gahri +controlledvocabulary.language.Gaikundi=Gaikundi +controlledvocabulary.language.Gail=Gail +controlledvocabulary.language.Gaina=Gaina +controlledvocabulary.language.Gal=Gal +controlledvocabulary.language.Galambu=Galambu +controlledvocabulary.language.Galatian=Galatian +controlledvocabulary.language.Galela=Galela +controlledvocabulary.language.Galeya=Galeya +controlledvocabulary.language.Galibi_Carib=Galibi Carib +controlledvocabulary.language.Galice=Galice +controlledvocabulary.language.Galician=Galician +controlledvocabulary.language.Galindan=Galindan +controlledvocabulary.language.Gallurese_Sardinian=Gallurese Sardinian +controlledvocabulary.language.Galo=Galo +controlledvocabulary.language.Galolen=Galolen +controlledvocabulary.language.Gamale_Kham=Gamale Kham +controlledvocabulary.language.Gambera=Gambera +controlledvocabulary.language.Gambian_Wolof=Gambian Wolof +controlledvocabulary.language.Gamilaraay=Gamilaraay +controlledvocabulary.language.Gamit=Gamit +controlledvocabulary.language.Gamkonora=Gamkonora +controlledvocabulary.language.Gamo=Gamo +controlledvocabulary.language.Gamo-Ningi=Gamo-Ningi +controlledvocabulary.language.Gan_Chinese=Gan Chinese +controlledvocabulary.language.Gana=Gana +controlledvocabulary.language.Ganang=Ganang +controlledvocabulary.language.Ganda=Ganda +controlledvocabulary.language.Gane=Gane +controlledvocabulary.language.Ganggalida=Ganggalida +controlledvocabulary.language.Ganglau=Ganglau +controlledvocabulary.language.Gangte=Gangte +controlledvocabulary.language.Gangulu=Gangulu +controlledvocabulary.language.Gants=Gants +controlledvocabulary.language.Ganza=Ganza +controlledvocabulary.language.Ganzi=Ganzi +controlledvocabulary.language.Gao=Gao +controlledvocabulary.language.Gapapaiwa=Gapapaiwa +controlledvocabulary.language.Garhwali=Garhwali +controlledvocabulary.language.Garifuna=Garifuna +controlledvocabulary.language.Garig-Ilgar=Garig-Ilgar +controlledvocabulary.language.Garingbal=Garingbal +controlledvocabulary.language.Garlali=Garlali +controlledvocabulary.language.Garo=Garo +controlledvocabulary.language.Garre=Garre +controlledvocabulary.language.Garrwa=Garrwa +controlledvocabulary.language.Garus=Garus +controlledvocabulary.language.Garza=Garza +controlledvocabulary.language.Gata'=Gata' +controlledvocabulary.language.Gavak=Gavak +controlledvocabulary.language.Gavar=Gavar +controlledvocabulary.language.Gavi�o_Do_Jiparan�=Gavi�o Do Jiparan� +controlledvocabulary.language.Gawar-Bati=Gawar-Bati +controlledvocabulary.language.Gawri=Gawri +controlledvocabulary.language.Gawwada=Gawwada +controlledvocabulary.language.Gayil=Gayil +controlledvocabulary.language.Gayo=Gayo +controlledvocabulary.language.Gazi=Gazi +controlledvocabulary.language.Gaogbo=Ga?ogbo +controlledvocabulary.language.Gbagyi=Gbagyi +controlledvocabulary.language.Gbanu=Gbanu +controlledvocabulary.language.Gbanziri=Gbanziri +controlledvocabulary.language.Gbari=Gbari +controlledvocabulary.language.Gbaya_(Central_African_Republic)=Gbaya (Central African Republic) +controlledvocabulary.language.Gbaya_(Sudan)=Gbaya (Sudan) +controlledvocabulary.language.Gbaya-Bossangoa=Gbaya-Bossangoa +controlledvocabulary.language.Gbaya-Bozoum=Gbaya-Bozoum +controlledvocabulary.language.Gbaya-Mbodomo=Gbaya-Mbodomo +controlledvocabulary.language.Gbayi=Gbayi +controlledvocabulary.language.Gbesi_Gbe=Gbesi Gbe +controlledvocabulary.language.Gbii=Gbii +controlledvocabulary.language.Gbin=Gbin +controlledvocabulary.language.Gbiri-Niragu=Gbiri-Niragu +controlledvocabulary.language.Gboloo_Grebo=Gboloo Grebo +controlledvocabulary.language.Ge=Ge +controlledvocabulary.language.Geba_Karen=Geba Karen +controlledvocabulary.language.Gebe=Gebe +controlledvocabulary.language.Gedaged=Gedaged +controlledvocabulary.language.Gedeo=Gedeo +controlledvocabulary.language.Geez=Geez +controlledvocabulary.language.Geji=Geji +controlledvocabulary.language.Geko_Karen=Geko Karen +controlledvocabulary.language.Gela=Gela +controlledvocabulary.language.Geme=Geme +controlledvocabulary.language.Gen=Gen +controlledvocabulary.language.Gende=Gende +controlledvocabulary.language.Gengle=Gengle +controlledvocabulary.language.Georgian=Georgian +controlledvocabulary.language.Gepo=Gepo +controlledvocabulary.language.Gera=Gera +controlledvocabulary.language.Gerai=Gerai +controlledvocabulary.language.German=German +controlledvocabulary.language.German_Sign_Language=German Sign Language +controlledvocabulary.language.Geruma=Geruma +controlledvocabulary.language.Geser-Gorom=Geser-Gorom +controlledvocabulary.language.Ghadam�s=Ghadam�s +controlledvocabulary.language.Ghanaian_Pidgin_English=Ghanaian Pidgin English +controlledvocabulary.language.Ghanaian_Sign_Language=Ghanaian Sign Language +controlledvocabulary.language.Ghandruk_Sign_Language=Ghandruk Sign Language +controlledvocabulary.language.Ghanongga=Ghanongga +controlledvocabulary.language.Ghari=Ghari +controlledvocabulary.language.Ghayavi=Ghayavi +controlledvocabulary.language.Gheg_Albanian=Gheg Albanian +controlledvocabulary.language.Ghera=Ghera +controlledvocabulary.language.Ghodoberi=Ghodoberi +controlledvocabulary.language.Ghomara=Ghomara +controlledvocabulary.language.Ghom�l�'=Ghom�l�' +controlledvocabulary.language.Ghotuo=Ghotuo +controlledvocabulary.language.Ghulfan=Ghulfan +controlledvocabulary.language.Giangan=Giangan +controlledvocabulary.language.Gibanawa=Gibanawa +controlledvocabulary.language.Gidar=Gidar +controlledvocabulary.language.Giiwo=Giiwo +controlledvocabulary.language.Gikyode=Gikyode +controlledvocabulary.language.Gilaki=Gilaki +controlledvocabulary.language.Gilbertese=Gilbertese +controlledvocabulary.language.Gilima=Gilima +controlledvocabulary.language.Gilyak=Gilyak +controlledvocabulary.language.Gimi_(Eastern_Highlands)=Gimi (Eastern Highlands) +controlledvocabulary.language.Gimi_(West_New_Britain)=Gimi (West New Britain) +controlledvocabulary.language.Gimme=Gimme +controlledvocabulary.language.Gimnime=Gimnime +controlledvocabulary.language.Ginuman=Ginuman +controlledvocabulary.language.Ginyanga=Ginyanga +controlledvocabulary.language.Girawa=Girawa +controlledvocabulary.language.Girirra=Girirra +controlledvocabulary.language.Giryama=Giryama +controlledvocabulary.language.Githabul=Githabul +controlledvocabulary.language.Gitonga=Gitonga +controlledvocabulary.language.Gitua=Gitua +controlledvocabulary.language.Gitxsan=Gitxsan +controlledvocabulary.language.Giyug=Giyug +controlledvocabulary.language.Gizrra=Gizrra +controlledvocabulary.language.Glaro-Twabo=Glaro-Twabo +controlledvocabulary.language.Glavda=Glavda +controlledvocabulary.language.Glio-Oubi=Glio-Oubi +controlledvocabulary.language.Gnau=Gnau +controlledvocabulary.language.Goan_Konkani=Goan Konkani +controlledvocabulary.language.Goaria=Goaria +controlledvocabulary.language.Gobasi=Gobasi +controlledvocabulary.language.Gobu=Gobu +controlledvocabulary.language.Godi�=Godi� +controlledvocabulary.language.Godwari=Godwari +controlledvocabulary.language.Goemai=Goemai +controlledvocabulary.language.Gofa=Gofa +controlledvocabulary.language.Gogo=Gogo +controlledvocabulary.language.Gogodala=Gogodala +controlledvocabulary.language.Gokana=Gokana +controlledvocabulary.language.Gola=Gola +controlledvocabulary.language.Golin=Golin +controlledvocabulary.language.Golpa=Golpa +controlledvocabulary.language.Gondi=Gondi +controlledvocabulary.language.Gone_Dau=Gone Dau +controlledvocabulary.language.Gongduk=Gongduk +controlledvocabulary.language.Gonja=Gonja +controlledvocabulary.language.Goo=Goo +controlledvocabulary.language.Gooniyandi=Gooniyandi +controlledvocabulary.language.Gor=Gor +controlledvocabulary.language.Gorakor=Gorakor +controlledvocabulary.language.Gorap=Gorap +controlledvocabulary.language.Goreng=Goreng +controlledvocabulary.language.Gorontalo=Gorontalo +controlledvocabulary.language.Gorovu=Gorovu +controlledvocabulary.language.Gorowa=Gorowa +controlledvocabulary.language.Gothic=Gothic +controlledvocabulary.language.Goundo=Goundo +controlledvocabulary.language.Gourmanch�ma=Gourmanch�ma +controlledvocabulary.language.Gowlan=Gowlan +controlledvocabulary.language.Gowli=Gowli +controlledvocabulary.language.Gowro=Gowro +controlledvocabulary.language.Gozarkhani=Gozarkhani +controlledvocabulary.language.Grangali=Grangali +controlledvocabulary.language.Grass_Koiari=Grass Koiari +controlledvocabulary.language.Grebo=Grebo +controlledvocabulary.language.Greek_(modern)=Greek (modern) +controlledvocabulary.language.Greek_Sign_Language=Greek Sign Language +controlledvocabulary.language.Green_Gelao=Green Gelao +controlledvocabulary.language.Greenlandic,_Kalaallisut=Greenlandic, Kalaallisut +controlledvocabulary.language.Grenadian_Creole_English=Grenadian Creole English +controlledvocabulary.language.Gresi=Gresi +controlledvocabulary.language.Groma=Groma +controlledvocabulary.language.Gronings=Gronings +controlledvocabulary.language.Gros_Ventre=Gros Ventre +controlledvocabulary.language.Gua=Gua +controlledvocabulary.language.Guadeloupean_Creole_French=Guadeloupean Creole French +controlledvocabulary.language.Guahibo=Guahibo +controlledvocabulary.language.Guajaj�ra=Guajaj�ra +controlledvocabulary.language.Guaj�=Guaj� +controlledvocabulary.language.Guambiano=Guambiano +controlledvocabulary.language.Guana_(Brazil)=Guana (Brazil) +controlledvocabulary.language.Guana_(Paraguay)=Guana (Paraguay) +controlledvocabulary.language.Guanano=Guanano +controlledvocabulary.language.Guanche=Guanche +controlledvocabulary.language.Guanyinqiao=Guanyinqiao +controlledvocabulary.language.Guaran�=Guaran� +controlledvocabulary.language.Guarayu=Guarayu +controlledvocabulary.language.Guarequena=Guarequena +controlledvocabulary.language.Guatemalan_Sign_Language=Guatemalan Sign Language +controlledvocabulary.language.Guat�=Guat� +controlledvocabulary.language.Guayabero=Guayabero +controlledvocabulary.language.Gudang=Gudang +controlledvocabulary.language.Gudanji=Gudanji +controlledvocabulary.language.Gude=Gude +controlledvocabulary.language.Gudu=Gudu +controlledvocabulary.language.Guduf-Gava=Guduf-Gava +controlledvocabulary.language.Guerrero_Amuzgo=Guerrero Amuzgo +controlledvocabulary.language.Guerrero_Nahuatl=Guerrero Nahuatl +controlledvocabulary.language.Guevea_De_Humboldt_Zapotec=Guevea De Humboldt Zapotec +controlledvocabulary.language.Gugadj=Gugadj +controlledvocabulary.language.Gugu_Badhun=Gugu Badhun +controlledvocabulary.language.Gugu_Warra=Gugu Warra +controlledvocabulary.language.Gugubera=Gugubera +controlledvocabulary.language.Guhu-Samane=Guhu-Samane +controlledvocabulary.language.Guianese_Creole_French=Guianese Creole French +controlledvocabulary.language.Guibei_Zhuang=Guibei Zhuang +controlledvocabulary.language.Guiberoua_B�te=Guiberoua B�te +controlledvocabulary.language.Guibian_Zhuang=Guibian Zhuang +controlledvocabulary.language.Guinea_Kpelle=Guinea Kpelle +controlledvocabulary.language.Guinea-Bissau_Sign_Language=Guinea-Bissau Sign Language +controlledvocabulary.language.Guinean_Sign_Language=Guinean Sign Language +controlledvocabulary.language.Guiqiong=Guiqiong +controlledvocabulary.language.Gujarati=Gujarati +controlledvocabulary.language.Gujari=Gujari +controlledvocabulary.language.Gula_(Central_African_Republic)=Gula (Central African Republic) +controlledvocabulary.language.Gula_(Chad)=Gula (Chad) +controlledvocabulary.language.Gula_Iro=Gula Iro +controlledvocabulary.language.Gula'alaa=Gula'alaa +controlledvocabulary.language.Gulay=Gulay +controlledvocabulary.language.Gule=Gule +controlledvocabulary.language.Gulf_Arabic=Gulf Arabic +controlledvocabulary.language.Gumalu=Gumalu +controlledvocabulary.language.Gumatj=Gumatj +controlledvocabulary.language.Gumawana=Gumawana +controlledvocabulary.language.Gumuz=Gumuz +controlledvocabulary.language.Gun=Gun +controlledvocabulary.language.Gundi=Gundi +controlledvocabulary.language.Gunditjmara=Gunditjmara +controlledvocabulary.language.Gundungurra=Gundungurra +controlledvocabulary.language.Gungabula=Gungabula +controlledvocabulary.language.Gungu=Gungu +controlledvocabulary.language.Guntai=Guntai +controlledvocabulary.language.Gunwinggu=Gunwinggu +controlledvocabulary.language.Gunya=Gunya +controlledvocabulary.language.Gupa-Abawa=Gupa-Abawa +controlledvocabulary.language.Gupapuyngu=Gupapuyngu +controlledvocabulary.language.Guramalum=Guramalum +controlledvocabulary.language.Gurani=Gurani +controlledvocabulary.language.Gurdjar=Gurdjar +controlledvocabulary.language.Gureng_Gureng=Gureng Gureng +controlledvocabulary.language.Gurgula=Gurgula +controlledvocabulary.language.Guriaso=Guriaso +controlledvocabulary.language.Gurindji=Gurindji +controlledvocabulary.language.Gurindji_Kriol=Gurindji Kriol +controlledvocabulary.language.Gurmana=Gurmana +controlledvocabulary.language.Guro=Guro +controlledvocabulary.language.Gurr-goni=Gurr-goni +controlledvocabulary.language.Gurung=Gurung +controlledvocabulary.language.Guruntum-Mbaaru=Guruntum-Mbaaru +controlledvocabulary.language.Gusii=Gusii +controlledvocabulary.language.Gusilay=Gusilay +controlledvocabulary.language.Guugu_Yimidhirr=Guugu Yimidhirr +controlledvocabulary.language.Guwa=Guwa +controlledvocabulary.language.Guwamu=Guwamu +controlledvocabulary.language.Guya=Guya +controlledvocabulary.language.Guyanese_Creole_English=Guyanese Creole English +controlledvocabulary.language.Guyani=Guyani +controlledvocabulary.language.Gvoko=Gvoko +controlledvocabulary.language.Gwa=Gwa +controlledvocabulary.language.Gwahatike=Gwahatike +controlledvocabulary.language.Gwak=Gwak +controlledvocabulary.language.Gwamhi-Wuri=Gwamhi-Wuri +controlledvocabulary.language.Gwandara=Gwandara +controlledvocabulary.language.Gweda=Gweda +controlledvocabulary.language.Gweno=Gweno +controlledvocabulary.language.Gwere=Gwere +controlledvocabulary.language.Gwichin=Gwich?in +controlledvocabulary.language.Gyalsumdo=Gyalsumdo +controlledvocabulary.language.Gyele=Gyele +controlledvocabulary.language.Gyem=Gyem +controlledvocabulary.language.G�il�_Zapotec=G�il� Zapotec +controlledvocabulary.language.Gndhr=G?ndh?r? +controlledvocabulary.language.Ha=Ha +controlledvocabulary.language.Habu=Habu +controlledvocabulary.language.Hadiyya=Hadiyya +controlledvocabulary.language.Hadothi=Hadothi +controlledvocabulary.language.Hadrami=Hadrami +controlledvocabulary.language.Hadrami_Arabic=Hadrami Arabic +controlledvocabulary.language.Hadza=Hadza +controlledvocabulary.language.Haeke=Haeke +controlledvocabulary.language.Hahon=Hahon +controlledvocabulary.language.Haida=Haida +controlledvocabulary.language.Haigwai=Haigwai +controlledvocabulary.language.Haiphong_Sign_Language=Haiphong Sign Language +controlledvocabulary.language.Haisla=Haisla +controlledvocabulary.language.Haitian_Creole,_Haitian=Haitian Creole, Haitian +controlledvocabulary.language.Haitian_Vodoun_Culture_Language=Haitian Vodoun Culture Language +controlledvocabulary.language.Haiom=Hai?om +controlledvocabulary.language.Haji=Haji +controlledvocabulary.language.Hajong=Hajong +controlledvocabulary.language.Hakha_Chin=Hakha Chin +controlledvocabulary.language.Hakka_Chinese=Hakka Chinese +controlledvocabulary.language.Hak�=Hak� +controlledvocabulary.language.Halang=Halang +controlledvocabulary.language.Halang_Doan=Halang Doan +controlledvocabulary.language.Halbi=Halbi +controlledvocabulary.language.Halh_Mongolian=Halh Mongolian +controlledvocabulary.language.Halia=Halia +controlledvocabulary.language.Halkomelem=Halkomelem +controlledvocabulary.language.Hamap=Hamap +controlledvocabulary.language.Hamba=Hamba +controlledvocabulary.language.Hamer-Banna=Hamer-Banna +controlledvocabulary.language.Hamtai=Hamtai +controlledvocabulary.language.Han=Han +controlledvocabulary.language.Hanga=Hanga +controlledvocabulary.language.Hanga_Hundi=Hanga Hundi +controlledvocabulary.language.Hangaza=Hangaza +controlledvocabulary.language.Hani=Hani +controlledvocabulary.language.Hano=Hano +controlledvocabulary.language.Hanoi_Sign_Language=Hanoi Sign Language +controlledvocabulary.language.Hanunoo=Hanunoo +controlledvocabulary.language.Harami=Harami +controlledvocabulary.language.Harari=Harari +controlledvocabulary.language.Harijan_Kinnauri=Harijan Kinnauri +controlledvocabulary.language.Haroi=Haroi +controlledvocabulary.language.Harsusi=Harsusi +controlledvocabulary.language.Haruai=Haruai +controlledvocabulary.language.Haruku=Haruku +controlledvocabulary.language.Haryanvi=Haryanvi +controlledvocabulary.language.Harzani=Harzani +controlledvocabulary.language.Hasha=Hasha +controlledvocabulary.language.Hassaniyya=Hassaniyya +controlledvocabulary.language.Hatam=Hatam +controlledvocabulary.language.Hattic=Hattic +controlledvocabulary.language.Hausa=Hausa +controlledvocabulary.language.Hausa_Sign_Language=Hausa Sign Language +controlledvocabulary.language.Havasupai-Walapai-Yavapai=Havasupai-Walapai-Yavapai +controlledvocabulary.language.Haveke=Haveke +controlledvocabulary.language.Havu=Havu +controlledvocabulary.language.Hawai'i_Creole_English=Hawai'i Creole English +controlledvocabulary.language.Hawai'i_Sign_Language_(HSL)=Hawai'i Sign Language (HSL) +controlledvocabulary.language.Hawaiian=Hawaiian +controlledvocabulary.language.Haya=Haya +controlledvocabulary.language.Hazaragi=Hazaragi +controlledvocabulary.language.Hdi=Hdi +controlledvocabulary.language.Hebrew_(modern)=Hebrew (modern) +controlledvocabulary.language.Hehe=Hehe +controlledvocabulary.language.Heiban=Heiban +controlledvocabulary.language.Heiltsuk=Heiltsuk +controlledvocabulary.language.Helong=Helong +controlledvocabulary.language.Hema=Hema +controlledvocabulary.language.Hemba=Hemba +controlledvocabulary.language.Herd�=Herd� +controlledvocabulary.language.Herero=Herero +controlledvocabulary.language.Hermit=Hermit +controlledvocabulary.language.Hernican=Hernican +controlledvocabulary.language.Hewa=Hewa +controlledvocabulary.language.Heyo=Heyo +controlledvocabulary.language.Hiberno-Scottish_Gaelic=Hiberno-Scottish Gaelic +controlledvocabulary.language.Hibito=Hibito +controlledvocabulary.language.Hidatsa=Hidatsa +controlledvocabulary.language.Hieroglyphic_Luwian=Hieroglyphic Luwian +controlledvocabulary.language.Higaonon=Higaonon +controlledvocabulary.language.Highland_Konjo=Highland Konjo +controlledvocabulary.language.Highland_Oaxaca_Chontal=Highland Oaxaca Chontal +controlledvocabulary.language.Highland_Popoluca=Highland Popoluca +controlledvocabulary.language.Highland_Puebla_Nahuatl=Highland Puebla Nahuatl +controlledvocabulary.language.Highland_Totonac=Highland Totonac +controlledvocabulary.language.Hijazi_Arabic=Hijazi Arabic +controlledvocabulary.language.Hijuk=Hijuk +controlledvocabulary.language.Hiligaynon=Hiligaynon +controlledvocabulary.language.Himarim�=Himarim� +controlledvocabulary.language.Hindi=Hindi +controlledvocabulary.language.Hinduri=Hinduri +controlledvocabulary.language.Hinukh=Hinukh +controlledvocabulary.language.Hiri_Motu=Hiri Motu +controlledvocabulary.language.Hittite=Hittite +controlledvocabulary.language.Hitu=Hitu +controlledvocabulary.language.Hiw=Hiw +controlledvocabulary.language.Hixkary�na=Hixkary�na +controlledvocabulary.language.Hlai=Hlai +controlledvocabulary.language.Hlepho_Phowa=Hlepho Phowa +controlledvocabulary.language.Hlersu=Hlersu +controlledvocabulary.language.Hmar=Hmar +controlledvocabulary.language.Hmong=Hmong +controlledvocabulary.language.Hmong_Daw=Hmong Daw +controlledvocabulary.language.Hmong_Don=Hmong Don +controlledvocabulary.language.Hmong_D�=Hmong D� +controlledvocabulary.language.Hmong_Njua=Hmong Njua +controlledvocabulary.language.Hmong_Shua=Hmong Shua +controlledvocabulary.language.Hmwaveke=Hmwaveke +controlledvocabulary.language.Ho=Ho +controlledvocabulary.language.Ho_Chi_Minh_City_Sign_Language=Ho Chi Minh City Sign Language +controlledvocabulary.language.Ho-Chunk=Ho-Chunk +controlledvocabulary.language.Hoava=Hoava +controlledvocabulary.language.Hoby�t=Hoby�t +controlledvocabulary.language.Hoia_Hoia=Hoia Hoia +controlledvocabulary.language.Holikachuk=Holikachuk +controlledvocabulary.language.Holiya=Holiya +controlledvocabulary.language.Holma=Holma +controlledvocabulary.language.Holoholo=Holoholo +controlledvocabulary.language.Holu=Holu +controlledvocabulary.language.Homa=Homa +controlledvocabulary.language.Honduras_Sign_Language=Honduras Sign Language +controlledvocabulary.language.Hong_Kong_Sign_Language=Hong Kong Sign Language +controlledvocabulary.language.Honi=Honi +controlledvocabulary.language.Hopi=Hopi +controlledvocabulary.language.Horned_Miao=Horned Miao +controlledvocabulary.language.Horo=Horo +controlledvocabulary.language.Horom=Horom +controlledvocabulary.language.Horpa=Horpa +controlledvocabulary.language.Hote=Hote +controlledvocabulary.language.Hoti=Hoti +controlledvocabulary.language.Hovongan=Hovongan +controlledvocabulary.language.Hoyahoya=Hoyahoya +controlledvocabulary.language.Hozo=Hozo +controlledvocabulary.language.Hpon=Hpon +controlledvocabulary.language.Hrangkhol=Hrangkhol +controlledvocabulary.language.Hre=Hre +controlledvocabulary.language.Hruso=Hruso +controlledvocabulary.language.Hu=Hu +controlledvocabulary.language.Huachipaeri=Huachipaeri +controlledvocabulary.language.Huallaga_Hu�nuco_Quechua=Huallaga Hu�nuco Quechua +controlledvocabulary.language.Huamal�es-Dos_de_Mayo_Hu�nuco_Quechua=Huamal�es-Dos de Mayo Hu�nuco Quechua +controlledvocabulary.language.Huambisa=Huambisa +controlledvocabulary.language.Huarijio=Huarijio +controlledvocabulary.language.Huastec=Huastec +controlledvocabulary.language.Huaulu=Huaulu +controlledvocabulary.language.Huautla_Mazatec=Huautla Mazatec +controlledvocabulary.language.Huaxcaleca_Nahuatl=Huaxcaleca Nahuatl +controlledvocabulary.language.Huaylas_Ancash_Quechua=Huaylas Ancash Quechua +controlledvocabulary.language.Huaylla_Wanca_Quechua=Huaylla Wanca Quechua +controlledvocabulary.language.Huba=Huba +controlledvocabulary.language.Huehuetla_Tepehua=Huehuetla Tepehua +controlledvocabulary.language.Huichol=Huichol +controlledvocabulary.language.Huilliche=Huilliche +controlledvocabulary.language.Huitepec_Mixtec=Huitepec Mixtec +controlledvocabulary.language.Huizhou_Chinese=Huizhou Chinese +controlledvocabulary.language.Hukumina=Hukumina +controlledvocabulary.language.Hula=Hula +controlledvocabulary.language.Hulaul�=Hulaul� +controlledvocabulary.language.Huli=Huli +controlledvocabulary.language.Hulung=Hulung +controlledvocabulary.language.Humburi_Senni_Songhay=Humburi Senni Songhay +controlledvocabulary.language.Humene=Humene +controlledvocabulary.language.Humla=Humla +controlledvocabulary.language.Hunde=Hunde +controlledvocabulary.language.Hung=Hung +controlledvocabulary.language.Hungana=Hungana +controlledvocabulary.language.Hungarian=Hungarian +controlledvocabulary.language.Hungarian_Sign_Language=Hungarian Sign Language +controlledvocabulary.language.Hungu=Hungu +controlledvocabulary.language.Hunjara-Kaina_Ke=Hunjara-Kaina Ke +controlledvocabulary.language.Hunnic=Hunnic +controlledvocabulary.language.Hunsrik=Hunsrik +controlledvocabulary.language.Hunzib=Hunzib +controlledvocabulary.language.Hupa=Hupa +controlledvocabulary.language.Hupd�=Hupd� +controlledvocabulary.language.Hupla=Hupla +controlledvocabulary.language.Hurrian=Hurrian +controlledvocabulary.language.Hutterite_German=Hutterite German +controlledvocabulary.language.Hwana=Hwana +controlledvocabulary.language.Hya=Hya +controlledvocabulary.language.Hyam=Hyam +controlledvocabulary.language.Hyolmo=Hyolmo +controlledvocabulary.language.H�rtevin=H�rtevin +controlledvocabulary.language.H�ne=H�ne +controlledvocabulary.language.I-Wak=I-Wak +controlledvocabulary.language.Iaai=Iaai +controlledvocabulary.language.Iamalele=Iamalele +controlledvocabulary.language.Iatmul=Iatmul +controlledvocabulary.language.Iau=Iau +controlledvocabulary.language.Ibali_Teke=Ibali Teke +controlledvocabulary.language.Ibaloi=Ibaloi +controlledvocabulary.language.Iban=Iban +controlledvocabulary.language.Ibanag=Ibanag +controlledvocabulary.language.Ibani=Ibani +controlledvocabulary.language.Ibatan=Ibatan +controlledvocabulary.language.Iberian=Iberian +controlledvocabulary.language.Ibibio=Ibibio +controlledvocabulary.language.Ibino=Ibino +controlledvocabulary.language.Ibu=Ibu +controlledvocabulary.language.Ibuoro=Ibuoro +controlledvocabulary.language.Icelandic=Icelandic +controlledvocabulary.language.Icelandic_Sign_Language=Icelandic Sign Language +controlledvocabulary.language.Iceve-Maci=Iceve-Maci +controlledvocabulary.language.Ida'an=Ida'an +controlledvocabulary.language.Idakho-Isukha-Tiriki=Idakho-Isukha-Tiriki +controlledvocabulary.language.Idat�=Idat� +controlledvocabulary.language.Idere=Idere +controlledvocabulary.language.Idesa=Idesa +controlledvocabulary.language.Idi=Idi +controlledvocabulary.language.Ido=Ido +controlledvocabulary.language.Idoma=Idoma +controlledvocabulary.language.Idon=Idon +controlledvocabulary.language.Idu-Mishmi=Idu-Mishmi +controlledvocabulary.language.Iduna=Iduna +controlledvocabulary.language.Ifo=Ifo +controlledvocabulary.language.If�=If� +controlledvocabulary.language.Igala=Igala +controlledvocabulary.language.Igana=Igana +controlledvocabulary.language.Igbo=Igbo +controlledvocabulary.language.Igede=Igede +controlledvocabulary.language.Ignaciano=Ignaciano +controlledvocabulary.language.Igo=Igo +controlledvocabulary.language.Iguta=Iguta +controlledvocabulary.language.Igwe=Igwe +controlledvocabulary.language.Iha=Iha +controlledvocabulary.language.Iha_Based_Pidgin=Iha Based Pidgin +controlledvocabulary.language.Ihievbe=Ihievbe +controlledvocabulary.language.Ik=Ik +controlledvocabulary.language.Ika=Ika +controlledvocabulary.language.Ikaranggal=Ikaranggal +controlledvocabulary.language.Ikhin-Arokho=Ikhin-Arokho +controlledvocabulary.language.Ikizu=Ikizu +controlledvocabulary.language.Iko=Iko +controlledvocabulary.language.Ikobi=Ikobi +controlledvocabulary.language.Ikoma-Nata-Isenye=Ikoma-Nata-Isenye +controlledvocabulary.language.Ikpeng=Ikpeng +controlledvocabulary.language.Ikpeshi=Ikpeshi +controlledvocabulary.language.Ikposo=Ikposo +controlledvocabulary.language.Iku-Gora-Ankwa=Iku-Gora-Ankwa +controlledvocabulary.language.Ikulu=Ikulu +controlledvocabulary.language.Ikwere=Ikwere +controlledvocabulary.language.Ikwo=Ikwo +controlledvocabulary.language.Ila=Ila +controlledvocabulary.language.Ile_Ape=Ile Ape +controlledvocabulary.language.Ili_Turki=Ili Turki +controlledvocabulary.language.Ili'uun=Ili'uun +controlledvocabulary.language.Ilianen_Manobo=Ilianen Manobo +controlledvocabulary.language.Illyrian=Illyrian +controlledvocabulary.language.Iloko=Iloko +controlledvocabulary.language.Ilongot=Ilongot +controlledvocabulary.language.Ilue=Ilue +controlledvocabulary.language.Ilwana=Ilwana +controlledvocabulary.language.Imbabura_Highland_Quichua=Imbabura Highland Quichua +controlledvocabulary.language.Imbongu=Imbongu +controlledvocabulary.language.Imonda=Imonda +controlledvocabulary.language.Imotong=Imotong +controlledvocabulary.language.Imroing=Imroing +controlledvocabulary.language.Inabaknon=Inabaknon +controlledvocabulary.language.Inapang=Inapang +controlledvocabulary.language.Inari_Sami=Inari Sami +controlledvocabulary.language.Indian_Sign_Language=Indian Sign Language +controlledvocabulary.language.Indo-Portuguese=Indo-Portuguese +controlledvocabulary.language.Indonesian=Indonesian +controlledvocabulary.language.Indonesian_Bajau=Indonesian Bajau +controlledvocabulary.language.Indonesian_Sign_Language=Indonesian Sign Language +controlledvocabulary.language.Indri=Indri +controlledvocabulary.language.Indus_Kohistani=Indus Kohistani +controlledvocabulary.language.Indus_Valley_Language=Indus Valley Language +controlledvocabulary.language.Inebu_One=Inebu One +controlledvocabulary.language.Inese�o=Inese�o +controlledvocabulary.language.Inga=Inga +controlledvocabulary.language.Ingrian=Ingrian +controlledvocabulary.language.Ingush=Ingush +controlledvocabulary.language.Inlaod_Itneg=Inlaod Itneg +controlledvocabulary.language.Innu=Innu +controlledvocabulary.language.Inoke-Yate=Inoke-Yate +controlledvocabulary.language.Inonhan=Inonhan +controlledvocabulary.language.Inor=Inor +controlledvocabulary.language.Inpui_Naga=Inpui Naga +controlledvocabulary.language.Interglossa=Interglossa +controlledvocabulary.language.Interlingua=Interlingua +controlledvocabulary.language.Interlingue=Interlingue +controlledvocabulary.language.International_Sign=International Sign +controlledvocabulary.language.Interslavic=Interslavic +controlledvocabulary.language.Intha=Intha +controlledvocabulary.language.Inuinnaqtun=Inuinnaqtun +controlledvocabulary.language.Inuit_Sign_Language=Inuit Sign Language +controlledvocabulary.language.Inuktitut=Inuktitut +controlledvocabulary.language.Inupiaq=Inupiaq +controlledvocabulary.language.Iowa-Oto=Iowa-Oto +controlledvocabulary.language.Ipalapa_Amuzgo=Ipalapa Amuzgo +controlledvocabulary.language.Ipiko=Ipiko +controlledvocabulary.language.Ipili=Ipili +controlledvocabulary.language.Ipulo=Ipulo +controlledvocabulary.language.Iquito=Iquito +controlledvocabulary.language.Ir=Ir +controlledvocabulary.language.Iranian_Persian=Iranian Persian +controlledvocabulary.language.Iranian_Sign_Language=Iranian Sign Language +controlledvocabulary.language.Iranun_(Malaysia)=Iranun (Malaysia) +controlledvocabulary.language.Iranun_(Philippines)=Iranun (Philippines) +controlledvocabulary.language.Iraqw=Iraqw +controlledvocabulary.language.Irarutu=Irarutu +controlledvocabulary.language.Iraya=Iraya +controlledvocabulary.language.Iresim=Iresim +controlledvocabulary.language.Irish=Irish +controlledvocabulary.language.Irish_Sign_Language=Irish Sign Language +controlledvocabulary.language.Irula=Irula +controlledvocabulary.language.Ir�ntxe=Ir�ntxe +controlledvocabulary.language.Isabi=Isabi +controlledvocabulary.language.Isanzu=Isanzu +controlledvocabulary.language.Isarog_Agta=Isarog Agta +controlledvocabulary.language.Isconahua=Isconahua +controlledvocabulary.language.Isebe=Isebe +controlledvocabulary.language.Isekiri=Isekiri +controlledvocabulary.language.Ishkashimi=Ishkashimi +controlledvocabulary.language.Isinai=Isinai +controlledvocabulary.language.Isirawa=Isirawa +controlledvocabulary.language.Island_Carib=Island Carib +controlledvocabulary.language.Islander_Creole_English=Islander Creole English +controlledvocabulary.language.Isnag=Isnag +controlledvocabulary.language.Isoko=Isoko +controlledvocabulary.language.Israeli_Sign_Language=Israeli Sign Language +controlledvocabulary.language.Isthmus_Mixe=Isthmus Mixe +controlledvocabulary.language.Isthmus_Zapotec=Isthmus Zapotec +controlledvocabulary.language.Isthmus-Cosoleacaque_Nahuatl=Isthmus-Cosoleacaque Nahuatl +controlledvocabulary.language.Isthmus-Mecayapan_Nahuatl=Isthmus-Mecayapan Nahuatl +controlledvocabulary.language.Isthmus-Pajapan_Nahuatl=Isthmus-Pajapan Nahuatl +controlledvocabulary.language.Istriot=Istriot +controlledvocabulary.language.Istro_Romanian=Istro Romanian +controlledvocabulary.language.Isu_(Fako_Division)=Isu (Fako Division) +controlledvocabulary.language.Isu_(Menchum_Division)=Isu (Menchum Division) +controlledvocabulary.language.Italian=Italian +controlledvocabulary.language.Italian_Sign_Language=Italian Sign Language +controlledvocabulary.language.Itawit=Itawit +controlledvocabulary.language.Itelmen=Itelmen +controlledvocabulary.language.Itene=Itene +controlledvocabulary.language.Iteri=Iteri +controlledvocabulary.language.Itik=Itik +controlledvocabulary.language.Ito=Ito +controlledvocabulary.language.Itonama=Itonama +controlledvocabulary.language.Itu_Mbon_Uzo=Itu Mbon Uzo +controlledvocabulary.language.Itundujia_Mixtec=Itundujia Mixtec +controlledvocabulary.language.Itz�=Itz� +controlledvocabulary.language.Iu_Mien=Iu Mien +controlledvocabulary.language.Ivatan=Ivatan +controlledvocabulary.language.Ivbie_North-Okpela-Arhe=Ivbie North-Okpela-Arhe +controlledvocabulary.language.Iwaidja=Iwaidja +controlledvocabulary.language.Iwal=Iwal +controlledvocabulary.language.Iwam=Iwam +controlledvocabulary.language.Iwur=Iwur +controlledvocabulary.language.Ixcatec=Ixcatec +controlledvocabulary.language.Ixcatl�n_Mazatec=Ixcatl�n Mazatec +controlledvocabulary.language.Ixil=Ixil +controlledvocabulary.language.Ixtayutla_Mixtec=Ixtayutla Mixtec +controlledvocabulary.language.Ixtenco_Otomi=Ixtenco Otomi +controlledvocabulary.language.Iyayu=Iyayu +controlledvocabulary.language.Iyive=Iyive +controlledvocabulary.language.Iyo=Iyo +controlledvocabulary.language.Iyo'wujwa_Chorote=Iyo'wujwa Chorote +controlledvocabulary.language.Iyojwa'ja_Chorote=Iyojwa'ja Chorote +controlledvocabulary.language.Izere=Izere +controlledvocabulary.language.Izii=Izii +controlledvocabulary.language.Izon=Izon +controlledvocabulary.language.Izora=Izora +controlledvocabulary.language.I�apari=I�apari +controlledvocabulary.language.Jabut�=Jabut� +controlledvocabulary.language.Jad=Jad +controlledvocabulary.language.Jadgali=Jadgali +controlledvocabulary.language.Jah_Hut=Jah Hut +controlledvocabulary.language.Jahanka=Jahanka +controlledvocabulary.language.Jair_Awyu=Jair Awyu +controlledvocabulary.language.Jaitmatang=Jaitmatang +controlledvocabulary.language.Jakati=Jakati +controlledvocabulary.language.Jakattoe=Jakattoe +controlledvocabulary.language.Jakun=Jakun +controlledvocabulary.language.Jalapa_De_D�az_Mazatec=Jalapa De D�az Mazatec +controlledvocabulary.language.Jalkunan=Jalkunan +controlledvocabulary.language.Jamaican_Country_Sign_Language=Jamaican Country Sign Language +controlledvocabulary.language.Jamaican_Creole_English=Jamaican Creole English +controlledvocabulary.language.Jamaican_Sign_Language=Jamaican Sign Language +controlledvocabulary.language.Jamamad�=Jamamad� +controlledvocabulary.language.Jambi_Malay=Jambi Malay +controlledvocabulary.language.Jamiltepec_Mixtec=Jamiltepec Mixtec +controlledvocabulary.language.Jamsay_Dogon=Jamsay Dogon +controlledvocabulary.language.Jandai=Jandai +controlledvocabulary.language.Jandavra=Jandavra +controlledvocabulary.language.Jangkang=Jangkang +controlledvocabulary.language.Jangshung=Jangshung +controlledvocabulary.language.Janji=Janji +controlledvocabulary.language.Japanese=Japanese +controlledvocabulary.language.Japanese_Sign_Language=Japanese Sign Language +controlledvocabulary.language.Japrer�a=Japrer�a +controlledvocabulary.language.Jaqaru=Jaqaru +controlledvocabulary.language.Jara=Jara +controlledvocabulary.language.Jarai=Jarai +controlledvocabulary.language.Jarawa_(India)=Jarawa (India) +controlledvocabulary.language.Jaru=Jaru +controlledvocabulary.language.Jauja_Wanca_Quechua=Jauja Wanca Quechua +controlledvocabulary.language.Jaunsari=Jaunsari +controlledvocabulary.language.Javanese=Javanese +controlledvocabulary.language.Javindo=Javindo +controlledvocabulary.language.Jawe=Jawe +controlledvocabulary.language.Jawoyn=Jawoyn +controlledvocabulary.language.Jaya=Jaya +controlledvocabulary.language.Jebero=Jebero +controlledvocabulary.language.Jeh=Jeh +controlledvocabulary.language.Jehai=Jehai +controlledvocabulary.language.Jejara_Naga=Jejara Naga +controlledvocabulary.language.Jejueo=Jejueo +controlledvocabulary.language.Jemez=Jemez +controlledvocabulary.language.Jenaama_Bozo=Jenaama Bozo +controlledvocabulary.language.Jennu_Kurumba=Jennu Kurumba +controlledvocabulary.language.Jere=Jere +controlledvocabulary.language.Jeri_Kuo=Jeri Kuo +controlledvocabulary.language.Jerung=Jerung +controlledvocabulary.language.Jewish_Babylonian_Aramaic_(ca._200-1200_CE)=Jewish Babylonian Aramaic (ca. 200-1200 CE) +controlledvocabulary.language.Jewish_Palestinian_Aramaic=Jewish Palestinian Aramaic +controlledvocabulary.language.Jhankot_Sign_Language=Jhankot Sign Language +controlledvocabulary.language.Jiamao=Jiamao +controlledvocabulary.language.Jiarong=Jiarong +controlledvocabulary.language.Jiba=Jiba +controlledvocabulary.language.Jibu=Jibu +controlledvocabulary.language.Jicarilla_Apache=Jicarilla Apache +controlledvocabulary.language.Jiiddu=Jiiddu +controlledvocabulary.language.Jilbe=Jilbe +controlledvocabulary.language.Jilim=Jilim +controlledvocabulary.language.Jimi_(Cameroon)=Jimi (Cameroon) +controlledvocabulary.language.Jimi_(Nigeria)=Jimi (Nigeria) +controlledvocabulary.language.Jina=Jina +controlledvocabulary.language.Jingulu=Jingulu +controlledvocabulary.language.Jinyu_Chinese=Jinyu Chinese +controlledvocabulary.language.Jiongnai_Bunu=Jiongnai Bunu +controlledvocabulary.language.Jirel=Jirel +controlledvocabulary.language.Jiru=Jiru +controlledvocabulary.language.Jita=Jita +controlledvocabulary.language.Jju=Jju +controlledvocabulary.language.Joba=Joba +controlledvocabulary.language.Jofotek-Bromnya=Jofotek-Bromnya +controlledvocabulary.language.Jogi=Jogi +controlledvocabulary.language.Jola-Fonyi=Jola-Fonyi +controlledvocabulary.language.Jola-Kasa=Jola-Kasa +controlledvocabulary.language.Jonkor_Bourmataguil=Jonkor Bourmataguil +controlledvocabulary.language.Jordanian_Sign_Language=Jordanian Sign Language +controlledvocabulary.language.Jor�=Jor� +controlledvocabulary.language.Jowulu=Jowulu +controlledvocabulary.language.Ju=Ju +controlledvocabulary.language.Juang=Juang +controlledvocabulary.language.Judeo-Arabic=Judeo-Arabic +controlledvocabulary.language.Judeo-Berber=Judeo-Berber +controlledvocabulary.language.Judeo-Georgian=Judeo-Georgian +controlledvocabulary.language.Judeo-Iraqi_Arabic=Judeo-Iraqi Arabic +controlledvocabulary.language.Judeo-Italian=Judeo-Italian +controlledvocabulary.language.Judeo-Moroccan_Arabic=Judeo-Moroccan Arabic +controlledvocabulary.language.Judeo-Persian=Judeo-Persian +controlledvocabulary.language.Judeo-Tat=Judeo-Tat +controlledvocabulary.language.Judeo-Tripolitanian_Arabic=Judeo-Tripolitanian Arabic +controlledvocabulary.language.Judeo-Yemeni_Arabic=Judeo-Yemeni Arabic +controlledvocabulary.language.Jukun_Takum=Jukun Takum +controlledvocabulary.language.Jumjum=Jumjum +controlledvocabulary.language.Jumla_Sign_Language=Jumla Sign Language +controlledvocabulary.language.Jumli=Jumli +controlledvocabulary.language.Jungle_Inga=Jungle Inga +controlledvocabulary.language.Juquila_Mixe=Juquila Mixe +controlledvocabulary.language.Jur_Modo=Jur Modo +controlledvocabulary.language.Juray=Juray +controlledvocabulary.language.Jurchen=Jurchen +controlledvocabulary.language.Jur�na=Jur�na +controlledvocabulary.language.Jutish=Jutish +controlledvocabulary.language.Juwal=Juwal +controlledvocabulary.language.Juxtlahuaca_Mixtec=Juxtlahuaca Mixtec +controlledvocabulary.language.Juhoan=Ju??hoan +controlledvocabulary.language.Jwira-Pepesa=Jwira-Pepesa +controlledvocabulary.language.J�rriais=J�rriais +controlledvocabulary.language.J�ma=J�ma +controlledvocabulary.language.K'iche'=K'iche' +controlledvocabulary.language.Kaamba=Kaamba +controlledvocabulary.language.Kaan=Kaan +controlledvocabulary.language.Kaang_Chin=Kaang Chin +controlledvocabulary.language.Kaansa=Kaansa +controlledvocabulary.language.Kaba=Kaba +controlledvocabulary.language.Kabalai=Kabalai +controlledvocabulary.language.Kabardian=Kabardian +controlledvocabulary.language.Kabatei=Kabatei +controlledvocabulary.language.Kabiy�=Kabiy� +controlledvocabulary.language.Kabola=Kabola +controlledvocabulary.language.Kabore_One=Kabore One +controlledvocabulary.language.Kabras=Kabras +controlledvocabulary.language.Kaburi=Kaburi +controlledvocabulary.language.Kabutra=Kabutra +controlledvocabulary.language.Kabuverdianu=Kabuverdianu +controlledvocabulary.language.Kabwa=Kabwa +controlledvocabulary.language.Kabwari=Kabwari +controlledvocabulary.language.Kabyle=Kabyle +controlledvocabulary.language.Kachama-Ganjule=Kachama-Ganjule +controlledvocabulary.language.Kachari=Kachari +controlledvocabulary.language.Kachhi=Kachhi +controlledvocabulary.language.Kachi_Koli=Kachi Koli +controlledvocabulary.language.Kachin=Kachin +controlledvocabulary.language.Kachok=Kachok +controlledvocabulary.language.Kacipo-Bale_Suri=Kacipo-Bale Suri +controlledvocabulary.language.Kadai=Kadai +controlledvocabulary.language.Kadar=Kadar +controlledvocabulary.language.Kadaru=Kadaru +controlledvocabulary.language.Kadazan_Dusun=Kadazan Dusun +controlledvocabulary.language.Kadiw�u=Kadiw�u +controlledvocabulary.language.Kadu=Kadu +controlledvocabulary.language.Kadung=Kadung +controlledvocabulary.language.Kaduo=Kaduo +controlledvocabulary.language.Kaeku=Kaeku +controlledvocabulary.language.Kaera=Kaera +controlledvocabulary.language.Kafa=Kafa +controlledvocabulary.language.Kafoa=Kafoa +controlledvocabulary.language.Kagan_Kalagan=Kagan Kalagan +controlledvocabulary.language.Kagate=Kagate +controlledvocabulary.language.Kagayanen=Kagayanen +controlledvocabulary.language.Kagoma=Kagoma +controlledvocabulary.language.Kagoro=Kagoro +controlledvocabulary.language.Kagulu=Kagulu +controlledvocabulary.language.Kahe=Kahe +controlledvocabulary.language.Kahua=Kahua +controlledvocabulary.language.Kaian=Kaian +controlledvocabulary.language.Kaibobo=Kaibobo +controlledvocabulary.language.Kaidipang=Kaidipang +controlledvocabulary.language.Kaiep=Kaiep +controlledvocabulary.language.Kaikadi=Kaikadi +controlledvocabulary.language.Kaikavian_Literary_Language=Kaikavian Literary Language +controlledvocabulary.language.Kaike=Kaike +controlledvocabulary.language.Kaimbulawa=Kaimbulawa +controlledvocabulary.language.Kaimb�=Kaimb� +controlledvocabulary.language.Kaingang=Kaingang +controlledvocabulary.language.Kairak=Kairak +controlledvocabulary.language.Kairiru=Kairiru +controlledvocabulary.language.Kairui-Midiki=Kairui-Midiki +controlledvocabulary.language.Kais=Kais +controlledvocabulary.language.Kaitag=Kaitag +controlledvocabulary.language.Kaivi=Kaivi +controlledvocabulary.language.Kaiw�=Kaiw� +controlledvocabulary.language.Kaiy=Kaiy +controlledvocabulary.language.Kajakse=Kajakse +controlledvocabulary.language.Kajali=Kajali +controlledvocabulary.language.Kajaman=Kajaman +controlledvocabulary.language.Kakabai=Kakabai +controlledvocabulary.language.Kakabe=Kakabe +controlledvocabulary.language.Kakanda=Kakanda +controlledvocabulary.language.Kaki_Ae=Kaki Ae +controlledvocabulary.language.Kako=Kako +controlledvocabulary.language.Kakwa=Kakwa +controlledvocabulary.language.Kala_Lagaw_Ya=Kala Lagaw Ya +controlledvocabulary.language.Kalaamaya=Kalaamaya +controlledvocabulary.language.Kalabakan=Kalabakan +controlledvocabulary.language.Kalabari=Kalabari +controlledvocabulary.language.Kalabra=Kalabra +controlledvocabulary.language.Kalagan=Kalagan +controlledvocabulary.language.Kalaktang_Monpa=Kalaktang Monpa +controlledvocabulary.language.Kalam=Kalam +controlledvocabulary.language.Kalams�=Kalams� +controlledvocabulary.language.Kalanadi=Kalanadi +controlledvocabulary.language.Kalanga=Kalanga +controlledvocabulary.language.Kalanguya=Kalanguya +controlledvocabulary.language.Kalao=Kalao +controlledvocabulary.language.Kalapuya=Kalapuya +controlledvocabulary.language.Kalarko=Kalarko +controlledvocabulary.language.Kalasha=Kalasha +controlledvocabulary.language.Kalenjin=Kalenjin +controlledvocabulary.language.Kalispel-Pend_d'Oreille=Kalispel-Pend d'Oreille +controlledvocabulary.language.Kalkoti=Kalkoti +controlledvocabulary.language.Kalkutung=Kalkutung +controlledvocabulary.language.Kalmyk=Kalmyk +controlledvocabulary.language.Kalo_Finnish_Romani=Kalo Finnish Romani +controlledvocabulary.language.Kalou=Kalou +controlledvocabulary.language.Kaluli=Kaluli +controlledvocabulary.language.Kalumpang=Kalumpang +controlledvocabulary.language.Kam=Kam +controlledvocabulary.language.Kamakan=Kamakan +controlledvocabulary.language.Kamang=Kamang +controlledvocabulary.language.Kamano=Kamano +controlledvocabulary.language.Kamantan=Kamantan +controlledvocabulary.language.Kamar=Kamar +controlledvocabulary.language.Kamara=Kamara +controlledvocabulary.language.Kamarian=Kamarian +controlledvocabulary.language.Kamaru=Kamaru +controlledvocabulary.language.Kamas=Kamas +controlledvocabulary.language.Kamasa=Kamasa +controlledvocabulary.language.Kamasau=Kamasau +controlledvocabulary.language.Kamayo=Kamayo +controlledvocabulary.language.Kamayur�=Kamayur� +controlledvocabulary.language.Kamba_(Kenya)=Kamba (Kenya) +controlledvocabulary.language.Kambaata=Kambaata +controlledvocabulary.language.Kambaira=Kambaira +controlledvocabulary.language.Kambera=Kambera +controlledvocabulary.language.Kamberau=Kamberau +controlledvocabulary.language.Kambiw�=Kambiw� +controlledvocabulary.language.Kami_(Nigeria)=Kami (Nigeria) +controlledvocabulary.language.Kami_(Tanzania)=Kami (Tanzania) +controlledvocabulary.language.Kamo=Kamo +controlledvocabulary.language.Kamoro=Kamoro +controlledvocabulary.language.Kamu=Kamu +controlledvocabulary.language.Kamula=Kamula +controlledvocabulary.language.Kamviri=Kamviri +controlledvocabulary.language.Kamwe=Kamwe +controlledvocabulary.language.Kanakanabu=Kanakanabu +controlledvocabulary.language.Kanamar�=Kanamar� +controlledvocabulary.language.Kanan=Kanan +controlledvocabulary.language.Kanashi=Kanashi +controlledvocabulary.language.Kanasi=Kanasi +controlledvocabulary.language.Kanauji=Kanauji +controlledvocabulary.language.Kandas=Kandas +controlledvocabulary.language.Kandawo=Kandawo +controlledvocabulary.language.Kande=Kande +controlledvocabulary.language.Kanembu=Kanembu +controlledvocabulary.language.Kang=Kang +controlledvocabulary.language.Kanga=Kanga +controlledvocabulary.language.Kangean=Kangean +controlledvocabulary.language.Kanggape=Kanggape +controlledvocabulary.language.Kangjia=Kangjia +controlledvocabulary.language.Kango_(Bas-U�l�_District)=Kango (Bas-U�l� District) +controlledvocabulary.language.Kango_(Tshopo_District)=Kango (Tshopo District) +controlledvocabulary.language.Kangri=Kangri +controlledvocabulary.language.Kaniet=Kaniet +controlledvocabulary.language.Kanikkaran=Kanikkaran +controlledvocabulary.language.Kaningdon-Nindem=Kaningdon-Nindem +controlledvocabulary.language.Kaningi=Kaningi +controlledvocabulary.language.Kaningra=Kaningra +controlledvocabulary.language.Kaninuwa=Kaninuwa +controlledvocabulary.language.Kanite=Kanite +controlledvocabulary.language.Kanjari=Kanjari +controlledvocabulary.language.Kanju=Kanju +controlledvocabulary.language.Kankanaey=Kankanaey +controlledvocabulary.language.Kannada=Kannada +controlledvocabulary.language.Kannada_Kurumba=Kannada Kurumba +controlledvocabulary.language.Kanowit-Tanjong_Melanau=Kanowit-Tanjong Melanau +controlledvocabulary.language.Kano�=Kano� +controlledvocabulary.language.Kansa=Kansa +controlledvocabulary.language.Kantosi=Kantosi +controlledvocabulary.language.Kanu=Kanu +controlledvocabulary.language.Kanufi=Kanufi +controlledvocabulary.language.Kanuri=Kanuri +controlledvocabulary.language.Kanyok=Kanyok +controlledvocabulary.language.Kao=Kao +controlledvocabulary.language.Kaonde=Kaonde +controlledvocabulary.language.Kap=Kap +controlledvocabulary.language.Kapin=Kapin +controlledvocabulary.language.Kapinaw�=Kapinaw� +controlledvocabulary.language.Kapingamarangi=Kapingamarangi +controlledvocabulary.language.Kapori=Kapori +controlledvocabulary.language.Kapriman=Kapriman +controlledvocabulary.language.Kaptiau=Kaptiau +controlledvocabulary.language.Kapya=Kapya +controlledvocabulary.language.Kaqchikel=Kaqchikel +controlledvocabulary.language.Kara_(Central_African_Republic)=Kara (Central African Republic) +controlledvocabulary.language.Kara_(Korea)=Kara (Korea) +controlledvocabulary.language.Kara_(Papua_New_Guinea)=Kara (Papua New Guinea) +controlledvocabulary.language.Kara_(Tanzania)=Kara (Tanzania) +controlledvocabulary.language.Kara-Kalpak=Kara-Kalpak +controlledvocabulary.language.Karachay-Balkar=Karachay-Balkar +controlledvocabulary.language.Karagas=Karagas +controlledvocabulary.language.Karaim=Karaim +controlledvocabulary.language.Karajarri=Karajarri +controlledvocabulary.language.Karaj�=Karaj� +controlledvocabulary.language.Karakhanid=Karakhanid +controlledvocabulary.language.Karami=Karami +controlledvocabulary.language.Karamojong=Karamojong +controlledvocabulary.language.Karang=Karang +controlledvocabulary.language.Karanga=Karanga +controlledvocabulary.language.Karankawa=Karankawa +controlledvocabulary.language.Karao=Karao +controlledvocabulary.language.Karas=Karas +controlledvocabulary.language.Karata=Karata +controlledvocabulary.language.Karawa=Karawa +controlledvocabulary.language.Karbi=Karbi +controlledvocabulary.language.Kare_(Central_African_Republic)=Kare (Central African Republic) +controlledvocabulary.language.Kare_(Papua_New_Guinea)=Kare (Papua New Guinea) +controlledvocabulary.language.Karekare=Karekare +controlledvocabulary.language.Karelian=Karelian +controlledvocabulary.language.Karenggapa=Karenggapa +controlledvocabulary.language.Karey=Karey +controlledvocabulary.language.Kari=Kari +controlledvocabulary.language.Karingani=Karingani +controlledvocabulary.language.Karipuna=Karipuna +controlledvocabulary.language.Karip�na_Creole_French=Karip�na Creole French +controlledvocabulary.language.Karir�-Xoc�=Karir�-Xoc� +controlledvocabulary.language.Kariti�na=Kariti�na +controlledvocabulary.language.Kariya=Kariya +controlledvocabulary.language.Kariyarra=Kariyarra +controlledvocabulary.language.Karkar-Yuri=Karkar-Yuri +controlledvocabulary.language.Karkin=Karkin +controlledvocabulary.language.Karko=Karko +controlledvocabulary.language.Karnai=Karnai +controlledvocabulary.language.Karo_(Brazil)=Karo (Brazil) +controlledvocabulary.language.Karo_(Ethiopia)=Karo (Ethiopia) +controlledvocabulary.language.Karok=Karok +controlledvocabulary.language.Karon=Karon +controlledvocabulary.language.Karon_Dori=Karon Dori +controlledvocabulary.language.Karore=Karore +controlledvocabulary.language.Karuwali=Karuwali +controlledvocabulary.language.Kasanga=Kasanga +controlledvocabulary.language.Kasem=Kasem +controlledvocabulary.language.Kashaya=Kashaya +controlledvocabulary.language.Kashmiri=Kashmiri +controlledvocabulary.language.Kashubian=Kashubian +controlledvocabulary.language.Kasiguranin=Kasiguranin +controlledvocabulary.language.Kaska=Kaska +controlledvocabulary.language.Kaskean=Kaskean +controlledvocabulary.language.Kasua=Kasua +controlledvocabulary.language.Katabaga=Katabaga +controlledvocabulary.language.Katawixi=Katawixi +controlledvocabulary.language.Katbol=Katbol +controlledvocabulary.language.Katcha-Kadugli-Miri=Katcha-Kadugli-Miri +controlledvocabulary.language.Kathoriya_Tharu=Kathoriya Tharu +controlledvocabulary.language.Kathu=Kathu +controlledvocabulary.language.Kati=Kati +controlledvocabulary.language.Katkari=Katkari +controlledvocabulary.language.Katla=Katla +controlledvocabulary.language.Kato=Kato +controlledvocabulary.language.Katso=Katso +controlledvocabulary.language.Katua=Katua +controlledvocabulary.language.Katuk�na=Katuk�na +controlledvocabulary.language.Kaulong=Kaulong +controlledvocabulary.language.Kaur=Kaur +controlledvocabulary.language.Kaure=Kaure +controlledvocabulary.language.Kaurna=Kaurna +controlledvocabulary.language.Kauwera=Kauwera +controlledvocabulary.language.Kavalan=Kavalan +controlledvocabulary.language.Kavet=Kavet +controlledvocabulary.language.Kawacha=Kawacha +controlledvocabulary.language.Kawaiisu=Kawaiisu +controlledvocabulary.language.Kawe=Kawe +controlledvocabulary.language.Kawi=Kawi +controlledvocabulary.language.Kaxarar�=Kaxarar� +controlledvocabulary.language.Kaxui�na=Kaxui�na +controlledvocabulary.language.Kayab�=Kayab� +controlledvocabulary.language.Kayagar=Kayagar +controlledvocabulary.language.Kayan=Kayan +controlledvocabulary.language.Kayan_Mahakam=Kayan Mahakam +controlledvocabulary.language.Kayan_River_Kayan=Kayan River Kayan +controlledvocabulary.language.Kayap�=Kayap� +controlledvocabulary.language.Kayardild=Kayardild +controlledvocabulary.language.Kayaw=Kayaw +controlledvocabulary.language.Kayeli=Kayeli +controlledvocabulary.language.Kayong=Kayong +controlledvocabulary.language.Kayort=Kayort +controlledvocabulary.language.Kaytetye=Kaytetye +controlledvocabulary.language.Kayupulau=Kayupulau +controlledvocabulary.language.Kazakh=Kazakh +controlledvocabulary.language.Kazukuru=Kazukuru +controlledvocabulary.language.Ke'o=Ke'o +controlledvocabulary.language.Keak=Keak +controlledvocabulary.language.Keapara=Keapara +controlledvocabulary.language.Kedah_Malay=Kedah Malay +controlledvocabulary.language.Kedang=Kedang +controlledvocabulary.language.Keder=Keder +controlledvocabulary.language.Keerray-Woorroong=Keerray-Woorroong +controlledvocabulary.language.Kehu=Kehu +controlledvocabulary.language.Kei=Kei +controlledvocabulary.language.Keiga=Keiga +controlledvocabulary.language.Kein=Kein +controlledvocabulary.language.Keiyo=Keiyo +controlledvocabulary.language.Kekch�=Kekch� +controlledvocabulary.language.Kela_(Democratic_Republic_of_Congo)=Kela (Democratic Republic of Congo) +controlledvocabulary.language.Kela_(Papua_New_Guinea)=Kela (Papua New Guinea) +controlledvocabulary.language.Kelabit=Kelabit +controlledvocabulary.language.Kele_(Democratic_Republic_of_Congo)=Kele (Democratic Republic of Congo) +controlledvocabulary.language.Kele_(Papua_New_Guinea)=Kele (Papua New Guinea) +controlledvocabulary.language.Keley-I_Kallahan=Keley-I Kallahan +controlledvocabulary.language.Keliko=Keliko +controlledvocabulary.language.Kelo=Kelo +controlledvocabulary.language.Kelon=Kelon +controlledvocabulary.language.Kemak=Kemak +controlledvocabulary.language.Kembayan=Kembayan +controlledvocabulary.language.Kemberano=Kemberano +controlledvocabulary.language.Kembra=Kembra +controlledvocabulary.language.Kemedzung=Kemedzung +controlledvocabulary.language.Kemi_Sami=Kemi Sami +controlledvocabulary.language.Kemiehua=Kemiehua +controlledvocabulary.language.Kemtuik=Kemtuik +controlledvocabulary.language.Kenaboi=Kenaboi +controlledvocabulary.language.Kenati=Kenati +controlledvocabulary.language.Kendayan=Kendayan +controlledvocabulary.language.Kendeje=Kendeje +controlledvocabulary.language.Kendem=Kendem +controlledvocabulary.language.Kenga=Kenga +controlledvocabulary.language.Keningau_Murut=Keningau Murut +controlledvocabulary.language.Keninjal=Keninjal +controlledvocabulary.language.Kensiu=Kensiu +controlledvocabulary.language.Kenswei_Nsei=Kenswei Nsei +controlledvocabulary.language.Kenyan_Sign_Language=Kenyan Sign Language +controlledvocabulary.language.Kenyang=Kenyang +controlledvocabulary.language.Kenyi=Kenyi +controlledvocabulary.language.Kenzi=Kenzi +controlledvocabulary.language.Keoru-Ahia=Keoru-Ahia +controlledvocabulary.language.Kepkiriw�t=Kepkiriw�t +controlledvocabulary.language.Kepo'=Kepo' +controlledvocabulary.language.Kera=Kera +controlledvocabulary.language.Kerak=Kerak +controlledvocabulary.language.Kereho=Kereho +controlledvocabulary.language.Kerek=Kerek +controlledvocabulary.language.Kerewe=Kerewe +controlledvocabulary.language.Kerewo=Kerewo +controlledvocabulary.language.Kerinci=Kerinci +controlledvocabulary.language.Kesawai=Kesawai +controlledvocabulary.language.Ket=Ket +controlledvocabulary.language.Ketangalan=Ketangalan +controlledvocabulary.language.Kete=Kete +controlledvocabulary.language.Ketengban=Ketengban +controlledvocabulary.language.Ketum=Ketum +controlledvocabulary.language.Keyagana=Keyagana +controlledvocabulary.language.Kgalagadi=Kgalagadi +controlledvocabulary.language.Khah=Khah +controlledvocabulary.language.Khakas=Khakas +controlledvocabulary.language.Khalaj=Khalaj +controlledvocabulary.language.Khaling=Khaling +controlledvocabulary.language.Khamba=Khamba +controlledvocabulary.language.Khamnigan_Mongol=Khamnigan Mongol +controlledvocabulary.language.Khams_Tibetan=Khams Tibetan +controlledvocabulary.language.Khamti=Khamti +controlledvocabulary.language.Khamyang=Khamyang +controlledvocabulary.language.Khana=Khana +controlledvocabulary.language.Khandesi=Khandesi +controlledvocabulary.language.Khanty=Khanty +controlledvocabulary.language.Khao=Khao +controlledvocabulary.language.Kharam_Naga=Kharam Naga +controlledvocabulary.language.Kharia=Kharia +controlledvocabulary.language.Kharia_Thar=Kharia Thar +controlledvocabulary.language.Khasi=Khasi +controlledvocabulary.language.Khayo=Khayo +controlledvocabulary.language.Khazar=Khazar +controlledvocabulary.language.Khe=Khe +controlledvocabulary.language.Khehek=Khehek +controlledvocabulary.language.Khengkha=Khengkha +controlledvocabulary.language.Khetrani=Khetrani +controlledvocabulary.language.Khezha_Naga=Khezha Naga +controlledvocabulary.language.Khiamniungan_Naga=Khiamniungan Naga +controlledvocabulary.language.Khinalugh=Khinalugh +controlledvocabulary.language.Khirwar=Khirwar +controlledvocabulary.language.Khisa=Khisa +controlledvocabulary.language.Khlula=Khlula +controlledvocabulary.language.Khmer=Khmer +controlledvocabulary.language.Khmu=Khmu +controlledvocabulary.language.Kho'ini=Kho'ini +controlledvocabulary.language.Khoekhoe=Khoekhoe +controlledvocabulary.language.Khoibu_Naga=Khoibu Naga +controlledvocabulary.language.Kholok=Kholok +controlledvocabulary.language.Khorasani_Turkish=Khorasani Turkish +controlledvocabulary.language.Khorezmian=Khorezmian +controlledvocabulary.language.Khotanese=Khotanese +controlledvocabulary.language.Khowar=Khowar +controlledvocabulary.language.Khua=Khua +controlledvocabulary.language.Khuen=Khuen +controlledvocabulary.language.Khumi_Chin=Khumi Chin +controlledvocabulary.language.Khunsari=Khunsari +controlledvocabulary.language.Khvarshi=Khvarshi +controlledvocabulary.language.Kh�ng=Kh�ng +controlledvocabulary.language.Kh�n=Kh�n +controlledvocabulary.language.Kibala=Kibala +controlledvocabulary.language.Kibet=Kibet +controlledvocabulary.language.Kibiri=Kibiri +controlledvocabulary.language.Kickapoo=Kickapoo +controlledvocabulary.language.Kija=Kija +controlledvocabulary.language.Kikai=Kikai +controlledvocabulary.language.Kikuyu,_Gikuyu=Kikuyu, Gikuyu +controlledvocabulary.language.Kildin_Sami=Kildin Sami +controlledvocabulary.language.Kilivila=Kilivila +controlledvocabulary.language.Kiliwa=Kiliwa +controlledvocabulary.language.Kilmeri=Kilmeri +controlledvocabulary.language.Kim=Kim +controlledvocabulary.language.Kim_Mun=Kim Mun +controlledvocabulary.language.Kimaama=Kimaama +controlledvocabulary.language.Kimaragang=Kimaragang +controlledvocabulary.language.Kimbu=Kimbu +controlledvocabulary.language.Kimbundu=Kimbundu +controlledvocabulary.language.Kimki=Kimki +controlledvocabulary.language.Kimr�=Kimr� +controlledvocabulary.language.Kinabalian=Kinabalian +controlledvocabulary.language.Kinalakna=Kinalakna +controlledvocabulary.language.Kinamiging_Manobo=Kinamiging Manobo +controlledvocabulary.language.Kinaray-A=Kinaray-A +controlledvocabulary.language.Kinga=Kinga +controlledvocabulary.language.Kinnauri=Kinnauri +controlledvocabulary.language.Kintaq=Kintaq +controlledvocabulary.language.Kinuku=Kinuku +controlledvocabulary.language.Kinyarwanda=Kinyarwanda +controlledvocabulary.language.Kioko=Kioko +controlledvocabulary.language.Kiong=Kiong +controlledvocabulary.language.Kiorr=Kiorr +controlledvocabulary.language.Kiowa=Kiowa +controlledvocabulary.language.Kiowa_Apache=Kiowa Apache +controlledvocabulary.language.Kipsigis=Kipsigis +controlledvocabulary.language.Kiput=Kiput +controlledvocabulary.language.Kir-Balar=Kir-Balar +controlledvocabulary.language.Kire=Kire +controlledvocabulary.language.Kirghiz=Kirghiz +controlledvocabulary.language.Kirike=Kirike +controlledvocabulary.language.Kirikiri=Kirikiri +controlledvocabulary.language.Kirmanjki_(individual_language)=Kirmanjki (individual language) +controlledvocabulary.language.Kirundi=Kirundi +controlledvocabulary.language.Kirya-Konzl=Kirya-Konz?l +controlledvocabulary.language.Kis=Kis +controlledvocabulary.language.Kisa=Kisa +controlledvocabulary.language.Kisan=Kisan +controlledvocabulary.language.Kisankasa=Kisankasa +controlledvocabulary.language.Kisar=Kisar +controlledvocabulary.language.Kisi=Kisi +controlledvocabulary.language.Kistane=Kistane +controlledvocabulary.language.Kita_Maninkakan=Kita Maninkakan +controlledvocabulary.language.Kitan=Kitan +controlledvocabulary.language.Kitsai=Kitsai +controlledvocabulary.language.Kituba_(Congo)=Kituba (Congo) +controlledvocabulary.language.Kituba_(Democratic_Republic_of_Congo)=Kituba (Democratic Republic of Congo) +controlledvocabulary.language.Kiunum=Kiunum +controlledvocabulary.language.Kizamani=Kizamani +controlledvocabulary.language.Kla-Dan=Kla-Dan +controlledvocabulary.language.Klamath-Modoc=Klamath-Modoc +controlledvocabulary.language.Klao=Klao +controlledvocabulary.language.Klias_River_Kadazan=Klias River Kadazan +controlledvocabulary.language.Klingon=Klingon +controlledvocabulary.language.Knaanic=Knaanic +controlledvocabulary.language.Ko=Ko +controlledvocabulary.language.Koalib=Koalib +controlledvocabulary.language.Koasati=Koasati +controlledvocabulary.language.Koba=Koba +controlledvocabulary.language.Kobiana=Kobiana +controlledvocabulary.language.Kobo=Kobo +controlledvocabulary.language.Kobol=Kobol +controlledvocabulary.language.Kobon=Kobon +controlledvocabulary.language.Koch=Koch +controlledvocabulary.language.Kochila_Tharu=Kochila Tharu +controlledvocabulary.language.Koda=Koda +controlledvocabulary.language.Kodaku=Kodaku +controlledvocabulary.language.Kodava=Kodava +controlledvocabulary.language.Kodeoha=Kodeoha +controlledvocabulary.language.Kodi=Kodi +controlledvocabulary.language.Kodia=Kodia +controlledvocabulary.language.Koenoem=Koenoem +controlledvocabulary.language.Kofa=Kofa +controlledvocabulary.language.Kofei=Kofei +controlledvocabulary.language.Kofyar=Kofyar +controlledvocabulary.language.Koguryo=Koguryo +controlledvocabulary.language.Kohin=Kohin +controlledvocabulary.language.Kohistani_Shina=Kohistani Shina +controlledvocabulary.language.Koho=Koho +controlledvocabulary.language.Kohumono=Kohumono +controlledvocabulary.language.Koi=Koi +controlledvocabulary.language.Koireng=Koireng +controlledvocabulary.language.Koitabu=Koitabu +controlledvocabulary.language.Koiwat=Koiwat +controlledvocabulary.language.Kok_Borok=Kok Borok +controlledvocabulary.language.Kok-Nar=Kok-Nar +controlledvocabulary.language.Kokata=Kokata +controlledvocabulary.language.Koke=Koke +controlledvocabulary.language.Koki_Naga=Koki Naga +controlledvocabulary.language.Koko_Babangk=Koko Babangk +controlledvocabulary.language.Kokoda=Kokoda +controlledvocabulary.language.Kokola=Kokola +controlledvocabulary.language.Kokota=Kokota +controlledvocabulary.language.Kol_(Bangladesh)=Kol (Bangladesh) +controlledvocabulary.language.Kol_(Cameroon)=Kol (Cameroon) +controlledvocabulary.language.Kol_(Papua_New_Guinea)=Kol (Papua New Guinea) +controlledvocabulary.language.Kola=Kola +controlledvocabulary.language.Kolbila=Kolbila +controlledvocabulary.language.Kolibugan_Subanon=Kolibugan Subanon +controlledvocabulary.language.Koluwawa=Koluwawa +controlledvocabulary.language.Kom_(Cameroon)=Kom (Cameroon) +controlledvocabulary.language.Kom_(India)=Kom (India) +controlledvocabulary.language.Koma=Koma +controlledvocabulary.language.Komba=Komba +controlledvocabulary.language.Kombai=Kombai +controlledvocabulary.language.Kombio=Kombio +controlledvocabulary.language.Komering=Komering +controlledvocabulary.language.Komi=Komi +controlledvocabulary.language.Komi-Permyak=Komi-Permyak +controlledvocabulary.language.Komi-Zyrian=Komi-Zyrian +controlledvocabulary.language.Kominimung=Kominimung +controlledvocabulary.language.Komo_(Democratic_Republic_of_Congo)=Komo (Democratic Republic of Congo) +controlledvocabulary.language.Komo_(Sudan)=Komo (Sudan) +controlledvocabulary.language.Komodo=Komodo +controlledvocabulary.language.Kompane=Kompane +controlledvocabulary.language.Komyandaret=Komyandaret +controlledvocabulary.language.Kon_Keu=Kon Keu +controlledvocabulary.language.Konai=Konai +controlledvocabulary.language.Konda=Konda +controlledvocabulary.language.Konda-Dora=Konda-Dora +controlledvocabulary.language.Koneraw=Koneraw +controlledvocabulary.language.Kongo=Kongo +controlledvocabulary.language.Konkani_(individual_language)=Konkani (individual language) +controlledvocabulary.language.Konkani_(macrolanguage)=Konkani (macrolanguage) +controlledvocabulary.language.Konkomba=Konkomba +controlledvocabulary.language.Konni=Konni +controlledvocabulary.language.Kono_(Guinea)=Kono (Guinea) +controlledvocabulary.language.Kono_(Nigeria)=Kono (Nigeria) +controlledvocabulary.language.Kono_(Sierra_Leone)=Kono (Sierra Leone) +controlledvocabulary.language.Konomala=Konomala +controlledvocabulary.language.Konongo=Konongo +controlledvocabulary.language.Konso=Konso +controlledvocabulary.language.Konyak_Naga=Konyak Naga +controlledvocabulary.language.Konyanka_Maninka=Konyanka Maninka +controlledvocabulary.language.Konzo=Konzo +controlledvocabulary.language.Koongo=Koongo +controlledvocabulary.language.Koonzime=Koonzime +controlledvocabulary.language.Koorete=Koorete +controlledvocabulary.language.Kopar=Kopar +controlledvocabulary.language.Kopkaka=Kopkaka +controlledvocabulary.language.Korafe-Yegha=Korafe-Yegha +controlledvocabulary.language.Korak=Korak +controlledvocabulary.language.Korana=Korana +controlledvocabulary.language.Korandje=Korandje +controlledvocabulary.language.Korean=Korean +controlledvocabulary.language.Korean_Sign_Language=Korean Sign Language +controlledvocabulary.language.Koreguaje=Koreguaje +controlledvocabulary.language.Koresh-e_Rostam=Koresh-e Rostam +controlledvocabulary.language.Korku=Korku +controlledvocabulary.language.Korlai_Creole_Portuguese=Korlai Creole Portuguese +controlledvocabulary.language.Koro_(C�te_d'Ivoire)=Koro (C�te d'Ivoire) +controlledvocabulary.language.Koro_(India)=Koro (India) +controlledvocabulary.language.Koro_(Papua_New_Guinea)=Koro (Papua New Guinea) +controlledvocabulary.language.Koro_(Vanuatu)=Koro (Vanuatu) +controlledvocabulary.language.Koro_Nulu=Koro Nulu +controlledvocabulary.language.Koro_Wachi=Koro Wachi +controlledvocabulary.language.Koro_Zuba=Koro Zuba +controlledvocabulary.language.Koromf�=Koromf� +controlledvocabulary.language.Koromira=Koromira +controlledvocabulary.language.Koronadal_Blaan=Koronadal Blaan +controlledvocabulary.language.Koroni=Koroni +controlledvocabulary.language.Korop�=Korop� +controlledvocabulary.language.Koroshi=Koroshi +controlledvocabulary.language.Korowai=Korowai +controlledvocabulary.language.Korra_Koraga=Korra Koraga +controlledvocabulary.language.Korubo=Korubo +controlledvocabulary.language.Korupun-Sela=Korupun-Sela +controlledvocabulary.language.Korwa=Korwa +controlledvocabulary.language.Koryak=Koryak +controlledvocabulary.language.Kosadle=Kosadle +controlledvocabulary.language.Kosarek_Yale=Kosarek Yale +controlledvocabulary.language.Kosena=Kosena +controlledvocabulary.language.Koshin=Koshin +controlledvocabulary.language.Kosraean=Kosraean +controlledvocabulary.language.Kota_(Gabon)=Kota (Gabon) +controlledvocabulary.language.Kota_(India)=Kota (India) +controlledvocabulary.language.Kota_Bangun_Kutai_Malay=Kota Bangun Kutai Malay +controlledvocabulary.language.Kota_Marudu_Talantang=Kota Marudu Talantang +controlledvocabulary.language.Kotafon_Gbe=Kotafon Gbe +controlledvocabulary.language.Kotava=Kotava +controlledvocabulary.language.Koti=Koti +controlledvocabulary.language.Kott=Kott +controlledvocabulary.language.Kou=Kou +controlledvocabulary.language.Kouya=Kouya +controlledvocabulary.language.Kovai=Kovai +controlledvocabulary.language.Kove=Kove +controlledvocabulary.language.Kowaki=Kowaki +controlledvocabulary.language.Kowiai=Kowiai +controlledvocabulary.language.Koy_Sanjaq_Surat=Koy Sanjaq Surat +controlledvocabulary.language.Koya=Koya +controlledvocabulary.language.Koyaga=Koyaga +controlledvocabulary.language.Koyo=Koyo +controlledvocabulary.language.Koyra_Chiini_Songhay=Koyra Chiini Songhay +controlledvocabulary.language.Koyraboro_Senni_Songhai=Koyraboro Senni Songhai +controlledvocabulary.language.Koyukon=Koyukon +controlledvocabulary.language.Kpagua=Kpagua +controlledvocabulary.language.Kpala=Kpala +controlledvocabulary.language.Kpan=Kpan +controlledvocabulary.language.Kpasam=Kpasam +controlledvocabulary.language.Kpati=Kpati +controlledvocabulary.language.Kpatili=Kpatili +controlledvocabulary.language.Kpeego=Kpeego +controlledvocabulary.language.Kpelle=Kpelle +controlledvocabulary.language.Kpessi=Kpessi +controlledvocabulary.language.Kplang=Kplang +controlledvocabulary.language.Krache=Krache +controlledvocabulary.language.Krah�=Krah� +controlledvocabulary.language.Kraol=Kraol +controlledvocabulary.language.Krenak=Krenak +controlledvocabulary.language.Krevinian=Krevinian +controlledvocabulary.language.Kreye=Kreye +controlledvocabulary.language.Kriang=Kriang +controlledvocabulary.language.Krikati-Timbira=Krikati-Timbira +controlledvocabulary.language.Krio=Krio +controlledvocabulary.language.Kriol=Kriol +controlledvocabulary.language.Krisa=Krisa +controlledvocabulary.language.Krobu=Krobu +controlledvocabulary.language.Krongo=Krongo +controlledvocabulary.language.Krung=Krung +controlledvocabulary.language.Krymchak=Krymchak +controlledvocabulary.language.Kryts=Kryts +controlledvocabulary.language.Kua=Kua +controlledvocabulary.language.Kua-nsi=Kua-nsi +controlledvocabulary.language.Kuamasi=Kuamasi +controlledvocabulary.language.Kuan=Kuan +controlledvocabulary.language.Kuanhua=Kuanhua +controlledvocabulary.language.Kuanua=Kuanua +controlledvocabulary.language.Kuanyama,_Kwanyama=Kuanyama, Kwanyama +controlledvocabulary.language.Kubachi=Kubachi +controlledvocabulary.language.Kube=Kube +controlledvocabulary.language.Kubi=Kubi +controlledvocabulary.language.Kubo=Kubo +controlledvocabulary.language.Kubu=Kubu +controlledvocabulary.language.Kucong=Kucong +controlledvocabulary.language.Kudiya=Kudiya +controlledvocabulary.language.Kudmali=Kudmali +controlledvocabulary.language.Kudu-Camo=Kudu-Camo +controlledvocabulary.language.Kufr_Qassem_Sign_Language_(KQSL)=Kufr Qassem Sign Language (KQSL) +controlledvocabulary.language.Kugama=Kugama +controlledvocabulary.language.Kugbo=Kugbo +controlledvocabulary.language.Kugu-Muminh=Kugu-Muminh +controlledvocabulary.language.Kui_(India)=Kui (India) +controlledvocabulary.language.Kui_(Indonesia)=Kui (Indonesia) +controlledvocabulary.language.Kuijau=Kuijau +controlledvocabulary.language.Kuik�ro-Kalap�lo=Kuik�ro-Kalap�lo +controlledvocabulary.language.Kujarge=Kujarge +controlledvocabulary.language.Kuk=Kuk +controlledvocabulary.language.Kukatja=Kukatja +controlledvocabulary.language.Kuke=Kuke +controlledvocabulary.language.Kukele=Kukele +controlledvocabulary.language.Kukna=Kukna +controlledvocabulary.language.Kuku=Kuku +controlledvocabulary.language.Kuku-Mangk=Kuku-Mangk +controlledvocabulary.language.Kuku-Mu'inh=Kuku-Mu'inh +controlledvocabulary.language.Kuku-Ugbanh=Kuku-Ugbanh +controlledvocabulary.language.Kuku-Uwanh=Kuku-Uwanh +controlledvocabulary.language.Kuku-Yalanji=Kuku-Yalanji +controlledvocabulary.language.Kula=Kula +controlledvocabulary.language.Kulere=Kulere +controlledvocabulary.language.Kulfa=Kulfa +controlledvocabulary.language.Kulina_Pano=Kulina Pano +controlledvocabulary.language.Kulisusu=Kulisusu +controlledvocabulary.language.Kullu_Pahari=Kullu Pahari +controlledvocabulary.language.Kulon=Kulon +controlledvocabulary.language.Kulung_(Nepal)=Kulung (Nepal) +controlledvocabulary.language.Kulung_(Nigeria)=Kulung (Nigeria) +controlledvocabulary.language.Kumalu=Kumalu +controlledvocabulary.language.Kumam=Kumam +controlledvocabulary.language.Kuman_(Papua_New_Guinea)=Kuman (Papua New Guinea) +controlledvocabulary.language.Kuman_(Russia)=Kuman (Russia) +controlledvocabulary.language.Kumaoni=Kumaoni +controlledvocabulary.language.Kumarbhag_Paharia=Kumarbhag Paharia +controlledvocabulary.language.Kumba=Kumba +controlledvocabulary.language.Kumbainggar=Kumbainggar +controlledvocabulary.language.Kumbaran=Kumbaran +controlledvocabulary.language.Kumbewaha=Kumbewaha +controlledvocabulary.language.Kumhali=Kumhali +controlledvocabulary.language.Kumiai=Kumiai +controlledvocabulary.language.Kumukio=Kumukio +controlledvocabulary.language.Kumyk=Kumyk +controlledvocabulary.language.Kumzari=Kumzari +controlledvocabulary.language.Kunama=Kunama +controlledvocabulary.language.Kunbarlang=Kunbarlang +controlledvocabulary.language.Kunda=Kunda +controlledvocabulary.language.Kundal_Shahi=Kundal Shahi +controlledvocabulary.language.Kunduvadi=Kunduvadi +controlledvocabulary.language.Kung=Kung +controlledvocabulary.language.Kung-Ekoka=Kung-Ekoka +controlledvocabulary.language.Kungarakany=Kungarakany +controlledvocabulary.language.Kungardutyi=Kungardutyi +controlledvocabulary.language.Kunggari=Kunggari +controlledvocabulary.language.Kungkari=Kungkari +controlledvocabulary.language.Kuni=Kuni +controlledvocabulary.language.Kuni-Boazi=Kuni-Boazi +controlledvocabulary.language.Kunigami=Kunigami +controlledvocabulary.language.Kunimaipa=Kunimaipa +controlledvocabulary.language.Kunja=Kunja +controlledvocabulary.language.Kunjen=Kunjen +controlledvocabulary.language.Kunyi=Kunyi +controlledvocabulary.language.Kunza=Kunza +controlledvocabulary.language.Kuo=Kuo +controlledvocabulary.language.Kuot=Kuot +controlledvocabulary.language.Kupa=Kupa +controlledvocabulary.language.Kupang_Malay=Kupang Malay +controlledvocabulary.language.Kupia=Kupia +controlledvocabulary.language.Kupsabiny=Kupsabiny +controlledvocabulary.language.Kur=Kur +controlledvocabulary.language.Kura_Ede_Nago=Kura Ede Nago +controlledvocabulary.language.Kurama=Kurama +controlledvocabulary.language.Kuranko=Kuranko +controlledvocabulary.language.Kurdish=Kurdish +controlledvocabulary.language.Kuri=Kuri +controlledvocabulary.language.Kuria=Kuria +controlledvocabulary.language.Kurichiya=Kurichiya +controlledvocabulary.language.Kurmukar=Kurmukar +controlledvocabulary.language.Kurnai=Kurnai +controlledvocabulary.language.Kurrama=Kurrama +controlledvocabulary.language.Kurti=Kurti +controlledvocabulary.language.Kurtokha=Kurtokha +controlledvocabulary.language.Kurudu=Kurudu +controlledvocabulary.language.Kurukh=Kurukh +controlledvocabulary.language.Kuru�ya=Kuru�ya +controlledvocabulary.language.Kusaal=Kusaal +controlledvocabulary.language.Kusaghe=Kusaghe +controlledvocabulary.language.Kushi=Kushi +controlledvocabulary.language.Kusu=Kusu +controlledvocabulary.language.Kusunda=Kusunda +controlledvocabulary.language.Kutenai=Kutenai +controlledvocabulary.language.Kutep=Kutep +controlledvocabulary.language.Kuthant=Kuthant +controlledvocabulary.language.Kutong=Kutong +controlledvocabulary.language.Kutto=Kutto +controlledvocabulary.language.Kutu=Kutu +controlledvocabulary.language.Kuturmi=Kuturmi +controlledvocabulary.language.Kuuk_Thaayorre=Kuuk Thaayorre +controlledvocabulary.language.Kuuk-Yak=Kuuk-Yak +controlledvocabulary.language.Kuuku-Ya'u=Kuuku-Ya'u +controlledvocabulary.language.Kuvale=Kuvale +controlledvocabulary.language.Kuvi=Kuvi +controlledvocabulary.language.Kuwaa=Kuwaa +controlledvocabulary.language.Kuwaataay=Kuwaataay +controlledvocabulary.language.Kuwema=Kuwema +controlledvocabulary.language.Kuy=Kuy +controlledvocabulary.language.Kven_Finnish=Kven Finnish +controlledvocabulary.language.Kw'adza=Kw'adza +controlledvocabulary.language.Kwa=Kwa +controlledvocabulary.language.Kwa'=Kwa' +controlledvocabulary.language.Kwaami=Kwaami +controlledvocabulary.language.Kwadi=Kwadi +controlledvocabulary.language.Kwaio=Kwaio +controlledvocabulary.language.Kwaja=Kwaja +controlledvocabulary.language.Kwakiutl=Kwakiutl +controlledvocabulary.language.Kwakum=Kwakum +controlledvocabulary.language.Kwalhioqua-Tlatskanai=Kwalhioqua-Tlatskanai +controlledvocabulary.language.Kwama=Kwama +controlledvocabulary.language.Kwambi=Kwambi +controlledvocabulary.language.Kwamera=Kwamera +controlledvocabulary.language.Kwami=Kwami +controlledvocabulary.language.Kwamtim_One=Kwamtim One +controlledvocabulary.language.Kwandu=Kwandu +controlledvocabulary.language.Kwang=Kwang +controlledvocabulary.language.Kwanga=Kwanga +controlledvocabulary.language.Kwangali=Kwangali +controlledvocabulary.language.Kwanja=Kwanja +controlledvocabulary.language.Kwara'ae=Kwara'ae +controlledvocabulary.language.Kwasio=Kwasio +controlledvocabulary.language.Kwaya=Kwaya +controlledvocabulary.language.Kwaza=Kwaza +controlledvocabulary.language.Kwegu=Kwegu +controlledvocabulary.language.Kwer=Kwer +controlledvocabulary.language.Kwerba=Kwerba +controlledvocabulary.language.Kwerba_Mamberamo=Kwerba Mamberamo +controlledvocabulary.language.Kwere=Kwere +controlledvocabulary.language.Kwerisa=Kwerisa +controlledvocabulary.language.Kwese=Kwese +controlledvocabulary.language.Kwesten=Kwesten +controlledvocabulary.language.Kwini=Kwini +controlledvocabulary.language.Kwinsu=Kwinsu +controlledvocabulary.language.Kwinti=Kwinti +controlledvocabulary.language.Kwoma=Kwoma +controlledvocabulary.language.Kwomtari=Kwomtari +controlledvocabulary.language.Kxoe=Kxoe +controlledvocabulary.language.Kyak=Kyak +controlledvocabulary.language.Kyaka=Kyaka +controlledvocabulary.language.Kyan-Karyaw_Naga=Kyan-Karyaw Naga +controlledvocabulary.language.Kyanga=Kyanga +controlledvocabulary.language.Kyenele=Kyenele +controlledvocabulary.language.Kyerung=Kyerung +controlledvocabulary.language.K�te=K�te +controlledvocabulary.language.K�l�=K�l� +controlledvocabulary.language.K�lsch=K�lsch +controlledvocabulary.language.Klngaxo_Bozo=K?l?ngaxo Bozo +controlledvocabulary.language.La'bi=La'bi +controlledvocabulary.language.Laal=Laal +controlledvocabulary.language.Laari=Laari +controlledvocabulary.language.Laarim=Laarim +controlledvocabulary.language.Laba=Laba +controlledvocabulary.language.Label=Label +controlledvocabulary.language.Labir=Labir +controlledvocabulary.language.Labo=Labo +controlledvocabulary.language.Labo_Phowa=Labo Phowa +controlledvocabulary.language.Labu=Labu +controlledvocabulary.language.Labuk-Kinabatangan_Kadazan=Labuk-Kinabatangan Kadazan +controlledvocabulary.language.Lacandon=Lacandon +controlledvocabulary.language.Lachi=Lachi +controlledvocabulary.language.Lachiguiri_Zapotec=Lachiguiri Zapotec +controlledvocabulary.language.Lachix�o_Zapotec=Lachix�o Zapotec +controlledvocabulary.language.Ladakhi=Ladakhi +controlledvocabulary.language.Ladin=Ladin +controlledvocabulary.language.Ladino=Ladino +controlledvocabulary.language.Ladji_Ladji=Ladji Ladji +controlledvocabulary.language.Laeko-Libuat=Laeko-Libuat +controlledvocabulary.language.Lafofa=Lafofa +controlledvocabulary.language.Laghu=Laghu +controlledvocabulary.language.Laghuu=Laghuu +controlledvocabulary.language.Lagwan=Lagwan +controlledvocabulary.language.Laha_(Indonesia)=Laha (Indonesia) +controlledvocabulary.language.Laha_(Viet_Nam)=Laha (Viet Nam) +controlledvocabulary.language.Lahanan=Lahanan +controlledvocabulary.language.Lahnda=Lahnda +controlledvocabulary.language.Lahta_Karen=Lahta Karen +controlledvocabulary.language.Lahu=Lahu +controlledvocabulary.language.Lahu_Shi=Lahu Shi +controlledvocabulary.language.Lahul_Lohar=Lahul Lohar +controlledvocabulary.language.Laimbue=Laimbue +controlledvocabulary.language.Laitu_Chin=Laitu Chin +controlledvocabulary.language.Laiyolo=Laiyolo +controlledvocabulary.language.Lak=Lak +controlledvocabulary.language.Laka_(Chad)=Laka (Chad) +controlledvocabulary.language.Lakalei=Lakalei +controlledvocabulary.language.Lake_Miwok=Lake Miwok +controlledvocabulary.language.Lakha=Lakha +controlledvocabulary.language.Laki=Laki +controlledvocabulary.language.Lakkia=Lakkia +controlledvocabulary.language.Lakon=Lakon +controlledvocabulary.language.Lakond�=Lakond� +controlledvocabulary.language.Lakota=Lakota +controlledvocabulary.language.Lakota_Dida=Lakota Dida +controlledvocabulary.language.Lakurumau=Lakurumau +controlledvocabulary.language.Lala=Lala +controlledvocabulary.language.Lala-Bisa=Lala-Bisa +controlledvocabulary.language.Lala-Roba=Lala-Roba +controlledvocabulary.language.Lalana_Chinantec=Lalana Chinantec +controlledvocabulary.language.Lalia=Lalia +controlledvocabulary.language.Lama_(Togo)=Lama (Togo) +controlledvocabulary.language.Lama_Bai=Lama Bai +controlledvocabulary.language.Lamaholot=Lamaholot +controlledvocabulary.language.Lamalama=Lamalama +controlledvocabulary.language.Lamalera=Lamalera +controlledvocabulary.language.Lamang=Lamang +controlledvocabulary.language.Lamatuka=Lamatuka +controlledvocabulary.language.Lamba=Lamba +controlledvocabulary.language.Lambadi=Lambadi +controlledvocabulary.language.Lambayeque_Quechua=Lambayeque Quechua +controlledvocabulary.language.Lambichhong=Lambichhong +controlledvocabulary.language.Lamboya=Lamboya +controlledvocabulary.language.Lambya=Lambya +controlledvocabulary.language.Lame=Lame +controlledvocabulary.language.Lamenu=Lamenu +controlledvocabulary.language.Lamja-Dengsa-Tola=Lamja-Dengsa-Tola +controlledvocabulary.language.Lamkang=Lamkang +controlledvocabulary.language.Lamma=Lamma +controlledvocabulary.language.Lamnso'=Lamnso' +controlledvocabulary.language.Lamogai=Lamogai +controlledvocabulary.language.Lampung_Api=Lampung Api +controlledvocabulary.language.Lampung_Nyo=Lampung Nyo +controlledvocabulary.language.Lamu=Lamu +controlledvocabulary.language.Lanas_Lobu=Lanas Lobu +controlledvocabulary.language.Landoma=Landoma +controlledvocabulary.language.Lang'e=Lang'e +controlledvocabulary.language.Langam=Langam +controlledvocabulary.language.Langbashe=Langbashe +controlledvocabulary.language.Langnian_Buyang=Langnian Buyang +controlledvocabulary.language.Lango_(South_Sudan)=Lango (South Sudan) +controlledvocabulary.language.Lango_(Uganda)=Lango (Uganda) +controlledvocabulary.language.Langobardic=Langobardic +controlledvocabulary.language.Langue_des_signes_de_Belgique_Francophone=Langue des signes de Belgique Francophone +controlledvocabulary.language.Lanima=Lanima +controlledvocabulary.language.Lanoh=Lanoh +controlledvocabulary.language.Lao=Lao +controlledvocabulary.language.Lao_Naga=Lao Naga +controlledvocabulary.language.Laomian=Laomian +controlledvocabulary.language.Laopang=Laopang +controlledvocabulary.language.Laos_Sign_Language=Laos Sign Language +controlledvocabulary.language.Lapagu�a-Guivini_Zapotec=Lapagu�a-Guivini Zapotec +controlledvocabulary.language.Laragia=Laragia +controlledvocabulary.language.Larantuka_Malay=Larantuka Malay +controlledvocabulary.language.Lardil=Lardil +controlledvocabulary.language.Larevat=Larevat +controlledvocabulary.language.Large_Flowery_Miao=Large Flowery Miao +controlledvocabulary.language.Lari=Lari +controlledvocabulary.language.Larike-Wakasihu=Larike-Wakasihu +controlledvocabulary.language.Laro=Laro +controlledvocabulary.language.Larteh=Larteh +controlledvocabulary.language.Laru=Laru +controlledvocabulary.language.Las_Delicias_Zapotec=Las Delicias Zapotec +controlledvocabulary.language.Lasalimu=Lasalimu +controlledvocabulary.language.Lasgerdi=Lasgerdi +controlledvocabulary.language.Lashi=Lashi +controlledvocabulary.language.Lasi=Lasi +controlledvocabulary.language.Late_Middle_Chinese=Late Middle Chinese +controlledvocabulary.language.Latgalian=Latgalian +controlledvocabulary.language.Latin=Latin +controlledvocabulary.language.Latu=Latu +controlledvocabulary.language.Latund�=Latund� +controlledvocabulary.language.Latvian=Latvian +controlledvocabulary.language.Latvian_Sign_Language=Latvian Sign Language +controlledvocabulary.language.Lau=Lau +controlledvocabulary.language.Laua=Laua +controlledvocabulary.language.Lauan=Lauan +controlledvocabulary.language.Lauje=Lauje +controlledvocabulary.language.Laura=Laura +controlledvocabulary.language.Laurentian=Laurentian +controlledvocabulary.language.Lautu_Chin=Lautu Chin +controlledvocabulary.language.Lavatbura-Lamusong=Lavatbura-Lamusong +controlledvocabulary.language.Laven=Laven +controlledvocabulary.language.Lavi=Lavi +controlledvocabulary.language.Lavukaleve=Lavukaleve +controlledvocabulary.language.Lawangan=Lawangan +controlledvocabulary.language.Lawu=Lawu +controlledvocabulary.language.Lawunuia=Lawunuia +controlledvocabulary.language.Layakha=Layakha +controlledvocabulary.language.Laz=Laz +controlledvocabulary.language.Lealao_Chinantec=Lealao Chinantec +controlledvocabulary.language.Leco=Leco +controlledvocabulary.language.Ledo_Kaili=Ledo Kaili +controlledvocabulary.language.Leelau=Leelau +controlledvocabulary.language.Lefa=Lefa +controlledvocabulary.language.Lega-Mwenga=Lega-Mwenga +controlledvocabulary.language.Lega-Shabunda=Lega-Shabunda +controlledvocabulary.language.Legbo=Legbo +controlledvocabulary.language.Legenyem=Legenyem +controlledvocabulary.language.Lehali=Lehali +controlledvocabulary.language.Lehalurup=Lehalurup +controlledvocabulary.language.Lehar=Lehar +controlledvocabulary.language.Leinong_Naga=Leinong Naga +controlledvocabulary.language.Leipon=Leipon +controlledvocabulary.language.Lelak=Lelak +controlledvocabulary.language.Lele_(Chad)=Lele (Chad) +controlledvocabulary.language.Lele_(Democratic_Republic_of_Congo)=Lele (Democratic Republic of Congo) +controlledvocabulary.language.Lele_(Guinea)=Lele (Guinea) +controlledvocabulary.language.Lele_(Papua_New_Guinea)=Lele (Papua New Guinea) +controlledvocabulary.language.Lelemi=Lelemi +controlledvocabulary.language.Lelepa=Lelepa +controlledvocabulary.language.Lembena=Lembena +controlledvocabulary.language.Lemerig=Lemerig +controlledvocabulary.language.Lemio=Lemio +controlledvocabulary.language.Lemnian=Lemnian +controlledvocabulary.language.Lemolang=Lemolang +controlledvocabulary.language.Lemoro=Lemoro +controlledvocabulary.language.Lenakel=Lenakel +controlledvocabulary.language.Lenca=Lenca +controlledvocabulary.language.Lendu=Lendu +controlledvocabulary.language.Lengilu=Lengilu +controlledvocabulary.language.Lengo=Lengo +controlledvocabulary.language.Lengola=Lengola +controlledvocabulary.language.Leningitij=Leningitij +controlledvocabulary.language.Lenje=Lenje +controlledvocabulary.language.Lenkau=Lenkau +controlledvocabulary.language.Lenyima=Lenyima +controlledvocabulary.language.Lepcha=Lepcha +controlledvocabulary.language.Lepki=Lepki +controlledvocabulary.language.Lepontic=Lepontic +controlledvocabulary.language.Lere=Lere +controlledvocabulary.language.Lese=Lese +controlledvocabulary.language.Lesing-Gelimi=Lesing-Gelimi +controlledvocabulary.language.Letemboi=Letemboi +controlledvocabulary.language.Leti_(Cameroon)=Leti (Cameroon) +controlledvocabulary.language.Leti_(Indonesia)=Leti (Indonesia) +controlledvocabulary.language.Levantine_Arabic=Levantine Arabic +controlledvocabulary.language.Levuka=Levuka +controlledvocabulary.language.Lewo=Lewo +controlledvocabulary.language.Lewo_Eleng=Lewo Eleng +controlledvocabulary.language.Lewotobi=Lewotobi +controlledvocabulary.language.Leyigha=Leyigha +controlledvocabulary.language.Lezghian=Lezghian +controlledvocabulary.language.Lhokpu=Lhokpu +controlledvocabulary.language.Lhomi=Lhomi +controlledvocabulary.language.Li'o=Li'o +controlledvocabulary.language.Liabuku=Liabuku +controlledvocabulary.language.Liana-Seti=Liana-Seti +controlledvocabulary.language.Liangmai_Naga=Liangmai Naga +controlledvocabulary.language.Lianshan_Zhuang=Lianshan Zhuang +controlledvocabulary.language.Liberia_Kpelle=Liberia Kpelle +controlledvocabulary.language.Liberian_English=Liberian English +controlledvocabulary.language.Libido=Libido +controlledvocabulary.language.Libinza=Libinza +controlledvocabulary.language.Libon_Bikol=Libon Bikol +controlledvocabulary.language.Liburnian=Liburnian +controlledvocabulary.language.Libyan_Arabic=Libyan Arabic +controlledvocabulary.language.Libyan_Sign_Language=Libyan Sign Language +controlledvocabulary.language.Lidzonka=Lidzonka +controlledvocabulary.language.Ligbi=Ligbi +controlledvocabulary.language.Ligenza=Ligenza +controlledvocabulary.language.Ligurian=Ligurian +controlledvocabulary.language.Ligurian_(Ancient)=Ligurian (Ancient) +controlledvocabulary.language.Lihir=Lihir +controlledvocabulary.language.Lijili=Lijili +controlledvocabulary.language.Lika=Lika +controlledvocabulary.language.Liki=Liki +controlledvocabulary.language.Likila=Likila +controlledvocabulary.language.Likuba=Likuba +controlledvocabulary.language.Likum=Likum +controlledvocabulary.language.Likwala=Likwala +controlledvocabulary.language.Lilau=Lilau +controlledvocabulary.language.Lillooet=Lillooet +controlledvocabulary.language.Limassa=Limassa +controlledvocabulary.language.Limbu=Limbu +controlledvocabulary.language.Limbum=Limbum +controlledvocabulary.language.Limburgan,_Limburger,_Limburgish=Limburgan, Limburger, Limburgish +controlledvocabulary.language.Limi=Limi +controlledvocabulary.language.Limilngan=Limilngan +controlledvocabulary.language.Limos_Kalinga=Limos Kalinga +controlledvocabulary.language.Linear_A=Linear A +controlledvocabulary.language.Lingala=Lingala +controlledvocabulary.language.Lingao=Lingao +controlledvocabulary.language.Lingarak=Lingarak +controlledvocabulary.language.Lingua_Franca=Lingua Franca +controlledvocabulary.language.Lingua_Franca_Nova=Lingua Franca Nova +controlledvocabulary.language.Lipan_Apache=Lipan Apache +controlledvocabulary.language.Lipo=Lipo +controlledvocabulary.language.Lisabata-Nuniali=Lisabata-Nuniali +controlledvocabulary.language.Lisela=Lisela +controlledvocabulary.language.Lish=Lish +controlledvocabulary.language.Lishana_Deni=Lishana Deni +controlledvocabulary.language.Lishanid_Noshan=Lishanid Noshan +controlledvocabulary.language.Lish�n_Did�n=Lish�n Did�n +controlledvocabulary.language.Lisu=Lisu +controlledvocabulary.language.Literary_Chinese=Literary Chinese +controlledvocabulary.language.Lithuanian=Lithuanian +controlledvocabulary.language.Lithuanian_Sign_Language=Lithuanian Sign Language +controlledvocabulary.language.Litzlitz=Litzlitz +controlledvocabulary.language.Liujiang_Zhuang=Liujiang Zhuang +controlledvocabulary.language.Liuqian_Zhuang=Liuqian Zhuang +controlledvocabulary.language.Liv=Liv +controlledvocabulary.language.Livvi=Livvi +controlledvocabulary.language.Lo-Toga=Lo-Toga +controlledvocabulary.language.Loarki=Loarki +controlledvocabulary.language.Lobala=Lobala +controlledvocabulary.language.Lobi=Lobi +controlledvocabulary.language.Lodhi=Lodhi +controlledvocabulary.language.Logba=Logba +controlledvocabulary.language.Logir=Logir +controlledvocabulary.language.Logo=Logo +controlledvocabulary.language.Logol=Logol +controlledvocabulary.language.Logooli=Logooli +controlledvocabulary.language.Logorik=Logorik +controlledvocabulary.language.Lohorung=Lohorung +controlledvocabulary.language.Loja_Highland_Quichua=Loja Highland Quichua +controlledvocabulary.language.Lojban=Lojban +controlledvocabulary.language.Lokaa=Lokaa +controlledvocabulary.language.Loke=Loke +controlledvocabulary.language.Loko=Loko +controlledvocabulary.language.Lokoya=Lokoya +controlledvocabulary.language.Lola=Lola +controlledvocabulary.language.Lolak=Lolak +controlledvocabulary.language.Lole=Lole +controlledvocabulary.language.Lolo=Lolo +controlledvocabulary.language.Loloda=Loloda +controlledvocabulary.language.Lolopo=Lolopo +controlledvocabulary.language.Loma_(C�te_d'Ivoire)=Loma (C�te d'Ivoire) +controlledvocabulary.language.Loma_(Liberia)=Loma (Liberia) +controlledvocabulary.language.Lomaiviti=Lomaiviti +controlledvocabulary.language.Lomavren=Lomavren +controlledvocabulary.language.Lombard=Lombard +controlledvocabulary.language.Lombi=Lombi +controlledvocabulary.language.Lombo=Lombo +controlledvocabulary.language.Lomwe=Lomwe +controlledvocabulary.language.Loncong=Loncong +controlledvocabulary.language.Long_Phuri_Naga=Long Phuri Naga +controlledvocabulary.language.Long_Wat=Long Wat +controlledvocabulary.language.Longgu=Longgu +controlledvocabulary.language.Longto=Longto +controlledvocabulary.language.Longuda=Longuda +controlledvocabulary.language.Loniu=Loniu +controlledvocabulary.language.Lonwolwol=Lonwolwol +controlledvocabulary.language.Lonzo=Lonzo +controlledvocabulary.language.Loo=Loo +controlledvocabulary.language.Lopa=Lopa +controlledvocabulary.language.Lopi=Lopi +controlledvocabulary.language.Lopit=Lopit +controlledvocabulary.language.Lorang=Lorang +controlledvocabulary.language.Lorediakarkar=Lorediakarkar +controlledvocabulary.language.Loreto-Ucayali_Spanish=Loreto-Ucayali Spanish +controlledvocabulary.language.Lote=Lote +controlledvocabulary.language.Lotha_Naga=Lotha Naga +controlledvocabulary.language.Lotud=Lotud +controlledvocabulary.language.Lou=Lou +controlledvocabulary.language.Louisiana_Creole=Louisiana Creole +controlledvocabulary.language.Loun=Loun +controlledvocabulary.language.Loup_A=Loup A +controlledvocabulary.language.Loup_B=Loup B +controlledvocabulary.language.Low_German=Low German +controlledvocabulary.language.Lower_Burdekin=Lower Burdekin +controlledvocabulary.language.Lower_Chehalis=Lower Chehalis +controlledvocabulary.language.Lower_Grand_Valley_Dani=Lower Grand Valley Dani +controlledvocabulary.language.Lower_Nossob=Lower Nossob +controlledvocabulary.language.Lower_Silesian=Lower Silesian +controlledvocabulary.language.Lower_Sorbian=Lower Sorbian +controlledvocabulary.language.Lower_Southern_Aranda=Lower Southern Aranda +controlledvocabulary.language.Lower_Ta'oih=Lower Ta'oih +controlledvocabulary.language.Lower_Tanana=Lower Tanana +controlledvocabulary.language.Lowland_Oaxaca_Chontal=Lowland Oaxaca Chontal +controlledvocabulary.language.Lowland_Tarahumara=Lowland Tarahumara +controlledvocabulary.language.Loxicha_Zapotec=Loxicha Zapotec +controlledvocabulary.language.Lozi=Lozi +controlledvocabulary.language.Luang=Luang +controlledvocabulary.language.Luba-Katanga=Luba-Katanga +controlledvocabulary.language.Luba-Lulua=Luba-Lulua +controlledvocabulary.language.Lubila=Lubila +controlledvocabulary.language.Lubu=Lubu +controlledvocabulary.language.Lubuagan_Kalinga=Lubuagan Kalinga +controlledvocabulary.language.Luchazi=Luchazi +controlledvocabulary.language.Lucumi=Lucumi +controlledvocabulary.language.Ludian=Ludian +controlledvocabulary.language.Lufu=Lufu +controlledvocabulary.language.Lugbara=Lugbara +controlledvocabulary.language.Luguru=Luguru +controlledvocabulary.language.Luhu=Luhu +controlledvocabulary.language.Luimbi=Luimbi +controlledvocabulary.language.Luiseno=Luiseno +controlledvocabulary.language.Lukpa=Lukpa +controlledvocabulary.language.Lule=Lule +controlledvocabulary.language.Lule_Sami=Lule Sami +controlledvocabulary.language.Lumba-Yakkha=Lumba-Yakkha +controlledvocabulary.language.Lumbu=Lumbu +controlledvocabulary.language.Lumun=Lumun +controlledvocabulary.language.Luna=Luna +controlledvocabulary.language.Lunanakha=Lunanakha +controlledvocabulary.language.Lunda=Lunda +controlledvocabulary.language.Lundayeh=Lundayeh +controlledvocabulary.language.Lungalunga=Lungalunga +controlledvocabulary.language.Lungga=Lungga +controlledvocabulary.language.Luo_(Cameroon)=Luo (Cameroon) +controlledvocabulary.language.Luo_(Kenya_and_Tanzania)=Luo (Kenya and Tanzania) +controlledvocabulary.language.Luopohe_Hmong=Luopohe Hmong +controlledvocabulary.language.Luri=Luri +controlledvocabulary.language.Lusengo=Lusengo +controlledvocabulary.language.Lushai=Lushai +controlledvocabulary.language.Lushootseed=Lushootseed +controlledvocabulary.language.Lusi=Lusi +controlledvocabulary.language.Lusitanian=Lusitanian +controlledvocabulary.language.Lutos=Lutos +controlledvocabulary.language.Luvale=Luvale +controlledvocabulary.language.Luwati=Luwati +controlledvocabulary.language.Luwo=Luwo +controlledvocabulary.language.Luxembourgish,_Letzeburgesch=Luxembourgish, Letzeburgesch +controlledvocabulary.language.Luyana=Luyana +controlledvocabulary.language.Luyia=Luyia +controlledvocabulary.language.Lwalu=Lwalu +controlledvocabulary.language.Lwel=Lwel +controlledvocabulary.language.Lycian=Lycian +controlledvocabulary.language.Lydian=Lydian +controlledvocabulary.language.Lyngngam=Lyngngam +controlledvocabulary.language.Ly�l�=Ly�l� +controlledvocabulary.language.L�adan=L�adan +controlledvocabulary.language.L��_L��_Bwamu=L�� L�� Bwamu +controlledvocabulary.language.L�=L� +controlledvocabulary.language.Ma_(Democratic_Republic_of_Congo)=Ma (Democratic Republic of Congo) +controlledvocabulary.language.Ma_(Papua_New_Guinea)=Ma (Papua New Guinea) +controlledvocabulary.language.Ma_Manda=Ma Manda +controlledvocabulary.language.Ma'anyan=Ma'anyan +controlledvocabulary.language.Ma'di=Ma'di +controlledvocabulary.language.Ma'ya=Ma'ya +controlledvocabulary.language.Maa=Maa +controlledvocabulary.language.Maaka=Maaka +controlledvocabulary.language.Maasina_Fulfulde=Maasina Fulfulde +controlledvocabulary.language.Maay=Maay +controlledvocabulary.language.Maba_(Chad)=Maba (Chad) +controlledvocabulary.language.Maba_(Indonesia)=Maba (Indonesia) +controlledvocabulary.language.Mabaale=Mabaale +controlledvocabulary.language.Mabaan=Mabaan +controlledvocabulary.language.Mabaka_Valley_Kalinga=Mabaka Valley Kalinga +controlledvocabulary.language.Mabire=Mabire +controlledvocabulary.language.Maca=Maca +controlledvocabulary.language.Macaguaje=Macaguaje +controlledvocabulary.language.Macagu�n=Macagu�n +controlledvocabulary.language.Macanese=Macanese +controlledvocabulary.language.Macedo-Romanian=Macedo-Romanian +controlledvocabulary.language.Macedonian=Macedonian +controlledvocabulary.language.Machame=Machame +controlledvocabulary.language.Machiguenga=Machiguenga +controlledvocabulary.language.Machinere=Machinere +controlledvocabulary.language.Machinga=Machinga +controlledvocabulary.language.Maco=Maco +controlledvocabulary.language.Macuna=Macuna +controlledvocabulary.language.Macushi=Macushi +controlledvocabulary.language.Mada_(Cameroon)=Mada (Cameroon) +controlledvocabulary.language.Mada_(Nigeria)=Mada (Nigeria) +controlledvocabulary.language.Madagascar_Sign_Language=Madagascar Sign Language +controlledvocabulary.language.Madak=Madak +controlledvocabulary.language.Madhi_Madhi=Madhi Madhi +controlledvocabulary.language.Madi=Madi +controlledvocabulary.language.Madurese=Madurese +controlledvocabulary.language.Mae=Mae +controlledvocabulary.language.Maek=Maek +controlledvocabulary.language.Maeng_Itneg=Maeng Itneg +controlledvocabulary.language.Mafa=Mafa +controlledvocabulary.language.Mafea=Mafea +controlledvocabulary.language.Mag-Indi_Ayta=Mag-Indi Ayta +controlledvocabulary.language.Mag-antsi_Ayta=Mag-antsi Ayta +controlledvocabulary.language.Magahi=Magahi +controlledvocabulary.language.Magbukun_Ayta=Magbukun Ayta +controlledvocabulary.language.Magdalena_Pe�asco_Mixtec=Magdalena Pe�asco Mixtec +controlledvocabulary.language.Magoma=Magoma +controlledvocabulary.language.Magori=Magori +controlledvocabulary.language.Maguindanaon=Maguindanaon +controlledvocabulary.language.Mag_(Madang_Province)=Mag? (Madang Province) +controlledvocabulary.language.Magyi=Mag?yi +controlledvocabulary.language.Mahali=Mahali +controlledvocabulary.language.Mahasu_Pahari=Mahasu Pahari +controlledvocabulary.language.Mahican=Mahican +controlledvocabulary.language.Mahongwe=Mahongwe +controlledvocabulary.language.Mahou=Mahou +controlledvocabulary.language.Mai_Brat=Mai Brat +controlledvocabulary.language.Maia=Maia +controlledvocabulary.language.Maiadomu=Maiadomu +controlledvocabulary.language.Maiani=Maiani +controlledvocabulary.language.Maii=Maii +controlledvocabulary.language.Mailu=Mailu +controlledvocabulary.language.Maindo=Maindo +controlledvocabulary.language.Mainfr�nkisch=Mainfr�nkisch +controlledvocabulary.language.Mainstream_Kenyah=Mainstream Kenyah +controlledvocabulary.language.Mairasi=Mairasi +controlledvocabulary.language.Maisin=Maisin +controlledvocabulary.language.Maithili=Maithili +controlledvocabulary.language.Maiwa_(Indonesia)=Maiwa (Indonesia) +controlledvocabulary.language.Maiwa_(Papua_New_Guinea)=Maiwa (Papua New Guinea) +controlledvocabulary.language.Maiwala=Maiwala +controlledvocabulary.language.Majang=Majang +controlledvocabulary.language.Majera=Majera +controlledvocabulary.language.Majhi=Majhi +controlledvocabulary.language.Majhwar=Majhwar +controlledvocabulary.language.Majukayang_Kalinga=Majukayang Kalinga +controlledvocabulary.language.Mak_(China)=Mak (China) +controlledvocabulary.language.Mak_(Nigeria)=Mak (Nigeria) +controlledvocabulary.language.Makaa=Makaa +controlledvocabulary.language.Makah=Makah +controlledvocabulary.language.Makalero=Makalero +controlledvocabulary.language.Makasae=Makasae +controlledvocabulary.language.Makasar=Makasar +controlledvocabulary.language.Makassar_Malay=Makassar Malay +controlledvocabulary.language.Makayam=Makayam +controlledvocabulary.language.Makhuwa=Makhuwa +controlledvocabulary.language.Makhuwa-Marrevone=Makhuwa-Marrevone +controlledvocabulary.language.Makhuwa-Meetto=Makhuwa-Meetto +controlledvocabulary.language.Makhuwa-Moniga=Makhuwa-Moniga +controlledvocabulary.language.Makhuwa-Saka=Makhuwa-Saka +controlledvocabulary.language.Makhuwa-Shirima=Makhuwa-Shirima +controlledvocabulary.language.Maklew=Maklew +controlledvocabulary.language.Makolkol=Makolkol +controlledvocabulary.language.Makonde=Makonde +controlledvocabulary.language.Maku'a=Maku'a +controlledvocabulary.language.Makuri_Naga=Makuri Naga +controlledvocabulary.language.Makur�p=Makur�p +controlledvocabulary.language.Makwe=Makwe +controlledvocabulary.language.Makyan_Naga=Makyan Naga +controlledvocabulary.language.Mal=Mal +controlledvocabulary.language.Mal_Paharia=Mal Paharia +controlledvocabulary.language.Mala_(Nigeria)=Mala (Nigeria) +controlledvocabulary.language.Mala_(Papua_New_Guinea)=Mala (Papua New Guinea) +controlledvocabulary.language.Mala_Malasar=Mala Malasar +controlledvocabulary.language.Malaccan_Creole_Malay=Malaccan Creole Malay +controlledvocabulary.language.Malaccan_Creole_Portuguese=Malaccan Creole Portuguese +controlledvocabulary.language.Malagasy=Malagasy +controlledvocabulary.language.Malak_Malak=Malak Malak +controlledvocabulary.language.Malalamai=Malalamai +controlledvocabulary.language.Malango=Malango +controlledvocabulary.language.Malankuravan=Malankuravan +controlledvocabulary.language.Malapandaram=Malapandaram +controlledvocabulary.language.Malaryan=Malaryan +controlledvocabulary.language.Malas=Malas +controlledvocabulary.language.Malasar=Malasar +controlledvocabulary.language.Malavedan=Malavedan +controlledvocabulary.language.Malawi_Lomwe=Malawi Lomwe +controlledvocabulary.language.Malawi_Sena=Malawi Sena +controlledvocabulary.language.Malawian_Sign_Language=Malawian Sign Language +controlledvocabulary.language.Malay=Malay +controlledvocabulary.language.Malay_(individual_language)=Malay (individual language) +controlledvocabulary.language.Malayalam=Malayalam +controlledvocabulary.language.Malayic_Dayak=Malayic Dayak +controlledvocabulary.language.Malaynon=Malaynon +controlledvocabulary.language.Malayo=Malayo +controlledvocabulary.language.Malaysian_Sign_Language=Malaysian Sign Language +controlledvocabulary.language.Malba_Birifor=Malba Birifor +controlledvocabulary.language.Maldivian,_Dhivehi,_Divehi=Maldivian, Dhivehi, Divehi +controlledvocabulary.language.Male_(Ethiopia)=Male (Ethiopia) +controlledvocabulary.language.Male_(Papua_New_Guinea)=Male (Papua New Guinea) +controlledvocabulary.language.Malecite-Passamaquoddy=Malecite-Passamaquoddy +controlledvocabulary.language.Maleng=Maleng +controlledvocabulary.language.Maleu-Kilenge=Maleu-Kilenge +controlledvocabulary.language.Malfaxal=Malfaxal +controlledvocabulary.language.Malgana=Malgana +controlledvocabulary.language.Malgbe=Malgbe +controlledvocabulary.language.Mali=Mali +controlledvocabulary.language.Malila=Malila +controlledvocabulary.language.Malimba=Malimba +controlledvocabulary.language.Malimpung=Malimpung +controlledvocabulary.language.Malinaltepec_Me'phaa=Malinaltepec Me'phaa +controlledvocabulary.language.Malo=Malo +controlledvocabulary.language.Malol=Malol +controlledvocabulary.language.Maltese=Maltese +controlledvocabulary.language.Maltese_Sign_Language=Maltese Sign Language +controlledvocabulary.language.Malua_Bay=Malua Bay +controlledvocabulary.language.Malvi=Malvi +controlledvocabulary.language.Malyangapa=Malyangapa +controlledvocabulary.language.Mal�ku_Ja�ka=Mal�ku Ja�ka +controlledvocabulary.language.Mam=Mam +controlledvocabulary.language.Mama=Mama +controlledvocabulary.language.Mamaa=Mamaa +controlledvocabulary.language.Mamaind�=Mamaind� +controlledvocabulary.language.Mamanwa=Mamanwa +controlledvocabulary.language.Mamara_Senoufo=Mamara Senoufo +controlledvocabulary.language.Mamasa=Mamasa +controlledvocabulary.language.Mambae=Mambae +controlledvocabulary.language.Mambai=Mambai +controlledvocabulary.language.Mamboru=Mamboru +controlledvocabulary.language.Mambwe-Lungu=Mambwe-Lungu +controlledvocabulary.language.Mampruli=Mampruli +controlledvocabulary.language.Mamuju=Mamuju +controlledvocabulary.language.Mamulique=Mamulique +controlledvocabulary.language.Mamusi=Mamusi +controlledvocabulary.language.Mamvu=Mamvu +controlledvocabulary.language.Man_Met=Man Met +controlledvocabulary.language.Manado_Malay=Manado Malay +controlledvocabulary.language.Manam=Manam +controlledvocabulary.language.Manambu=Manambu +controlledvocabulary.language.Manangba=Manangba +controlledvocabulary.language.Manangkari=Manangkari +controlledvocabulary.language.Manchu=Manchu +controlledvocabulary.language.Manda_(Australia)=Manda (Australia) +controlledvocabulary.language.Manda_(India)=Manda (India) +controlledvocabulary.language.Manda_(Tanzania)=Manda (Tanzania) +controlledvocabulary.language.Mandahuaca=Mandahuaca +controlledvocabulary.language.Mandaic=Mandaic +controlledvocabulary.language.Mandan=Mandan +controlledvocabulary.language.Mandandanyi=Mandandanyi +controlledvocabulary.language.Mandar=Mandar +controlledvocabulary.language.Mandara=Mandara +controlledvocabulary.language.Mandari=Mandari +controlledvocabulary.language.Mandarin_Chinese=Mandarin Chinese +controlledvocabulary.language.Mandaya=Mandaya +controlledvocabulary.language.Mandeali=Mandeali +controlledvocabulary.language.Mander=Mander +controlledvocabulary.language.Mandingo=Mandingo +controlledvocabulary.language.Mandinka=Mandinka +controlledvocabulary.language.Mandjak=Mandjak +controlledvocabulary.language.Mandobo_Atas=Mandobo Atas +controlledvocabulary.language.Mandobo_Bawah=Mandobo Bawah +controlledvocabulary.language.Manem=Manem +controlledvocabulary.language.Mang=Mang +controlledvocabulary.language.Manga_Kanuri=Manga Kanuri +controlledvocabulary.language.Mangala=Mangala +controlledvocabulary.language.Mangareva=Mangareva +controlledvocabulary.language.Mangarrayi=Mangarrayi +controlledvocabulary.language.Mangas=Mangas +controlledvocabulary.language.Mangayat=Mangayat +controlledvocabulary.language.Mangbetu=Mangbetu +controlledvocabulary.language.Mangbutu=Mangbutu +controlledvocabulary.language.Mangerr=Mangerr +controlledvocabulary.language.Mangga_Buang=Mangga Buang +controlledvocabulary.language.Manggarai=Manggarai +controlledvocabulary.language.Mango=Mango +controlledvocabulary.language.Mangole=Mangole +controlledvocabulary.language.Mangseng=Mangseng +controlledvocabulary.language.Mangue=Mangue +controlledvocabulary.language.Manichaean_Middle_Persian=Manichaean Middle Persian +controlledvocabulary.language.Manide=Manide +controlledvocabulary.language.Manikion=Manikion +controlledvocabulary.language.Manipa=Manipa +controlledvocabulary.language.Manipuri=Manipuri +controlledvocabulary.language.Mankanya=Mankanya +controlledvocabulary.language.Mankiyali=Mankiyali +controlledvocabulary.language.Manna-Dora=Manna-Dora +controlledvocabulary.language.Mannan=Mannan +controlledvocabulary.language.Mano=Mano +controlledvocabulary.language.Manombai=Manombai +controlledvocabulary.language.Mansaka=Mansaka +controlledvocabulary.language.Mansi=Mansi +controlledvocabulary.language.Mansoanka=Mansoanka +controlledvocabulary.language.Manta=Manta +controlledvocabulary.language.Mantsi=Mantsi +controlledvocabulary.language.Manumanaw_Karen=Manumanaw Karen +controlledvocabulary.language.Manx=Manx +controlledvocabulary.language.Manya=Manya +controlledvocabulary.language.Manyawa=Manyawa +controlledvocabulary.language.Manyika=Manyika +controlledvocabulary.language.Manza=Manza +controlledvocabulary.language.Mao_Naga=Mao Naga +controlledvocabulary.language.Maonan=Maonan +controlledvocabulary.language.Maore_Comorian=Maore Comorian +controlledvocabulary.language.Mape=Mape +controlledvocabulary.language.Mapena=Mapena +controlledvocabulary.language.Mapia=Mapia +controlledvocabulary.language.Mapidian=Mapidian +controlledvocabulary.language.Mapos_Buang=Mapos Buang +controlledvocabulary.language.Mapoyo=Mapoyo +controlledvocabulary.language.Mapudungun=Mapudungun +controlledvocabulary.language.Mapun=Mapun +controlledvocabulary.language.Maquiritari=Maquiritari +controlledvocabulary.language.Mara_Chin=Mara Chin +controlledvocabulary.language.Marachi=Marachi +controlledvocabulary.language.Maraghei=Maraghei +controlledvocabulary.language.Maragus=Maragus +controlledvocabulary.language.Maram_Naga=Maram Naga +controlledvocabulary.language.Marama=Marama +controlledvocabulary.language.Maranao=Maranao +controlledvocabulary.language.Maranunggu=Maranunggu +controlledvocabulary.language.Mararit=Mararit +controlledvocabulary.language.Marathi_(Marh)=Marathi (Mar??h?) +controlledvocabulary.language.Marau=Marau +controlledvocabulary.language.Marba=Marba +controlledvocabulary.language.Mardin_Sign_Language=Mardin Sign Language +controlledvocabulary.language.Maremgi=Maremgi +controlledvocabulary.language.Marenje=Marenje +controlledvocabulary.language.Marfa=Marfa +controlledvocabulary.language.Margany=Margany +controlledvocabulary.language.Marghi_Central=Marghi Central +controlledvocabulary.language.Marghi_South=Marghi South +controlledvocabulary.language.Margos-Yarowilca-Lauricocha_Quechua=Margos-Yarowilca-Lauricocha Quechua +controlledvocabulary.language.Margu=Margu +controlledvocabulary.language.Mari_(East_Sepik_Province)=Mari (East Sepik Province) +controlledvocabulary.language.Mari_(Madang_Province)=Mari (Madang Province) +controlledvocabulary.language.Mari_(Russia)=Mari (Russia) +controlledvocabulary.language.Maria_(India)=Maria (India) +controlledvocabulary.language.Maria_(Papua_New_Guinea)=Maria (Papua New Guinea) +controlledvocabulary.language.Maricopa=Maricopa +controlledvocabulary.language.Maridan=Maridan +controlledvocabulary.language.Maridjabin=Maridjabin +controlledvocabulary.language.Marik=Marik +controlledvocabulary.language.Marimanindji=Marimanindji +controlledvocabulary.language.Marind=Marind +controlledvocabulary.language.Maring=Maring +controlledvocabulary.language.Maring_Naga=Maring Naga +controlledvocabulary.language.Maringarr=Maringarr +controlledvocabulary.language.Marino=Marino +controlledvocabulary.language.Mariri=Mariri +controlledvocabulary.language.Maritime_Sign_Language=Maritime Sign Language +controlledvocabulary.language.Maritsau�=Maritsau� +controlledvocabulary.language.Mariyedi=Mariyedi +controlledvocabulary.language.Marka=Marka +controlledvocabulary.language.Markweeta=Markweeta +controlledvocabulary.language.Marma=Marma +controlledvocabulary.language.Marovo=Marovo +controlledvocabulary.language.Marra=Marra +controlledvocabulary.language.Marriammu=Marriammu +controlledvocabulary.language.Marrithiyel=Marrithiyel +controlledvocabulary.language.Marrucinian=Marrucinian +controlledvocabulary.language.Marshallese=Marshallese +controlledvocabulary.language.Marsian=Marsian +controlledvocabulary.language.Martha's_Vineyard_Sign_Language=Martha's Vineyard Sign Language +controlledvocabulary.language.Marti_Ke=Marti Ke +controlledvocabulary.language.Martu_Wangka=Martu Wangka +controlledvocabulary.language.Martuyhunira=Martuyhunira +controlledvocabulary.language.Maru=Maru +controlledvocabulary.language.Marwari=Marwari +controlledvocabulary.language.Marwari_(India)=Marwari (India) +controlledvocabulary.language.Marwari_(Pakistan)=Marwari (Pakistan) +controlledvocabulary.language.Mar�bo=Mar�bo +controlledvocabulary.language.Masaaba=Masaaba +controlledvocabulary.language.Masadiit_Itneg=Masadiit Itneg +controlledvocabulary.language.Masai=Masai +controlledvocabulary.language.Masalit=Masalit +controlledvocabulary.language.Masana=Masana +controlledvocabulary.language.Masbatenyo=Masbatenyo +controlledvocabulary.language.Mashco_Piro=Mashco Piro +controlledvocabulary.language.Mashi_(Nigeria)=Mashi (Nigeria) +controlledvocabulary.language.Mashi_(Zambia)=Mashi (Zambia) +controlledvocabulary.language.Masikoro_Malagasy=Masikoro Malagasy +controlledvocabulary.language.Masimasi=Masimasi +controlledvocabulary.language.Masiwang=Masiwang +controlledvocabulary.language.Maskelynes=Maskelynes +controlledvocabulary.language.Maslam=Maslam +controlledvocabulary.language.Masmaje=Masmaje +controlledvocabulary.language.Massalat=Massalat +controlledvocabulary.language.Massep=Massep +controlledvocabulary.language.Matagalpa=Matagalpa +controlledvocabulary.language.Matal=Matal +controlledvocabulary.language.Matambwe=Matambwe +controlledvocabulary.language.Matbat=Matbat +controlledvocabulary.language.Matengo=Matengo +controlledvocabulary.language.Matepi=Matepi +controlledvocabulary.language.Matigsalug_Manobo=Matigsalug Manobo +controlledvocabulary.language.Matipuhy=Matipuhy +controlledvocabulary.language.Matngala=Matngala +controlledvocabulary.language.Mato=Mato +controlledvocabulary.language.Mato_Grosso_Ar�ra=Mato Grosso Ar�ra +controlledvocabulary.language.Mator=Mator +controlledvocabulary.language.Mats�s=Mats�s +controlledvocabulary.language.Mattole=Mattole +controlledvocabulary.language.Matu_Chin=Matu Chin +controlledvocabulary.language.Matukar=Matukar +controlledvocabulary.language.Matumbi=Matumbi +controlledvocabulary.language.Matya_Samo=Matya Samo +controlledvocabulary.language.Mat�s=Mat�s +controlledvocabulary.language.Maung=Maung +controlledvocabulary.language.Mauritian_Sign_Language=Mauritian Sign Language +controlledvocabulary.language.Mauwake=Mauwake +controlledvocabulary.language.Mawa_(Chad)=Mawa (Chad) +controlledvocabulary.language.Mawa_(Nigeria)=Mawa (Nigeria) +controlledvocabulary.language.Mawak=Mawak +controlledvocabulary.language.Mawan=Mawan +controlledvocabulary.language.Mawayana=Mawayana +controlledvocabulary.language.Mawchi=Mawchi +controlledvocabulary.language.Mawes=Mawes +controlledvocabulary.language.Maxakal�=Maxakal� +controlledvocabulary.language.Maxi_Gbe=Maxi Gbe +controlledvocabulary.language.Maya_Samo=Maya Samo +controlledvocabulary.language.Mayaguduna=Mayaguduna +controlledvocabulary.language.Mayangna=Mayangna +controlledvocabulary.language.Mayawali=Mayawali +controlledvocabulary.language.Mayeka=Mayeka +controlledvocabulary.language.Mayi-Kulan=Mayi-Kulan +controlledvocabulary.language.Mayi-Thakurti=Mayi-Thakurti +controlledvocabulary.language.Mayi-Yapi=Mayi-Yapi +controlledvocabulary.language.Mayo=Mayo +controlledvocabulary.language.Mayogo=Mayogo +controlledvocabulary.language.Mayoyao_Ifugao=Mayoyao Ifugao +controlledvocabulary.language.Mazagway=Mazagway +controlledvocabulary.language.Mazaltepec_Zapotec=Mazaltepec Zapotec +controlledvocabulary.language.Mazanderani=Mazanderani +controlledvocabulary.language.Mazatl�n_Mazatec=Mazatl�n Mazatec +controlledvocabulary.language.Mazatl�n_Mixe=Mazatl�n Mixe +controlledvocabulary.language.Mba=Mba +controlledvocabulary.language.Mbala=Mbala +controlledvocabulary.language.Mbalanhu=Mbalanhu +controlledvocabulary.language.Mbandja=Mbandja +controlledvocabulary.language.Mbangala=Mbangala +controlledvocabulary.language.Mbangi=Mbangi +controlledvocabulary.language.Mbangwe=Mbangwe +controlledvocabulary.language.Mbara_(Australia)=Mbara (Australia) +controlledvocabulary.language.Mbara_(Chad)=Mbara (Chad) +controlledvocabulary.language.Mbariman-Gudhinma=Mbariman-Gudhinma +controlledvocabulary.language.Mbati=Mbati +controlledvocabulary.language.Mbato=Mbato +controlledvocabulary.language.Mbay=Mbay +controlledvocabulary.language.Mbe=Mbe +controlledvocabulary.language.Mbe'=Mbe' +controlledvocabulary.language.Mbelime=Mbelime +controlledvocabulary.language.Mbere=Mbere +controlledvocabulary.language.Mbesa=Mbesa +controlledvocabulary.language.Mbessa=Mbessa +controlledvocabulary.language.Mbo_(Cameroon)=Mbo (Cameroon) +controlledvocabulary.language.Mbo_(Democratic_Republic_of_Congo)=Mbo (Democratic Republic of Congo) +controlledvocabulary.language.Mboi=Mboi +controlledvocabulary.language.Mboko=Mboko +controlledvocabulary.language.Mbole=Mbole +controlledvocabulary.language.Mbonga=Mbonga +controlledvocabulary.language.Mbongno=Mbongno +controlledvocabulary.language.Mbosi=Mbosi +controlledvocabulary.language.Mbowe=Mbowe +controlledvocabulary.language.Mbre=Mbre +controlledvocabulary.language.Mbudum=Mbudum +controlledvocabulary.language.Mbugu=Mbugu +controlledvocabulary.language.Mbugwe=Mbugwe +controlledvocabulary.language.Mbuk=Mbuk +controlledvocabulary.language.Mbuko=Mbuko +controlledvocabulary.language.Mbukushu=Mbukushu +controlledvocabulary.language.Mbula=Mbula +controlledvocabulary.language.Mbula-Bwazza=Mbula-Bwazza +controlledvocabulary.language.Mbule=Mbule +controlledvocabulary.language.Mbulungish=Mbulungish +controlledvocabulary.language.Mbum=Mbum +controlledvocabulary.language.Mbunda=Mbunda +controlledvocabulary.language.Mbunga=Mbunga +controlledvocabulary.language.Mburku=Mburku +controlledvocabulary.language.Mbwela=Mbwela +controlledvocabulary.language.Mby�_Guaran�=Mby� Guaran� +controlledvocabulary.language.Me'en=Me'en +controlledvocabulary.language.Medebur=Medebur +controlledvocabulary.language.Medefaidrin=Medefaidrin +controlledvocabulary.language.Media_Lengua=Media Lengua +controlledvocabulary.language.Median=Median +controlledvocabulary.language.Mednyj_Aleut=Mednyj Aleut +controlledvocabulary.language.Medumba=Medumba +controlledvocabulary.language.Mefele=Mefele +controlledvocabulary.language.Megam=Megam +controlledvocabulary.language.Megleno_Romanian=Megleno Romanian +controlledvocabulary.language.Mehek=Mehek +controlledvocabulary.language.Mehin�ku=Mehin�ku +controlledvocabulary.language.Mehri=Mehri +controlledvocabulary.language.Mekeo=Mekeo +controlledvocabulary.language.Mekmek=Mekmek +controlledvocabulary.language.Mekwei=Mekwei +controlledvocabulary.language.Mel-Khaonh=Mel-Khaonh +controlledvocabulary.language.Mele-Fila=Mele-Fila +controlledvocabulary.language.Melo=Melo +controlledvocabulary.language.Melpa=Melpa +controlledvocabulary.language.Memoni=Memoni +controlledvocabulary.language.Mendalam_Kayan=Mendalam Kayan +controlledvocabulary.language.Mendankwe-Nkwen=Mendankwe-Nkwen +controlledvocabulary.language.Mende_(Papua_New_Guinea)=Mende (Papua New Guinea) +controlledvocabulary.language.Mende_(Sierra_Leone)=Mende (Sierra Leone) +controlledvocabulary.language.Mengaka=Mengaka +controlledvocabulary.language.Mengen=Mengen +controlledvocabulary.language.Mengisa=Mengisa +controlledvocabulary.language.Menka=Menka +controlledvocabulary.language.Menominee=Menominee +controlledvocabulary.language.Mentawai=Mentawai +controlledvocabulary.language.Menya=Menya +controlledvocabulary.language.Meoswar=Meoswar +controlledvocabulary.language.Mer=Mer +controlledvocabulary.language.Meramera=Meramera +controlledvocabulary.language.Merei=Merei +controlledvocabulary.language.Merey=Merey +controlledvocabulary.language.Meriam_Mir=Meriam Mir +controlledvocabulary.language.Merlav=Merlav +controlledvocabulary.language.Meroitic=Meroitic +controlledvocabulary.language.Meru=Meru +controlledvocabulary.language.Merwari=Merwari +controlledvocabulary.language.Mesaka=Mesaka +controlledvocabulary.language.Mescalero-Chiricahua_Apache=Mescalero-Chiricahua Apache +controlledvocabulary.language.Mese=Mese +controlledvocabulary.language.Meskwaki=Meskwaki +controlledvocabulary.language.Mesme=Mesme +controlledvocabulary.language.Mesmes=Mesmes +controlledvocabulary.language.Mesopotamian_Arabic=Mesopotamian Arabic +controlledvocabulary.language.Mesqan=Mesqan +controlledvocabulary.language.Messapic=Messapic +controlledvocabulary.language.Meta'=Meta' +controlledvocabulary.language.Metlat�noc_Mixtec=Metlat�noc Mixtec +controlledvocabulary.language.Mewari=Mewari +controlledvocabulary.language.Mewati=Mewati +controlledvocabulary.language.Mexican_Sign_Language=Mexican Sign Language +controlledvocabulary.language.Meyah=Meyah +controlledvocabulary.language.Mezontla_Popoloca=Mezontla Popoloca +controlledvocabulary.language.Mezquital_Otomi=Mezquital Otomi +controlledvocabulary.language.Mfinu=Mfinu +controlledvocabulary.language.Mfumte=Mfumte +controlledvocabulary.language.Mgbolizhia=Mgbolizhia +controlledvocabulary.language.Mi'kmaq=Mi'kmaq +controlledvocabulary.language.Miahuatl�n_Zapotec=Miahuatl�n Zapotec +controlledvocabulary.language.Miami=Miami +controlledvocabulary.language.Mian=Mian +controlledvocabulary.language.Miani=Miani +controlledvocabulary.language.Michif=Michif +controlledvocabulary.language.Michigamea=Michigamea +controlledvocabulary.language.Michoac�n_Mazahua=Michoac�n Mazahua +controlledvocabulary.language.Michoac�n_Nahuatl=Michoac�n Nahuatl +controlledvocabulary.language.Mid_Grand_Valley_Dani=Mid Grand Valley Dani +controlledvocabulary.language.Mid-Southern_Banda=Mid-Southern Banda +controlledvocabulary.language.Middle_Armenian=Middle Armenian +controlledvocabulary.language.Middle_Breton=Middle Breton +controlledvocabulary.language.Middle_Cornish=Middle Cornish +controlledvocabulary.language.Middle_Dutch_(ca._1050-1350)=Middle Dutch (ca. 1050-1350) +controlledvocabulary.language.Middle_English_(1100-1500)=Middle English (1100-1500) +controlledvocabulary.language.Middle_French_(ca._1400-1600)=Middle French (ca. 1400-1600) +controlledvocabulary.language.Middle_High_German_(ca._1050-1500)=Middle High German (ca. 1050-1500) +controlledvocabulary.language.Middle_Hittite=Middle Hittite +controlledvocabulary.language.Middle_Irish_(900-1200)=Middle Irish (900-1200) +controlledvocabulary.language.Middle_Khmer_(1400_to_1850_CE)=Middle Khmer (1400 to 1850 CE) +controlledvocabulary.language.Middle_Korean_(10th-16th_cent.)=Middle Korean (10th-16th cent.) +controlledvocabulary.language.Middle_Low_German=Middle Low German +controlledvocabulary.language.Middle_Mongolian=Middle Mongolian +controlledvocabulary.language.Middle_Newar=Middle Newar +controlledvocabulary.language.Middle_Watut=Middle Watut +controlledvocabulary.language.Middle_Welsh=Middle Welsh +controlledvocabulary.language.Midob=Midob +controlledvocabulary.language.Migaama=Migaama +controlledvocabulary.language.Migabac=Migabac +controlledvocabulary.language.Migum=Migum +controlledvocabulary.language.Miju-Mishmi=Miju-Mishmi +controlledvocabulary.language.Mikasuki=Mikasuki +controlledvocabulary.language.Mili=Mili +controlledvocabulary.language.Miltu=Miltu +controlledvocabulary.language.Miluk=Miluk +controlledvocabulary.language.Milyan=Milyan +controlledvocabulary.language.Min_Bei_Chinese=Min Bei Chinese +controlledvocabulary.language.Min_Dong_Chinese=Min Dong Chinese +controlledvocabulary.language.Min_Nan_Chinese=Min Nan Chinese +controlledvocabulary.language.Min_Zhong_Chinese=Min Zhong Chinese +controlledvocabulary.language.Mina_(Cameroon)=Mina (Cameroon) +controlledvocabulary.language.Minaean=Minaean +controlledvocabulary.language.Minang=Minang +controlledvocabulary.language.Minangkabau=Minangkabau +controlledvocabulary.language.Minanibai=Minanibai +controlledvocabulary.language.Minaveha=Minaveha +controlledvocabulary.language.Minderico=Minderico +controlledvocabulary.language.Mindiri=Mindiri +controlledvocabulary.language.Mingang_Doso=Mingang Doso +controlledvocabulary.language.Mingrelian=Mingrelian +controlledvocabulary.language.Minica_Huitoto=Minica Huitoto +controlledvocabulary.language.Minidien=Minidien +controlledvocabulary.language.Minjungbal=Minjungbal +controlledvocabulary.language.Minkin=Minkin +controlledvocabulary.language.Minoan=Minoan +controlledvocabulary.language.Minokok=Minokok +controlledvocabulary.language.Minriq=Minriq +controlledvocabulary.language.Mintil=Mintil +controlledvocabulary.language.Minz_Zhuang=Minz Zhuang +controlledvocabulary.language.Miqie=Miqie +controlledvocabulary.language.Mirandese=Mirandese +controlledvocabulary.language.Miraya_Bikol=Miraya Bikol +controlledvocabulary.language.Mirgan=Mirgan +controlledvocabulary.language.Miriti=Miriti +controlledvocabulary.language.Miriwoong=Miriwoong +controlledvocabulary.language.Miriwoong_Sign_Language=Miriwoong Sign Language +controlledvocabulary.language.Mirning=Mirning +controlledvocabulary.language.Miship=Miship +controlledvocabulary.language.Misima-Panaeati=Misima-Panaeati +controlledvocabulary.language.Mising=Mising +controlledvocabulary.language.Mitla_Zapotec=Mitla Zapotec +controlledvocabulary.language.Mitlatongo_Mixtec=Mitlatongo Mixtec +controlledvocabulary.language.Mittu=Mittu +controlledvocabulary.language.Mituku=Mituku +controlledvocabulary.language.Miu=Miu +controlledvocabulary.language.Miwa=Miwa +controlledvocabulary.language.Mixed_Great_Andamanese=Mixed Great Andamanese +controlledvocabulary.language.Mixtepec_Mixtec=Mixtepec Mixtec +controlledvocabulary.language.Mixtepec_Zapotec=Mixtepec Zapotec +controlledvocabulary.language.Miya=Miya +controlledvocabulary.language.Miyako=Miyako +controlledvocabulary.language.Miyakubo_Sign_Language=Miyakubo Sign Language +controlledvocabulary.language.Miyobe=Miyobe +controlledvocabulary.language.Mlabri=Mlabri +controlledvocabulary.language.Mlahs�=Mlahs� +controlledvocabulary.language.Mlap=Mlap +controlledvocabulary.language.Mlomp=Mlomp +controlledvocabulary.language.Mmaala=Mmaala +controlledvocabulary.language.Mmen=Mmen +controlledvocabulary.language.Mo'da=Mo'da +controlledvocabulary.language.Moabite=Moabite +controlledvocabulary.language.Moba=Moba +controlledvocabulary.language.Mobilian=Mobilian +controlledvocabulary.language.Mobumrin_Aizi=Mobumrin Aizi +controlledvocabulary.language.Mobwa_Karen=Mobwa Karen +controlledvocabulary.language.Mochi=Mochi +controlledvocabulary.language.Mochica=Mochica +controlledvocabulary.language.Mocho=Mocho +controlledvocabulary.language.Mocov�=Mocov� +controlledvocabulary.language.Modang=Modang +controlledvocabulary.language.Modole=Modole +controlledvocabulary.language.Moere=Moere +controlledvocabulary.language.Mofu-Gudur=Mofu-Gudur +controlledvocabulary.language.Mogholi=Mogholi +controlledvocabulary.language.Mogofin=Mogofin +controlledvocabulary.language.Mogum=Mogum +controlledvocabulary.language.Mohave=Mohave +controlledvocabulary.language.Mohawk=Mohawk +controlledvocabulary.language.Mohegan-Pequot=Mohegan-Pequot +controlledvocabulary.language.Moi_(Congo)=Moi (Congo) +controlledvocabulary.language.Moi_(Indonesia)=Moi (Indonesia) +controlledvocabulary.language.Moikodi=Moikodi +controlledvocabulary.language.Moingi=Moingi +controlledvocabulary.language.Moji=Moji +controlledvocabulary.language.Mok=Mok +controlledvocabulary.language.Mokati=Mokati +controlledvocabulary.language.Moken=Moken +controlledvocabulary.language.Mokerang=Mokerang +controlledvocabulary.language.Mokilese=Mokilese +controlledvocabulary.language.Moklen=Moklen +controlledvocabulary.language.Mokole=Mokole +controlledvocabulary.language.Mokpwe=Mokpwe +controlledvocabulary.language.Moksela=Moksela +controlledvocabulary.language.Moksha=Moksha +controlledvocabulary.language.Molale=Molale +controlledvocabulary.language.Molbog=Molbog +controlledvocabulary.language.Moldova_Sign_Language=Moldova Sign Language +controlledvocabulary.language.Molengue=Molengue +controlledvocabulary.language.Molima=Molima +controlledvocabulary.language.Molmo_One=Molmo One +controlledvocabulary.language.Molo=Molo +controlledvocabulary.language.Molof=Molof +controlledvocabulary.language.Moloko=Moloko +controlledvocabulary.language.Mom_Jango=Mom Jango +controlledvocabulary.language.Moma=Moma +controlledvocabulary.language.Momare=Momare +controlledvocabulary.language.Mombo_Dogon=Mombo Dogon +controlledvocabulary.language.Mombum=Mombum +controlledvocabulary.language.Momina=Momina +controlledvocabulary.language.Momuna=Momuna +controlledvocabulary.language.Mon=Mon +controlledvocabulary.language.Monastic_Sign_Language=Monastic Sign Language +controlledvocabulary.language.Mondropolon=Mondropolon +controlledvocabulary.language.Mond�=Mond� +controlledvocabulary.language.Mongo=Mongo +controlledvocabulary.language.Mongol=Mongol +controlledvocabulary.language.Mongolia_Buriat=Mongolia Buriat +controlledvocabulary.language.Mongolian=Mongolian +controlledvocabulary.language.Mongolian_Sign_Language=Mongolian Sign Language +controlledvocabulary.language.Mongondow=Mongondow +controlledvocabulary.language.Moni=Moni +controlledvocabulary.language.Mono_(Cameroon)=Mono (Cameroon) +controlledvocabulary.language.Mono_(Democratic_Republic_of_Congo)=Mono (Democratic Republic of Congo) +controlledvocabulary.language.Mono_(Solomon_Islands)=Mono (Solomon Islands) +controlledvocabulary.language.Mono_(USA)=Mono (USA) +controlledvocabulary.language.Monom=Monom +controlledvocabulary.language.Monsang_Naga=Monsang Naga +controlledvocabulary.language.Montenegrin=Montenegrin +controlledvocabulary.language.Montol=Montol +controlledvocabulary.language.Monumbo=Monumbo +controlledvocabulary.language.Monzombo=Monzombo +controlledvocabulary.language.Moo=Moo +controlledvocabulary.language.Moose_Cree=Moose Cree +controlledvocabulary.language.Mop�n_Maya=Mop�n Maya +controlledvocabulary.language.Mor_(Bomberai_Peninsula)=Mor (Bomberai Peninsula) +controlledvocabulary.language.Mor_(Mor_Islands)=Mor (Mor Islands) +controlledvocabulary.language.Moraid=Moraid +controlledvocabulary.language.Morawa=Morawa +controlledvocabulary.language.Morelos_Nahuatl=Morelos Nahuatl +controlledvocabulary.language.Morerebi=Morerebi +controlledvocabulary.language.Moresada=Moresada +controlledvocabulary.language.Mori_Atas=Mori Atas +controlledvocabulary.language.Mori_Bawah=Mori Bawah +controlledvocabulary.language.Morigi=Morigi +controlledvocabulary.language.Moriori=Moriori +controlledvocabulary.language.Morisyen=Morisyen +controlledvocabulary.language.Moro=Moro +controlledvocabulary.language.Moroccan_Arabic=Moroccan Arabic +controlledvocabulary.language.Moroccan_Sign_Language=Moroccan Sign Language +controlledvocabulary.language.Morokodo=Morokodo +controlledvocabulary.language.Morom=Morom +controlledvocabulary.language.Moronene=Moronene +controlledvocabulary.language.Morori=Morori +controlledvocabulary.language.Morouas=Morouas +controlledvocabulary.language.Morrobalama=Morrobalama +controlledvocabulary.language.Mortlockese=Mortlockese +controlledvocabulary.language.Moru=Moru +controlledvocabulary.language.Mosimo=Mosimo +controlledvocabulary.language.Moskona=Moskona +controlledvocabulary.language.Mossi=Mossi +controlledvocabulary.language.Mota=Mota +controlledvocabulary.language.Motlav=Motlav +controlledvocabulary.language.Motu=Motu +controlledvocabulary.language.Mouk-Aria=Mouk-Aria +controlledvocabulary.language.Moundadan_Chetty=Moundadan Chetty +controlledvocabulary.language.Mountain_Koiali=Mountain Koiali +controlledvocabulary.language.Mouwase=Mouwase +controlledvocabulary.language.Movima=Movima +controlledvocabulary.language.Moyadan_Itneg=Moyadan Itneg +controlledvocabulary.language.Moyon_Naga=Moyon Naga +controlledvocabulary.language.Mozambican_Sign_Language=Mozambican Sign Language +controlledvocabulary.language.Mozarabic=Mozarabic +controlledvocabulary.language.Mpade=Mpade +controlledvocabulary.language.Mpalitjanh=Mpalitjanh +controlledvocabulary.language.Mpi=Mpi +controlledvocabulary.language.Mpiemo=Mpiemo +controlledvocabulary.language.Mpinda=Mpinda +controlledvocabulary.language.Mpoto=Mpoto +controlledvocabulary.language.Mpotovoro=Mpotovoro +controlledvocabulary.language.Mpumpong=Mpumpong +controlledvocabulary.language.Mpuono=Mpuono +controlledvocabulary.language.Mpur=Mpur +controlledvocabulary.language.Mro-Khimi_Chin=Mro-Khimi Chin +controlledvocabulary.language.Mru=Mru +controlledvocabulary.language.Mser=Mser +controlledvocabulary.language.Mt._Iraya_Agta=Mt. Iraya Agta +controlledvocabulary.language.Mt._Iriga_Agta=Mt. Iriga Agta +controlledvocabulary.language.Muak_Sa-aak=Muak Sa-aak +controlledvocabulary.language.Mualang=Mualang +controlledvocabulary.language.Mubami=Mubami +controlledvocabulary.language.Mubi=Mubi +controlledvocabulary.language.Muda=Muda +controlledvocabulary.language.Mudburra=Mudburra +controlledvocabulary.language.Mudhili_Gadaba=Mudhili Gadaba +controlledvocabulary.language.Mudu_Koraga=Mudu Koraga +controlledvocabulary.language.Muduga=Muduga +controlledvocabulary.language.Mufian=Mufian +controlledvocabulary.language.Mugom=Mugom +controlledvocabulary.language.Muinane=Muinane +controlledvocabulary.language.Mukha-Dora=Mukha-Dora +controlledvocabulary.language.Mukulu=Mukulu +controlledvocabulary.language.Mulaha=Mulaha +controlledvocabulary.language.Mulam=Mulam +controlledvocabulary.language.Mulao=Mulao +controlledvocabulary.language.Mulgi=Mulgi +controlledvocabulary.language.Mullu_Kurumba=Mullu Kurumba +controlledvocabulary.language.Multiple_languages=Multiple languages +controlledvocabulary.language.Muluridyi=Muluridyi +controlledvocabulary.language.Mum=Mum +controlledvocabulary.language.Mumuye=Mumuye +controlledvocabulary.language.Muna=Muna +controlledvocabulary.language.Munda=Munda +controlledvocabulary.language.Mundabli=Mundabli +controlledvocabulary.language.Mundang=Mundang +controlledvocabulary.language.Mundani=Mundani +controlledvocabulary.language.Mundari=Mundari +controlledvocabulary.language.Mundat=Mundat +controlledvocabulary.language.Munduruk�=Munduruk� +controlledvocabulary.language.Mungaka=Mungaka +controlledvocabulary.language.Munggui=Munggui +controlledvocabulary.language.Mungkip=Mungkip +controlledvocabulary.language.Muniche=Muniche +controlledvocabulary.language.Munit=Munit +controlledvocabulary.language.Munji=Munji +controlledvocabulary.language.Munsee=Munsee +controlledvocabulary.language.Muong=Muong +controlledvocabulary.language.Mur_Pano=Mur Pano +controlledvocabulary.language.Muratayak=Muratayak +controlledvocabulary.language.Murik_(Malaysia)=Murik (Malaysia) +controlledvocabulary.language.Murik_(Papua_New_Guinea)=Murik (Papua New Guinea) +controlledvocabulary.language.Murkim=Murkim +controlledvocabulary.language.Murle=Murle +controlledvocabulary.language.Murrinh-Patha=Murrinh-Patha +controlledvocabulary.language.Mursi=Mursi +controlledvocabulary.language.Murui_Huitoto=Murui Huitoto +controlledvocabulary.language.Murupi=Murupi +controlledvocabulary.language.Muruwari=Muruwari +controlledvocabulary.language.Musak=Musak +controlledvocabulary.language.Musar=Musar +controlledvocabulary.language.Musasa=Musasa +controlledvocabulary.language.Musey=Musey +controlledvocabulary.language.Musgu=Musgu +controlledvocabulary.language.Mushungulu=Mushungulu +controlledvocabulary.language.Musi=Musi +controlledvocabulary.language.Muskum=Muskum +controlledvocabulary.language.Muslim_Tat=Muslim Tat +controlledvocabulary.language.Musom=Musom +controlledvocabulary.language.Mussau-Emira=Mussau-Emira +controlledvocabulary.language.Muthuvan=Muthuvan +controlledvocabulary.language.Mutu=Mutu +controlledvocabulary.language.Muyang=Muyang +controlledvocabulary.language.Muyuw=Muyuw +controlledvocabulary.language.Muzi=Muzi +controlledvocabulary.language.Mvanip=Mvanip +controlledvocabulary.language.Mvuba=Mvuba +controlledvocabulary.language.Mwaghavul=Mwaghavul +controlledvocabulary.language.Mwali_Comorian=Mwali Comorian +controlledvocabulary.language.Mwan=Mwan +controlledvocabulary.language.Mwani=Mwani +controlledvocabulary.language.Mwatebu=Mwatebu +controlledvocabulary.language.Mwera_(Chimwera)=Mwera (Chimwera) +controlledvocabulary.language.Mwera_(Nyasa)=Mwera (Nyasa) +controlledvocabulary.language.Mwimbi-Muthambi=Mwimbi-Muthambi +controlledvocabulary.language.Myanmar_Sign_Language=Myanmar Sign Language +controlledvocabulary.language.Mycenaean_Greek=Mycenaean Greek +controlledvocabulary.language.Myene=Myene +controlledvocabulary.language.Mysian=Mysian +controlledvocabulary.language.Mzieme_Naga=Mzieme Naga +controlledvocabulary.language.M�ghd�=M�ghd� +controlledvocabulary.language.M�ku=M�ku +controlledvocabulary.language.M�nik=M�nik +controlledvocabulary.language.M�skito=M�skito +controlledvocabulary.language.M�cheno=M�cheno +controlledvocabulary.language.M�n_Chin=M�n Chin +controlledvocabulary.language.M�nd�=M�nd� +controlledvocabulary.language.Mhrri_Prkrit=M?h?r???ri Pr?krit +controlledvocabulary.language.Mori=M?ori +controlledvocabulary.language.N'Ko=N'Ko +controlledvocabulary.language.Na=Na +controlledvocabulary.language.Na-kara=Na-kara +controlledvocabulary.language.Naaba=Naaba +controlledvocabulary.language.Naami=Naami +controlledvocabulary.language.Naasioi=Naasioi +controlledvocabulary.language.Naba=Naba +controlledvocabulary.language.Nabak=Nabak +controlledvocabulary.language.Nabi=Nabi +controlledvocabulary.language.Nachering=Nachering +controlledvocabulary.language.Nadruvian=Nadruvian +controlledvocabulary.language.Nad�b=Nad�b +controlledvocabulary.language.Nafaanra=Nafaanra +controlledvocabulary.language.Nafi=Nafi +controlledvocabulary.language.Nafri=Nafri +controlledvocabulary.language.Nafusi=Nafusi +controlledvocabulary.language.Naga_Pidgin=Naga Pidgin +controlledvocabulary.language.Nagarchal=Nagarchal +controlledvocabulary.language.Nage=Nage +controlledvocabulary.language.Nagumi=Nagumi +controlledvocabulary.language.Nahali=Nahali +controlledvocabulary.language.Nahari=Nahari +controlledvocabulary.language.Nai=Nai +controlledvocabulary.language.Najdi_Arabic=Najdi Arabic +controlledvocabulary.language.Naka'ela=Naka'ela +controlledvocabulary.language.Nakai=Nakai +controlledvocabulary.language.Nakame=Nakame +controlledvocabulary.language.Nakanai=Nakanai +controlledvocabulary.language.Nake=Nake +controlledvocabulary.language.Naki=Naki +controlledvocabulary.language.Nakwi=Nakwi +controlledvocabulary.language.Nalca=Nalca +controlledvocabulary.language.Nali=Nali +controlledvocabulary.language.Nalik=Nalik +controlledvocabulary.language.Nalu=Nalu +controlledvocabulary.language.Naluo_Yi=Naluo Yi +controlledvocabulary.language.Nal�go=Nal�go +controlledvocabulary.language.Nama_(Papua_New_Guinea)=Nama (Papua New Guinea) +controlledvocabulary.language.Namakura=Namakura +controlledvocabulary.language.Namat=Namat +controlledvocabulary.language.Nambo=Nambo +controlledvocabulary.language.Nambya=Nambya +controlledvocabulary.language.Namia=Namia +controlledvocabulary.language.Namiae=Namiae +controlledvocabulary.language.Namibian_Sign_Language=Namibian Sign Language +controlledvocabulary.language.Namla=Namla +controlledvocabulary.language.Namo=Namo +controlledvocabulary.language.Namonuito=Namonuito +controlledvocabulary.language.Namosi-Naitasiri-Serua=Namosi-Naitasiri-Serua +controlledvocabulary.language.Namuyi=Namuyi +controlledvocabulary.language.Nanai=Nanai +controlledvocabulary.language.Nancere=Nancere +controlledvocabulary.language.Nande=Nande +controlledvocabulary.language.Nandi=Nandi +controlledvocabulary.language.Nanerig�_S�noufo=Nanerig� S�noufo +controlledvocabulary.language.Nanga_Dama_Dogon=Nanga Dama Dogon +controlledvocabulary.language.Nankina=Nankina +controlledvocabulary.language.Nanti=Nanti +controlledvocabulary.language.Nanticoke=Nanticoke +controlledvocabulary.language.Nanubae=Nanubae +controlledvocabulary.language.Napo_Lowland_Quechua=Napo Lowland Quechua +controlledvocabulary.language.Napu=Napu +controlledvocabulary.language.Nar_Phu=Nar Phu +controlledvocabulary.language.Nara=Nara +controlledvocabulary.language.Narak=Narak +controlledvocabulary.language.Narango=Narango +controlledvocabulary.language.Nari_Nari=Nari Nari +controlledvocabulary.language.Naro=Naro +controlledvocabulary.language.Narom=Narom +controlledvocabulary.language.Narragansett=Narragansett +controlledvocabulary.language.Narua=Narua +controlledvocabulary.language.Narungga=Narungga +controlledvocabulary.language.Nasal=Nasal +controlledvocabulary.language.Nasarian=Nasarian +controlledvocabulary.language.Naskapi=Naskapi +controlledvocabulary.language.Natanzi=Natanzi +controlledvocabulary.language.Natchez=Natchez +controlledvocabulary.language.Nateni=Nateni +controlledvocabulary.language.Nathembo=Nathembo +controlledvocabulary.language.Natioro=Natioro +controlledvocabulary.language.Nat�gu=Nat�gu +controlledvocabulary.language.Nauete=Nauete +controlledvocabulary.language.Naukan_Yupik=Naukan Yupik +controlledvocabulary.language.Nauna=Nauna +controlledvocabulary.language.Nauo=Nauo +controlledvocabulary.language.Nauru=Nauru +controlledvocabulary.language.Navajo,_Navaho=Navajo, Navaho +controlledvocabulary.language.Navut=Navut +controlledvocabulary.language.Nawaru=Nawaru +controlledvocabulary.language.Nawathinehena=Nawathinehena +controlledvocabulary.language.Nawdm=Nawdm +controlledvocabulary.language.Nawuri=Nawuri +controlledvocabulary.language.Naxi=Naxi +controlledvocabulary.language.Nayi=Nayi +controlledvocabulary.language.Nayini=Nayini +controlledvocabulary.language.Ncane=Ncane +controlledvocabulary.language.Nchumbulu=Nchumbulu +controlledvocabulary.language.Nda'nda'=Nda'nda' +controlledvocabulary.language.Ndai=Ndai +controlledvocabulary.language.Ndaka=Ndaka +controlledvocabulary.language.Ndali=Ndali +controlledvocabulary.language.Ndam=Ndam +controlledvocabulary.language.Ndamba=Ndamba +controlledvocabulary.language.Ndambomo=Ndambomo +controlledvocabulary.language.Ndasa=Ndasa +controlledvocabulary.language.Ndau=Ndau +controlledvocabulary.language.Nde-Gbite=Nde-Gbite +controlledvocabulary.language.Nde-Nsele-Nta=Nde-Nsele-Nta +controlledvocabulary.language.Ndemli=Ndemli +controlledvocabulary.language.Ndendeule=Ndendeule +controlledvocabulary.language.Ndengereko=Ndengereko +controlledvocabulary.language.Nding=Nding +controlledvocabulary.language.Ndo=Ndo +controlledvocabulary.language.Ndobo=Ndobo +controlledvocabulary.language.Ndoe=Ndoe +controlledvocabulary.language.Ndogo=Ndogo +controlledvocabulary.language.Ndolo=Ndolo +controlledvocabulary.language.Ndom=Ndom +controlledvocabulary.language.Ndombe=Ndombe +controlledvocabulary.language.Ndonde_Hamba=Ndonde Hamba +controlledvocabulary.language.Ndonga=Ndonga +controlledvocabulary.language.Ndoola=Ndoola +controlledvocabulary.language.Ndra'ngith=Ndra'ngith +controlledvocabulary.language.Ndrulo=Ndrulo +controlledvocabulary.language.Nduga=Nduga +controlledvocabulary.language.Ndumu=Ndumu +controlledvocabulary.language.Ndunda=Ndunda +controlledvocabulary.language.Ndunga=Ndunga +controlledvocabulary.language.Ndut=Ndut +controlledvocabulary.language.Ndwewe=Ndwewe +controlledvocabulary.language.Ndyuka-Trio_Pidgin=Ndyuka-Trio Pidgin +controlledvocabulary.language.Ndzwani_Comorian=Ndzwani Comorian +controlledvocabulary.language.Neapolitan=Neapolitan +controlledvocabulary.language.Nedebang=Nedebang +controlledvocabulary.language.Nefamese=Nefamese +controlledvocabulary.language.Negerhollands=Negerhollands +controlledvocabulary.language.Negeri_Sembilan_Malay=Negeri Sembilan Malay +controlledvocabulary.language.Negidal=Negidal +controlledvocabulary.language.Nehan=Nehan +controlledvocabulary.language.Nek=Nek +controlledvocabulary.language.Nekgini=Nekgini +controlledvocabulary.language.Neko=Neko +controlledvocabulary.language.Neku=Neku +controlledvocabulary.language.Nema=Nema +controlledvocabulary.language.Neme=Neme +controlledvocabulary.language.Nemi=Nemi +controlledvocabulary.language.Nen=Nen +controlledvocabulary.language.Nend=Nend +controlledvocabulary.language.Nenets=Nenets +controlledvocabulary.language.Nengone=Nengone +controlledvocabulary.language.Neo=Neo +controlledvocabulary.language.Neo-Hittite=Neo-Hittite +controlledvocabulary.language.Nepalese_Sign_Language=Nepalese Sign Language +controlledvocabulary.language.Nepali=Nepali +controlledvocabulary.language.Nepali_(individual_language)=Nepali (individual language) +controlledvocabulary.language.Nete=Nete +controlledvocabulary.language.New_Caledonian_Javanese=New Caledonian Javanese +controlledvocabulary.language.New_Zealand_Sign_Language=New Zealand Sign Language +controlledvocabulary.language.Newari=Newari +controlledvocabulary.language.Neyo=Neyo +controlledvocabulary.language.Nez_Perce=Nez Perce +controlledvocabulary.language.Ngaanyatjarra=Ngaanyatjarra +controlledvocabulary.language.Ngad'a=Ngad'a +controlledvocabulary.language.Ngadjunmaya=Ngadjunmaya +controlledvocabulary.language.Ngadjuri=Ngadjuri +controlledvocabulary.language.Ngaing=Ngaing +controlledvocabulary.language.Ngaju=Ngaju +controlledvocabulary.language.Ngala=Ngala +controlledvocabulary.language.Ngalakgan=Ngalakgan +controlledvocabulary.language.Ngalum=Ngalum +controlledvocabulary.language.Ngam=Ngam +controlledvocabulary.language.Ngamambo=Ngamambo +controlledvocabulary.language.Ngambay=Ngambay +controlledvocabulary.language.Ngamini=Ngamini +controlledvocabulary.language.Ngamo=Ngamo +controlledvocabulary.language.Ngan'gityemerri=Ngan'gityemerri +controlledvocabulary.language.Nganakarti=Nganakarti +controlledvocabulary.language.Nganasan=Nganasan +controlledvocabulary.language.Ngandi=Ngandi +controlledvocabulary.language.Ngando_(Central_African_Republic)=Ngando (Central African Republic) +controlledvocabulary.language.Ngando_(Democratic_Republic_of_Congo)=Ngando (Democratic Republic of Congo) +controlledvocabulary.language.Ngandyera=Ngandyera +controlledvocabulary.language.Ngangam=Ngangam +controlledvocabulary.language.Ngantangarra=Ngantangarra +controlledvocabulary.language.Nganyaywana=Nganyaywana +controlledvocabulary.language.Ngardi=Ngardi +controlledvocabulary.language.Ngarigu=Ngarigu +controlledvocabulary.language.Ngarinyin=Ngarinyin +controlledvocabulary.language.Ngarinyman=Ngarinyman +controlledvocabulary.language.Ngarla=Ngarla +controlledvocabulary.language.Ngarluma=Ngarluma +controlledvocabulary.language.Ngarrindjeri=Ngarrindjeri +controlledvocabulary.language.Ngas=Ngas +controlledvocabulary.language.Ngasa=Ngasa +controlledvocabulary.language.Ngatik_Men's_Creole=Ngatik Men's Creole +controlledvocabulary.language.Ngawn_Chin=Ngawn Chin +controlledvocabulary.language.Ngawun=Ngawun +controlledvocabulary.language.Ngayawung=Ngayawung +controlledvocabulary.language.Ngazidja_Comorian=Ngazidja Comorian +controlledvocabulary.language.Ngbaka=Ngbaka +controlledvocabulary.language.Ngbaka_Ma'bo=Ngbaka Ma'bo +controlledvocabulary.language.Ngbaka_Manza=Ngbaka Manza +controlledvocabulary.language.Ngbee=Ngbee +controlledvocabulary.language.Ngbinda=Ngbinda +controlledvocabulary.language.Ngbundu=Ngbundu +controlledvocabulary.language.Ngelima=Ngelima +controlledvocabulary.language.Ngemba=Ngemba +controlledvocabulary.language.Ngen=Ngen +controlledvocabulary.language.Ngendelengo=Ngendelengo +controlledvocabulary.language.Ngete=Ngete +controlledvocabulary.language.Nggem=Nggem +controlledvocabulary.language.Nggwahyi=Nggwahyi +controlledvocabulary.language.Ngie=Ngie +controlledvocabulary.language.Ngiemboon=Ngiemboon +controlledvocabulary.language.Ngile=Ngile +controlledvocabulary.language.Ngindo=Ngindo +controlledvocabulary.language.Ngiti=Ngiti +controlledvocabulary.language.Ngizim=Ngizim +controlledvocabulary.language.Ngk�lmpw_Kanum=Ngk�lmpw Kanum +controlledvocabulary.language.Ngom=Ngom +controlledvocabulary.language.Ngomba=Ngomba +controlledvocabulary.language.Ngombale=Ngombale +controlledvocabulary.language.Ngombe_(Central_African_Republic)=Ngombe (Central African Republic) +controlledvocabulary.language.Ngombe_(Democratic_Republic_of_Congo)=Ngombe (Democratic Republic of Congo) +controlledvocabulary.language.Ngongo=Ngongo +controlledvocabulary.language.Ngoni_(Mozambique)=Ngoni (Mozambique) +controlledvocabulary.language.Ngoni_(Tanzania)=Ngoni (Tanzania) +controlledvocabulary.language.Ngoshie=Ngoshie +controlledvocabulary.language.Ngul=Ngul +controlledvocabulary.language.Ngulu=Ngulu +controlledvocabulary.language.Nguluwan=Nguluwan +controlledvocabulary.language.Ngumbarl=Ngumbarl +controlledvocabulary.language.Ngumbi=Ngumbi +controlledvocabulary.language.Ngunawal=Ngunawal +controlledvocabulary.language.Ngundi=Ngundi +controlledvocabulary.language.Ngundu=Ngundu +controlledvocabulary.language.Ngungwel=Ngungwel +controlledvocabulary.language.Ngurimi=Ngurimi +controlledvocabulary.language.Ngurmbur=Ngurmbur +controlledvocabulary.language.Ngu�n=Ngu�n +controlledvocabulary.language.Ngwaba=Ngwaba +controlledvocabulary.language.Ngwe=Ngwe +controlledvocabulary.language.Ngwo=Ngwo +controlledvocabulary.language.Ng�bere=Ng�bere +controlledvocabulary.language.Nhanda=Nhanda +controlledvocabulary.language.Nhengatu=Nhengatu +controlledvocabulary.language.Nhirrpi=Nhirrpi +controlledvocabulary.language.Nhuwala=Nhuwala +controlledvocabulary.language.Nias=Nias +controlledvocabulary.language.Nicaragua_Creole_English=Nicaragua Creole English +controlledvocabulary.language.Nicaraguan_Sign_Language=Nicaraguan Sign Language +controlledvocabulary.language.Niellim=Niellim +controlledvocabulary.language.Nigeria_Mambila=Nigeria Mambila +controlledvocabulary.language.Nigerian_Fulfulde=Nigerian Fulfulde +controlledvocabulary.language.Nigerian_Pidgin=Nigerian Pidgin +controlledvocabulary.language.Nigerian_Sign_Language=Nigerian Sign Language +controlledvocabulary.language.Nihali=Nihali +controlledvocabulary.language.Nii=Nii +controlledvocabulary.language.Niksek=Niksek +controlledvocabulary.language.Nila=Nila +controlledvocabulary.language.Nilamba=Nilamba +controlledvocabulary.language.Nimadi=Nimadi +controlledvocabulary.language.Nimanbur=Nimanbur +controlledvocabulary.language.Nimbari=Nimbari +controlledvocabulary.language.Nimboran=Nimboran +controlledvocabulary.language.Nimi=Nimi +controlledvocabulary.language.Nimo=Nimo +controlledvocabulary.language.Nimoa=Nimoa +controlledvocabulary.language.Ninam=Ninam +controlledvocabulary.language.Nindi=Nindi +controlledvocabulary.language.Ningera=Ningera +controlledvocabulary.language.Ninggerum=Ninggerum +controlledvocabulary.language.Ningil=Ningil +controlledvocabulary.language.Ninia_Yali=Ninia Yali +controlledvocabulary.language.Ninzo=Ninzo +controlledvocabulary.language.Nipsan=Nipsan +controlledvocabulary.language.Nisa=Nisa +controlledvocabulary.language.Nisenan=Nisenan +controlledvocabulary.language.Nisga'a=Nisga'a +controlledvocabulary.language.Nisi_(China)=Nisi (China) +controlledvocabulary.language.Niuafo'ou=Niuafo'ou +controlledvocabulary.language.Niuatoputapu=Niuatoputapu +controlledvocabulary.language.Niuean=Niuean +controlledvocabulary.language.Nivacl�=Nivacl� +controlledvocabulary.language.Niwer_Mil=Niwer Mil +controlledvocabulary.language.Njalgulgule=Njalgulgule +controlledvocabulary.language.Njebi=Njebi +controlledvocabulary.language.Njen=Njen +controlledvocabulary.language.Njerep=Njerep +controlledvocabulary.language.Njyem=Njyem +controlledvocabulary.language.Nkami=Nkami +controlledvocabulary.language.Nkangala=Nkangala +controlledvocabulary.language.Nkari=Nkari +controlledvocabulary.language.Nkem-Nkum=Nkem-Nkum +controlledvocabulary.language.Nkhumbi=Nkhumbi +controlledvocabulary.language.Nkongho=Nkongho +controlledvocabulary.language.Nkonya=Nkonya +controlledvocabulary.language.Nkoroo=Nkoroo +controlledvocabulary.language.Nkoya=Nkoya +controlledvocabulary.language.Nkukoli=Nkukoli +controlledvocabulary.language.Nkutu=Nkutu +controlledvocabulary.language.Nnam=Nnam +controlledvocabulary.language.No_linguistic_content=No linguistic content +controlledvocabulary.language.Nobiin=Nobiin +controlledvocabulary.language.Nobonob=Nobonob +controlledvocabulary.language.Nocte_Naga=Nocte Naga +controlledvocabulary.language.Nogai=Nogai +controlledvocabulary.language.Noipx=Noipx +controlledvocabulary.language.Noiri=Noiri +controlledvocabulary.language.Nokuku=Nokuku +controlledvocabulary.language.Nomaande=Nomaande +controlledvocabulary.language.Nomane=Nomane +controlledvocabulary.language.Nomatsiguenga=Nomatsiguenga +controlledvocabulary.language.Nomlaki=Nomlaki +controlledvocabulary.language.Nomu=Nomu +controlledvocabulary.language.Nong_Zhuang=Nong Zhuang +controlledvocabulary.language.Nonuya=Nonuya +controlledvocabulary.language.Nooksack=Nooksack +controlledvocabulary.language.Noon=Noon +controlledvocabulary.language.Noone=Noone +controlledvocabulary.language.Nopala_Chatino=Nopala Chatino +controlledvocabulary.language.Noric=Noric +controlledvocabulary.language.Norn=Norn +controlledvocabulary.language.Norra=Norra +controlledvocabulary.language.North_Alaskan_Inupiatun=North Alaskan Inupiatun +controlledvocabulary.language.North_Ambrym=North Ambrym +controlledvocabulary.language.North_Asmat=North Asmat +controlledvocabulary.language.North_Awyu=North Awyu +controlledvocabulary.language.North_Azerbaijani=North Azerbaijani +controlledvocabulary.language.North_Babar=North Babar +controlledvocabulary.language.North_Bolivian_Quechua=North Bolivian Quechua +controlledvocabulary.language.North_Central_Mixe=North Central Mixe +controlledvocabulary.language.North_Efate=North Efate +controlledvocabulary.language.North_Fali=North Fali +controlledvocabulary.language.North_Giziga=North Giziga +controlledvocabulary.language.North_Jun�n_Quechua=North Jun�n Quechua +controlledvocabulary.language.North_Marquesan=North Marquesan +controlledvocabulary.language.North_Mesopotamian_Arabic=North Mesopotamian Arabic +controlledvocabulary.language.North_Midlands_Tasmanian=North Midlands Tasmanian +controlledvocabulary.language.North_Mofu=North Mofu +controlledvocabulary.language.North_Moluccan_Malay=North Moluccan Malay +controlledvocabulary.language.North_Muyu=North Muyu +controlledvocabulary.language.North_Nuaulu=North Nuaulu +controlledvocabulary.language.North_Picene=North Picene +controlledvocabulary.language.North_Slavey=North Slavey +controlledvocabulary.language.North_Tairora=North Tairora +controlledvocabulary.language.North_Tanna=North Tanna +controlledvocabulary.language.North_Wahgi=North Wahgi +controlledvocabulary.language.North_Watut=North Watut +controlledvocabulary.language.Northeast_Kiwai=Northeast Kiwai +controlledvocabulary.language.Northeast_Maidu=Northeast Maidu +controlledvocabulary.language.Northeast_Pashai=Northeast Pashai +controlledvocabulary.language.Northeastern_Dinka=Northeastern Dinka +controlledvocabulary.language.Northeastern_Pomo=Northeastern Pomo +controlledvocabulary.language.Northeastern_Tasmanian=Northeastern Tasmanian +controlledvocabulary.language.Northeastern_Thai=Northeastern Thai +controlledvocabulary.language.Northern_Alta=Northern Alta +controlledvocabulary.language.Northern_Altai=Northern Altai +controlledvocabulary.language.Northern_Amami-Oshima=Northern Amami-Oshima +controlledvocabulary.language.Northern_Betsimisaraka_Malagasy=Northern Betsimisaraka Malagasy +controlledvocabulary.language.Northern_Binukidnon=Northern Binukidnon +controlledvocabulary.language.Northern_Bobo_Madar�=Northern Bobo Madar� +controlledvocabulary.language.Northern_Bontok=Northern Bontok +controlledvocabulary.language.Northern_Catanduanes_Bikol=Northern Catanduanes Bikol +controlledvocabulary.language.Northern_Conchucos_Ancash_Quechua=Northern Conchucos Ancash Quechua +controlledvocabulary.language.Northern_Dagara=Northern Dagara +controlledvocabulary.language.Northern_Dong=Northern Dong +controlledvocabulary.language.Northern_East_Cree=Northern East Cree +controlledvocabulary.language.Northern_Ember�=Northern Ember� +controlledvocabulary.language.Northern_Frisian=Northern Frisian +controlledvocabulary.language.Northern_Ghale=Northern Ghale +controlledvocabulary.language.Northern_Gondi=Northern Gondi +controlledvocabulary.language.Northern_Grebo=Northern Grebo +controlledvocabulary.language.Northern_Guiyang_Hmong=Northern Guiyang Hmong +controlledvocabulary.language.Northern_Haida=Northern Haida +controlledvocabulary.language.Northern_Hindko=Northern Hindko +controlledvocabulary.language.Northern_Huishui_Hmong=Northern Huishui Hmong +controlledvocabulary.language.Northern_Kalapuya=Northern Kalapuya +controlledvocabulary.language.Northern_Kankanay=Northern Kankanay +controlledvocabulary.language.Northern_Katang=Northern Katang +controlledvocabulary.language.Northern_Khmer=Northern Khmer +controlledvocabulary.language.Northern_Kissi=Northern Kissi +controlledvocabulary.language.Northern_Kurdish=Northern Kurdish +controlledvocabulary.language.Northern_Luri=Northern Luri +controlledvocabulary.language.Northern_Mashan_Hmong=Northern Mashan Hmong +controlledvocabulary.language.Northern_Muji=Northern Muji +controlledvocabulary.language.Northern_Nago=Northern Nago +controlledvocabulary.language.Northern_Ndebele=Northern Ndebele +controlledvocabulary.language.Northern_Ngbandi=Northern Ngbandi +controlledvocabulary.language.Northern_Nisu=Northern Nisu +controlledvocabulary.language.Northern_Nuni=Northern Nuni +controlledvocabulary.language.Northern_Oaxaca_Nahuatl=Northern Oaxaca Nahuatl +controlledvocabulary.language.Northern_Ohlone=Northern Ohlone +controlledvocabulary.language.Northern_One=Northern One +controlledvocabulary.language.Northern_Paiute=Northern Paiute +controlledvocabulary.language.Northern_Pame=Northern Pame +controlledvocabulary.language.Northern_Pashto=Northern Pashto +controlledvocabulary.language.Northern_Pastaza_Quichua=Northern Pastaza Quichua +controlledvocabulary.language.Northern_Ping_Chinese=Northern Ping Chinese +controlledvocabulary.language.Northern_Pomo=Northern Pomo +controlledvocabulary.language.Northern_Puebla_Nahuatl=Northern Puebla Nahuatl +controlledvocabulary.language.Northern_Pumi=Northern Pumi +controlledvocabulary.language.Northern_Qiandong_Miao=Northern Qiandong Miao +controlledvocabulary.language.Northern_Qiang=Northern Qiang +controlledvocabulary.language.Northern_Rengma_Naga=Northern Rengma Naga +controlledvocabulary.language.Northern_Roglai=Northern Roglai +controlledvocabulary.language.Northern_Sami=Northern Sami +controlledvocabulary.language.Northern_Sierra_Miwok=Northern Sierra Miwok +controlledvocabulary.language.Northern_Sorsoganon=Northern Sorsoganon +controlledvocabulary.language.Northern_Subanen=Northern Subanen +controlledvocabulary.language.Northern_Tarahumara=Northern Tarahumara +controlledvocabulary.language.Northern_Tasmanian=Northern Tasmanian +controlledvocabulary.language.Northern_Tepehuan=Northern Tepehuan +controlledvocabulary.language.Northern_Thai=Northern Thai +controlledvocabulary.language.Northern_Tidung=Northern Tidung +controlledvocabulary.language.Northern_Tiwa=Northern Tiwa +controlledvocabulary.language.Northern_Tlaxiaco_Mixtec=Northern Tlaxiaco Mixtec +controlledvocabulary.language.Northern_Toussian=Northern Toussian +controlledvocabulary.language.Northern_Tujia=Northern Tujia +controlledvocabulary.language.Northern_Tutchone=Northern Tutchone +controlledvocabulary.language.Northern_Uzbek=Northern Uzbek +controlledvocabulary.language.Northern_Yukaghir=Northern Yukaghir +controlledvocabulary.language.Northwest_Alaska_Inupiatun=Northwest Alaska Inupiatun +controlledvocabulary.language.Northwest_Gbaya=Northwest Gbaya +controlledvocabulary.language.Northwest_Maidu=Northwest Maidu +controlledvocabulary.language.Northwest_Oaxaca_Mixtec=Northwest Oaxaca Mixtec +controlledvocabulary.language.Northwest_Pashai=Northwest Pashai +controlledvocabulary.language.Northwestern_Dinka=Northwestern Dinka +controlledvocabulary.language.Northwestern_Fars=Northwestern Fars +controlledvocabulary.language.Northwestern_Kolami=Northwestern Kolami +controlledvocabulary.language.Northwestern_Nisu=Northwestern Nisu +controlledvocabulary.language.Northwestern_Ojibwa=Northwestern Ojibwa +controlledvocabulary.language.Northwestern_Tasmanian=Northwestern Tasmanian +controlledvocabulary.language.Norwegian=Norwegian +controlledvocabulary.language.Norwegian_Bokm�l=Norwegian Bokm�l +controlledvocabulary.language.Norwegian_Nynorsk=Norwegian Nynorsk +controlledvocabulary.language.Norwegian_Sign_Language=Norwegian Sign Language +controlledvocabulary.language.Notre=Notre +controlledvocabulary.language.Notsi=Notsi +controlledvocabulary.language.Nottoway=Nottoway +controlledvocabulary.language.Nottoway-Meherrin=Nottoway-Meherrin +controlledvocabulary.language.Novial=Novial +controlledvocabulary.language.Noy=Noy +controlledvocabulary.language.Nsenga=Nsenga +controlledvocabulary.language.Nshi=Nshi +controlledvocabulary.language.Nsongo=Nsongo +controlledvocabulary.language.Ntcham=Ntcham +controlledvocabulary.language.Nteng=Nteng +controlledvocabulary.language.Ntomba=Ntomba +controlledvocabulary.language.Nubaca=Nubaca +controlledvocabulary.language.Nubi=Nubi +controlledvocabulary.language.Nubri=Nubri +controlledvocabulary.language.Nuer=Nuer +controlledvocabulary.language.Nugunu_(Australia)=Nugunu (Australia) +controlledvocabulary.language.Nugunu_(Cameroon)=Nugunu (Cameroon) +controlledvocabulary.language.Nuk=Nuk +controlledvocabulary.language.Nukak_Mak�=Nukak Mak� +controlledvocabulary.language.Nukna=Nukna +controlledvocabulary.language.Nukuini=Nukuini +controlledvocabulary.language.Nukumanu=Nukumanu +controlledvocabulary.language.Nukunul=Nukunul +controlledvocabulary.language.Nukuoro=Nukuoro +controlledvocabulary.language.Nukuria=Nukuria +controlledvocabulary.language.Numana=Numana +controlledvocabulary.language.Numanggang=Numanggang +controlledvocabulary.language.Numbami=Numbami +controlledvocabulary.language.Nume=Nume +controlledvocabulary.language.Numidian=Numidian +controlledvocabulary.language.Num��=Num�� +controlledvocabulary.language.Nung_(Viet_Nam)=Nung (Viet Nam) +controlledvocabulary.language.Nungali=Nungali +controlledvocabulary.language.Nunggubuyu=Nunggubuyu +controlledvocabulary.language.Nungu=Nungu +controlledvocabulary.language.Nuosu=Nuosu +controlledvocabulary.language.Nupbikha=Nupbikha +controlledvocabulary.language.Nupe-Nupe-Tako=Nupe-Nupe-Tako +controlledvocabulary.language.Nusa_Laut=Nusa Laut +controlledvocabulary.language.Nusu=Nusu +controlledvocabulary.language.Nuu-chah-nulth=Nuu-chah-nulth +controlledvocabulary.language.Nyabwa=Nyabwa +controlledvocabulary.language.Nyaheun=Nyaheun +controlledvocabulary.language.Nyahkur=Nyahkur +controlledvocabulary.language.Nyakyusa-Ngonde=Nyakyusa-Ngonde +controlledvocabulary.language.Nyali=Nyali +controlledvocabulary.language.Nyam=Nyam +controlledvocabulary.language.Nyamal=Nyamal +controlledvocabulary.language.Nyambo=Nyambo +controlledvocabulary.language.Nyamusa-Molo=Nyamusa-Molo +controlledvocabulary.language.Nyamwanga=Nyamwanga +controlledvocabulary.language.Nyamwezi=Nyamwezi +controlledvocabulary.language.Nyaneka=Nyaneka +controlledvocabulary.language.Nyang'i=Nyang'i +controlledvocabulary.language.Nyanga=Nyanga +controlledvocabulary.language.Nyanga-li=Nyanga-li +controlledvocabulary.language.Nyangatom=Nyangatom +controlledvocabulary.language.Nyangbo=Nyangbo +controlledvocabulary.language.Nyangga=Nyangga +controlledvocabulary.language.Nyangumarta=Nyangumarta +controlledvocabulary.language.Nyankole=Nyankole +controlledvocabulary.language.Nyankpa=Nyankpa +controlledvocabulary.language.Nyarafolo_Senoufo=Nyarafolo Senoufo +controlledvocabulary.language.Nyaturu=Nyaturu +controlledvocabulary.language.Nyaw=Nyaw +controlledvocabulary.language.Nyawaygi=Nyawaygi +controlledvocabulary.language.Nyemba=Nyemba +controlledvocabulary.language.Nyengo=Nyengo +controlledvocabulary.language.Nyenkha=Nyenkha +controlledvocabulary.language.Nyeu=Nyeu +controlledvocabulary.language.Nyiha_(Malawi)=Nyiha (Malawi) +controlledvocabulary.language.Nyiha_(Tanzania)=Nyiha (Tanzania) +controlledvocabulary.language.Nyika_(Malawi_and_Zambia)=Nyika (Malawi and Zambia) +controlledvocabulary.language.Nyika_(Tanzania)=Nyika (Tanzania) +controlledvocabulary.language.Nyikina=Nyikina +controlledvocabulary.language.Nyindrou=Nyindrou +controlledvocabulary.language.Nyindu=Nyindu +controlledvocabulary.language.Nyishi=Nyishi +controlledvocabulary.language.Nyiyaparli=Nyiyaparli +controlledvocabulary.language.Nyokon=Nyokon +controlledvocabulary.language.Nyole=Nyole +controlledvocabulary.language.Nyong=Nyong +controlledvocabulary.language.Nyore=Nyore +controlledvocabulary.language.Nyoro=Nyoro +controlledvocabulary.language.Nyulnyul=Nyulnyul +controlledvocabulary.language.Nyungar=Nyungar +controlledvocabulary.language.Nyungwe=Nyungwe +controlledvocabulary.language.Ny�layu=Ny�layu +controlledvocabulary.language.Nzadi=Nzadi +controlledvocabulary.language.Nzakambay=Nzakambay +controlledvocabulary.language.Nzakara=Nzakara +controlledvocabulary.language.Nzanyi=Nzanyi +controlledvocabulary.language.Nzima=Nzima +controlledvocabulary.language.N�-Meo=N�-Meo +controlledvocabulary.language.N�l�mwa-Nixumwak=N�l�mwa-Nixumwak +controlledvocabulary.language.N�pode_Huitoto=N�pode Huitoto +controlledvocabulary.language.Nng=N?ng +controlledvocabulary.language.O'chi'chi'=O'chi'chi' +controlledvocabulary.language.O'du=O'du +controlledvocabulary.language.Obanliku=Obanliku +controlledvocabulary.language.Obispe�o=Obispe�o +controlledvocabulary.language.Oblo=Oblo +controlledvocabulary.language.Obo_Manobo=Obo Manobo +controlledvocabulary.language.Obokuitai=Obokuitai +controlledvocabulary.language.Obolo=Obolo +controlledvocabulary.language.Obulom=Obulom +controlledvocabulary.language.Ocaina=Ocaina +controlledvocabulary.language.Occitan=Occitan +controlledvocabulary.language.Ocotepec_Mixtec=Ocotepec Mixtec +controlledvocabulary.language.Ocotl�n_Zapotec=Ocotl�n Zapotec +controlledvocabulary.language.Od=Od +controlledvocabulary.language.Odia=Odia +controlledvocabulary.language.Odiai=Odiai +controlledvocabulary.language.Odoodee=Odoodee +controlledvocabulary.language.Odual=Odual +controlledvocabulary.language.Odut=Odut +controlledvocabulary.language.Ofay�=Ofay� +controlledvocabulary.language.Official_Aramaic_(700-300_BCE)=Official Aramaic (700-300 BCE) +controlledvocabulary.language.Ofo=Ofo +controlledvocabulary.language.Ogbah=Ogbah +controlledvocabulary.language.Ogbia=Ogbia +controlledvocabulary.language.Ogbogolo=Ogbogolo +controlledvocabulary.language.Ogbronuagum=Ogbronuagum +controlledvocabulary.language.Ogea=Ogea +controlledvocabulary.language.Oirata=Oirata +controlledvocabulary.language.Ojibwe,_Ojibwa=Ojibwe, Ojibwa +controlledvocabulary.language.Ojitl�n_Chinantec=Ojitl�n Chinantec +controlledvocabulary.language.Okanagan=Okanagan +controlledvocabulary.language.Oki-No-Erabu=Oki-No-Erabu +controlledvocabulary.language.Okiek=Okiek +controlledvocabulary.language.Oko-Eni-Osayen=Oko-Eni-Osayen +controlledvocabulary.language.Oko-Juwoi=Oko-Juwoi +controlledvocabulary.language.Okobo=Okobo +controlledvocabulary.language.Okodia=Okodia +controlledvocabulary.language.Okolie=Okolie +controlledvocabulary.language.Okolod=Okolod +controlledvocabulary.language.Okpamheri=Okpamheri +controlledvocabulary.language.Okpe_(Northwestern_Edo)=Okpe (Northwestern Edo) +controlledvocabulary.language.Okpe_(Southwestern_Edo)=Okpe (Southwestern Edo) +controlledvocabulary.language.Oksapmin=Oksapmin +controlledvocabulary.language.Oku=Oku +controlledvocabulary.language.Old_Aramaic_(up_to_700_BCE)=Old Aramaic (up to 700 BCE) +controlledvocabulary.language.Old_Avar=Old Avar +controlledvocabulary.language.Old_Breton=Old Breton +controlledvocabulary.language.Old_Burmese=Old Burmese +controlledvocabulary.language.Old_Cham=Old Cham +controlledvocabulary.language.Old_Chinese=Old Chinese +controlledvocabulary.language.Old_Church_Slavonic,_Church_Slavonic,_Old_Bulgarian=Old Church Slavonic, Church Slavonic, Old Bulgarian +controlledvocabulary.language.Old_Cornish=Old Cornish +controlledvocabulary.language.Old_Dutch=Old Dutch +controlledvocabulary.language.Old_English_(ca._450-1100)=Old English (ca. 450-1100) +controlledvocabulary.language.Old_French_(842-ca._1400)=Old French (842-ca. 1400) +controlledvocabulary.language.Old_Frisian=Old Frisian +controlledvocabulary.language.Old_Georgian=Old Georgian +controlledvocabulary.language.Old_High_German_(ca._750-1050)=Old High German (ca. 750-1050) +controlledvocabulary.language.Old_Hittite=Old Hittite +controlledvocabulary.language.Old_Hungarian=Old Hungarian +controlledvocabulary.language.Old_Irish_(to_900)=Old Irish (to 900) +controlledvocabulary.language.Old_Japanese=Old Japanese +controlledvocabulary.language.Old_Kentish_Sign_Language=Old Kentish Sign Language +controlledvocabulary.language.Old_Khmer=Old Khmer +controlledvocabulary.language.Old_Korean_(3rd-9th_cent.)=Old Korean (3rd-9th cent.) +controlledvocabulary.language.Old_Lithuanian=Old Lithuanian +controlledvocabulary.language.Old_Malay=Old Malay +controlledvocabulary.language.Old_Manipuri=Old Manipuri +controlledvocabulary.language.Old_Marathi=Old Marathi +controlledvocabulary.language.Old_Mon=Old Mon +controlledvocabulary.language.Old_Norse=Old Norse +controlledvocabulary.language.Old_Nubian=Old Nubian +controlledvocabulary.language.Old_Ossetic=Old Ossetic +controlledvocabulary.language.Old_Persian_(ca._600-400_B.C.)=Old Persian (ca. 600-400 B.C.) +controlledvocabulary.language.Old_Proven�al_(to_1500)=Old Proven�al (to 1500) +controlledvocabulary.language.Old_Russian=Old Russian +controlledvocabulary.language.Old_Saxon=Old Saxon +controlledvocabulary.language.Old_Spanish=Old Spanish +controlledvocabulary.language.Old_Sundanese=Old Sundanese +controlledvocabulary.language.Old_Tamil=Old Tamil +controlledvocabulary.language.Old_Tibetan=Old Tibetan +controlledvocabulary.language.Old_Turkish=Old Turkish +controlledvocabulary.language.Old_Uighur=Old Uighur +controlledvocabulary.language.Old_Welsh=Old Welsh +controlledvocabulary.language.Olekha=Olekha +controlledvocabulary.language.Olkol=Olkol +controlledvocabulary.language.Olo=Olo +controlledvocabulary.language.Oloma=Oloma +controlledvocabulary.language.Olrat=Olrat +controlledvocabulary.language.Olu'bo=Olu'bo +controlledvocabulary.language.Olulumo-Ikom=Olulumo-Ikom +controlledvocabulary.language.Oluta_Popoluca=Oluta Popoluca +controlledvocabulary.language.Omagua=Omagua +controlledvocabulary.language.Omaha-Ponca=Omaha-Ponca +controlledvocabulary.language.Omani_Arabic=Omani Arabic +controlledvocabulary.language.Ombamba=Ombamba +controlledvocabulary.language.Ombo=Ombo +controlledvocabulary.language.Ometepec_Nahuatl=Ometepec Nahuatl +controlledvocabulary.language.Omi=Omi +controlledvocabulary.language.Omok=Omok +controlledvocabulary.language.Omotik=Omotik +controlledvocabulary.language.Omurano=Omurano +controlledvocabulary.language.Ona=Ona +controlledvocabulary.language.Oneida=Oneida +controlledvocabulary.language.Ong=Ong +controlledvocabulary.language.Onin=Onin +controlledvocabulary.language.Onin_Based_Pidgin=Onin Based Pidgin +controlledvocabulary.language.Onjob=Onjob +controlledvocabulary.language.Ono=Ono +controlledvocabulary.language.Onobasulu=Onobasulu +controlledvocabulary.language.Onondaga=Onondaga +controlledvocabulary.language.Ontenu=Ontenu +controlledvocabulary.language.Ontong_Java=Ontong Java +controlledvocabulary.language.Oorlams=Oorlams +controlledvocabulary.language.Opao=Opao +controlledvocabulary.language.Opata=Opata +controlledvocabulary.language.Orang_Kanaq=Orang Kanaq +controlledvocabulary.language.Orang_Seletar=Orang Seletar +controlledvocabulary.language.Oraon_Sadri=Oraon Sadri +controlledvocabulary.language.Orej�n=Orej�n +controlledvocabulary.language.Oring=Oring +controlledvocabulary.language.Oriya=Oriya +controlledvocabulary.language.Orizaba_Nahuatl=Orizaba Nahuatl +controlledvocabulary.language.Orma=Orma +controlledvocabulary.language.Ormu=Ormu +controlledvocabulary.language.Ormuri=Ormuri +controlledvocabulary.language.Oro=Oro +controlledvocabulary.language.Oro_Win=Oro Win +controlledvocabulary.language.Oroch=Oroch +controlledvocabulary.language.Oroha=Oroha +controlledvocabulary.language.Orok=Orok +controlledvocabulary.language.Orokaiva=Orokaiva +controlledvocabulary.language.Oroko=Oroko +controlledvocabulary.language.Orokolo=Orokolo +controlledvocabulary.language.Oromo=Oromo +controlledvocabulary.language.Oroqen=Oroqen +controlledvocabulary.language.Orowe=Orowe +controlledvocabulary.language.Oruma=Oruma +controlledvocabulary.language.Orya=Orya +controlledvocabulary.language.Osage=Osage +controlledvocabulary.language.Osatu=Osatu +controlledvocabulary.language.Oscan=Oscan +controlledvocabulary.language.Osing=Osing +controlledvocabulary.language.Ososo=Ososo +controlledvocabulary.language.Ossetian,_Ossetic=Ossetian, Ossetic +controlledvocabulary.language.Ot_Danum=Ot Danum +controlledvocabulary.language.Otank=Otank +controlledvocabulary.language.Oti=Oti +controlledvocabulary.language.Otoro=Otoro +controlledvocabulary.language.Ottawa=Ottawa +controlledvocabulary.language.Ottoman_Turkish_(1500-1928)=Ottoman Turkish (1500-1928) +controlledvocabulary.language.Otuho=Otuho +controlledvocabulary.language.Otuke=Otuke +controlledvocabulary.language.Ouma=Ouma +controlledvocabulary.language.Oune=Oune +controlledvocabulary.language.Owa=Owa +controlledvocabulary.language.Owenia=Owenia +controlledvocabulary.language.Owiniga=Owiniga +controlledvocabulary.language.Oy=Oy +controlledvocabulary.language.Oya'oya=Oya'oya +controlledvocabulary.language.Oyda=Oyda +controlledvocabulary.language.Oyster_Bay_Tasmanian=Oyster Bay Tasmanian +controlledvocabulary.language.Ozolotepec_Zapotec=Ozolotepec Zapotec +controlledvocabulary.language.Ozumac�n_Chinantec=Ozumac�n Chinantec +controlledvocabulary.language.Pa_Di=Pa Di +controlledvocabulary.language.Pa'a=Pa'a +controlledvocabulary.language.Pa'o_Karen=Pa'o Karen +controlledvocabulary.language.Pa-Hng=Pa-Hng +controlledvocabulary.language.Paakantyi=Paakantyi +controlledvocabulary.language.Paama=Paama +controlledvocabulary.language.Paasaal=Paasaal +controlledvocabulary.language.Pacahuara=Pacahuara +controlledvocabulary.language.Pacaraos_Quechua=Pacaraos Quechua +controlledvocabulary.language.Pacific_Gulf_Yupik=Pacific Gulf Yupik +controlledvocabulary.language.Pacoh=Pacoh +controlledvocabulary.language.Padoe=Padoe +controlledvocabulary.language.Paekche=Paekche +controlledvocabulary.language.Paelignian=Paelignian +controlledvocabulary.language.Pagi=Pagi +controlledvocabulary.language.Pagibete=Pagibete +controlledvocabulary.language.Pagu=Pagu +controlledvocabulary.language.Pahanan_Agta=Pahanan Agta +controlledvocabulary.language.Pahari=Pahari +controlledvocabulary.language.Pahari-Potwari=Pahari-Potwari +controlledvocabulary.language.Pahi=Pahi +controlledvocabulary.language.Pahlavani=Pahlavani +controlledvocabulary.language.Pahlavi=Pahlavi +controlledvocabulary.language.Pai_Tavytera=Pai Tavytera +controlledvocabulary.language.Paic�=Paic� +controlledvocabulary.language.Paipai=Paipai +controlledvocabulary.language.Paite_Chin=Paite Chin +controlledvocabulary.language.Paiwan=Paiwan +controlledvocabulary.language.Pak-Tong=Pak-Tong +controlledvocabulary.language.Pakanha=Pakanha +controlledvocabulary.language.Paka�snovos=Paka�snovos +controlledvocabulary.language.Pakistan_Sign_Language=Pakistan Sign Language +controlledvocabulary.language.Paku=Paku +controlledvocabulary.language.Paku_Karen=Paku Karen +controlledvocabulary.language.Pal=Pal +controlledvocabulary.language.Palaic=Palaic +controlledvocabulary.language.Palaka_Senoufo=Palaka Senoufo +controlledvocabulary.language.Palantla_Chinantec=Palantla Chinantec +controlledvocabulary.language.Palauan=Palauan +controlledvocabulary.language.Paleni=Paleni +controlledvocabulary.language.Palenquero=Palenquero +controlledvocabulary.language.Palik�r=Palik�r +controlledvocabulary.language.Paliyan=Paliyan +controlledvocabulary.language.Pallanganmiddang=Pallanganmiddang +controlledvocabulary.language.Paloor=Paloor +controlledvocabulary.language.Palu'e=Palu'e +controlledvocabulary.language.Paluan=Paluan +controlledvocabulary.language.Palya_Bareli=Palya Bareli +controlledvocabulary.language.Pam=Pam +controlledvocabulary.language.Pambia=Pambia +controlledvocabulary.language.Pamona=Pamona +controlledvocabulary.language.Pamosu=Pamosu +controlledvocabulary.language.Pampanga=Pampanga +controlledvocabulary.language.Pamplona_Atta=Pamplona Atta +controlledvocabulary.language.Pana_(Burkina_Faso)=Pana (Burkina Faso) +controlledvocabulary.language.Pana_(Central_African_Republic)=Pana (Central African Republic) +controlledvocabulary.language.Panamanian_Sign_Language=Panamanian Sign Language +controlledvocabulary.language.Panamint=Panamint +controlledvocabulary.language.Panao_Hu�nuco_Quechua=Panao Hu�nuco Quechua +controlledvocabulary.language.Panar�=Panar� +controlledvocabulary.language.Panasuan=Panasuan +controlledvocabulary.language.Panawa=Panawa +controlledvocabulary.language.Pancana=Pancana +controlledvocabulary.language.Panchpargania=Panchpargania +controlledvocabulary.language.Pande=Pande +controlledvocabulary.language.Pangasinan=Pangasinan +controlledvocabulary.language.Pangseng=Pangseng +controlledvocabulary.language.Pangu=Pangu +controlledvocabulary.language.Pangutaran_Sama=Pangutaran Sama +controlledvocabulary.language.Pangwa=Pangwa +controlledvocabulary.language.Pangwali=Pangwali +controlledvocabulary.language.Panim=Panim +controlledvocabulary.language.Paniya=Paniya +controlledvocabulary.language.Panjabi,_Punjabi=Panjabi, Punjabi +controlledvocabulary.language.Pankarar�=Pankarar� +controlledvocabulary.language.Pankarar�=Pankarar� +controlledvocabulary.language.Pankhu=Pankhu +controlledvocabulary.language.Pannei=Pannei +controlledvocabulary.language.Pano=Pano +controlledvocabulary.language.Panoan_Katuk�na=Panoan Katuk�na +controlledvocabulary.language.Panobo=Panobo +controlledvocabulary.language.Panyi_Bai=Panyi Bai +controlledvocabulary.language.Papantla_Totonac=Papantla Totonac +controlledvocabulary.language.Papapana=Papapana +controlledvocabulary.language.Papar=Papar +controlledvocabulary.language.Papasena=Papasena +controlledvocabulary.language.Papel=Papel +controlledvocabulary.language.Papi=Papi +controlledvocabulary.language.Papiamento=Papiamento +controlledvocabulary.language.Papora=Papora +controlledvocabulary.language.Papua_New_Guinean_Sign_Language=Papua New Guinean Sign Language +controlledvocabulary.language.Papuan_Malay=Papuan Malay +controlledvocabulary.language.Papuma=Papuma +controlledvocabulary.language.Parachi=Parachi +controlledvocabulary.language.Paraguayan_Guaran�=Paraguayan Guaran� +controlledvocabulary.language.Paraguayan_Sign_Language=Paraguayan Sign Language +controlledvocabulary.language.Parakan�=Parakan� +controlledvocabulary.language.Paranan=Paranan +controlledvocabulary.language.Paranaw�t=Paranaw�t +controlledvocabulary.language.Paraujano=Paraujano +controlledvocabulary.language.Parauk=Parauk +controlledvocabulary.language.Parawen=Parawen +controlledvocabulary.language.Pardhan=Pardhan +controlledvocabulary.language.Pardhi=Pardhi +controlledvocabulary.language.Pare=Pare +controlledvocabulary.language.Parec�s=Parec�s +controlledvocabulary.language.Parenga=Parenga +controlledvocabulary.language.Parkari_Koli=Parkari Koli +controlledvocabulary.language.Parkwa=Parkwa +controlledvocabulary.language.Parsi-Dari=Parsi-Dari +controlledvocabulary.language.Parthian=Parthian +controlledvocabulary.language.Parya=Parya +controlledvocabulary.language.Par�_Ar�ra=Par� Ar�ra +controlledvocabulary.language.Par�_Gavi�o=Par� Gavi�o +controlledvocabulary.language.Pashto,_Pushto=Pashto, Pushto +controlledvocabulary.language.Pasi=Pasi +controlledvocabulary.language.Pass_Valley_Yali=Pass Valley Yali +controlledvocabulary.language.Patamona=Patamona +controlledvocabulary.language.Patani=Patani +controlledvocabulary.language.Patax�_H�-Ha-H�e=Patax� H�-Ha-H�e +controlledvocabulary.language.Patep=Patep +controlledvocabulary.language.Pathiya=Pathiya +controlledvocabulary.language.Patpatar=Patpatar +controlledvocabulary.language.Pattani=Pattani +controlledvocabulary.language.Pattani_Malay=Pattani Malay +controlledvocabulary.language.Pattapu=Pattapu +controlledvocabulary.language.Patwin=Patwin +controlledvocabulary.language.Paulohi=Paulohi +controlledvocabulary.language.Paumar�=Paumar� +controlledvocabulary.language.Paunaka=Paunaka +controlledvocabulary.language.Pauri_Bareli=Pauri Bareli +controlledvocabulary.language.Pauserna=Pauserna +controlledvocabulary.language.Pawaia=Pawaia +controlledvocabulary.language.Pawnee=Pawnee +controlledvocabulary.language.Paynamar=Paynamar +controlledvocabulary.language.Pazeh=Pazeh +controlledvocabulary.language.Pe=Pe +controlledvocabulary.language.Pear=Pear +controlledvocabulary.language.Pech=Pech +controlledvocabulary.language.Pecheneg=Pecheneg +controlledvocabulary.language.Pedi=Pedi +controlledvocabulary.language.Pei=Pei +controlledvocabulary.language.Pekal=Pekal +controlledvocabulary.language.Pela=Pela +controlledvocabulary.language.Pele-Ata=Pele-Ata +controlledvocabulary.language.Pelende=Pelende +controlledvocabulary.language.Pemon=Pemon +controlledvocabulary.language.Penang_Sign_Language=Penang Sign Language +controlledvocabulary.language.Penchal=Penchal +controlledvocabulary.language.Pendau=Pendau +controlledvocabulary.language.Pengo=Pengo +controlledvocabulary.language.Pennsylvania_German=Pennsylvania German +controlledvocabulary.language.Penrhyn=Penrhyn +controlledvocabulary.language.Pentlatch=Pentlatch +controlledvocabulary.language.Perai=Perai +controlledvocabulary.language.Peranakan_Indonesian=Peranakan Indonesian +controlledvocabulary.language.Pere=Pere +controlledvocabulary.language.Peripheral_Mongolian=Peripheral Mongolian +controlledvocabulary.language.Pero=Pero +controlledvocabulary.language.Persian_(Farsi)=Persian (Farsi) +controlledvocabulary.language.Peruvian_Sign_Language=Peruvian Sign Language +controlledvocabulary.language.Pesse=Pesse +controlledvocabulary.language.Petapa_Zapotec=Petapa Zapotec +controlledvocabulary.language.Petats=Petats +controlledvocabulary.language.Petjo=Petjo +controlledvocabulary.language.Pe�oles_Mixtec=Pe�oles Mixtec +controlledvocabulary.language.Pfaelzisch=Pfaelzisch +controlledvocabulary.language.Phai=Phai +controlledvocabulary.language.Phake=Phake +controlledvocabulary.language.Phala=Phala +controlledvocabulary.language.Phalura=Phalura +controlledvocabulary.language.Phana'=Phana' +controlledvocabulary.language.Phangduwali=Phangduwali +controlledvocabulary.language.Phende=Phende +controlledvocabulary.language.Philippine_Sign_Language=Philippine Sign Language +controlledvocabulary.language.Phimbi=Phimbi +controlledvocabulary.language.Phoenician=Phoenician +controlledvocabulary.language.Phola=Phola +controlledvocabulary.language.Pholo=Pholo +controlledvocabulary.language.Phom_Naga=Phom Naga +controlledvocabulary.language.Phong-Kniang=Phong-Kniang +controlledvocabulary.language.Phrae_Pwo_Karen=Phrae Pwo Karen +controlledvocabulary.language.Phrygian=Phrygian +controlledvocabulary.language.Phu_Thai=Phu Thai +controlledvocabulary.language.Phuan=Phuan +controlledvocabulary.language.Phudagi=Phudagi +controlledvocabulary.language.Phuie=Phuie +controlledvocabulary.language.Phukha=Phukha +controlledvocabulary.language.Phuma=Phuma +controlledvocabulary.language.Phunoi=Phunoi +controlledvocabulary.language.Phuong=Phuong +controlledvocabulary.language.Phupa=Phupa +controlledvocabulary.language.Phupha=Phupha +controlledvocabulary.language.Phuza=Phuza +controlledvocabulary.language.Piamatsina=Piamatsina +controlledvocabulary.language.Piame=Piame +controlledvocabulary.language.Piapoco=Piapoco +controlledvocabulary.language.Piaroa=Piaroa +controlledvocabulary.language.Picard=Picard +controlledvocabulary.language.Pichis_Ash�ninka=Pichis Ash�ninka +controlledvocabulary.language.Pictish=Pictish +controlledvocabulary.language.Pidgin_Delaware=Pidgin Delaware +controlledvocabulary.language.Piemontese=Piemontese +controlledvocabulary.language.Pijao=Pijao +controlledvocabulary.language.Pije=Pije +controlledvocabulary.language.Pijin=Pijin +controlledvocabulary.language.Pilag�=Pilag� +controlledvocabulary.language.Pileni=Pileni +controlledvocabulary.language.Pima_Bajo=Pima Bajo +controlledvocabulary.language.Pimbwe=Pimbwe +controlledvocabulary.language.Pinai-Hagahai=Pinai-Hagahai +controlledvocabulary.language.Pindiini=Pindiini +controlledvocabulary.language.Pingelapese=Pingelapese +controlledvocabulary.language.Pinigura=Pinigura +controlledvocabulary.language.Pinjarup=Pinjarup +controlledvocabulary.language.Pinji=Pinji +controlledvocabulary.language.Pinotepa_Nacional_Mixtec=Pinotepa Nacional Mixtec +controlledvocabulary.language.Pintupi-Luritja=Pintupi-Luritja +controlledvocabulary.language.Pinyin=Pinyin +controlledvocabulary.language.Pipil=Pipil +controlledvocabulary.language.Pirah�=Pirah� +controlledvocabulary.language.Piratapuyo=Piratapuyo +controlledvocabulary.language.Pirlatapa=Pirlatapa +controlledvocabulary.language.Piro=Piro +controlledvocabulary.language.Pirriya=Pirriya +controlledvocabulary.language.Pisabo=Pisabo +controlledvocabulary.language.Pisaflores_Tepehua=Pisaflores Tepehua +controlledvocabulary.language.Piscataway=Piscataway +controlledvocabulary.language.Pisidian=Pisidian +controlledvocabulary.language.Pitcairn-Norfolk=Pitcairn-Norfolk +controlledvocabulary.language.Pite_Sami=Pite Sami +controlledvocabulary.language.Piti=Piti +controlledvocabulary.language.Pitjantjatjara=Pitjantjatjara +controlledvocabulary.language.Pitta_Pitta=Pitta Pitta +controlledvocabulary.language.Piu=Piu +controlledvocabulary.language.Piya-Kwonci=Piya-Kwonci +controlledvocabulary.language.Plains_Cree=Plains Cree +controlledvocabulary.language.Plains_Indian_Sign_Language=Plains Indian Sign Language +controlledvocabulary.language.Plains_Miwok=Plains Miwok +controlledvocabulary.language.Plapo_Krumen=Plapo Krumen +controlledvocabulary.language.Plateau_Malagasy=Plateau Malagasy +controlledvocabulary.language.Plautdietsch=Plautdietsch +controlledvocabulary.language.Playero=Playero +controlledvocabulary.language.Pnar=Pnar +controlledvocabulary.language.Pochuri_Naga=Pochuri Naga +controlledvocabulary.language.Pochutec=Pochutec +controlledvocabulary.language.Podena=Podena +controlledvocabulary.language.Pogolo=Pogolo +controlledvocabulary.language.Pohnpeian=Pohnpeian +controlledvocabulary.language.Pokang�=Pokang� +controlledvocabulary.language.Poke=Poke +controlledvocabulary.language.Pokomo=Pokomo +controlledvocabulary.language.Polabian=Polabian +controlledvocabulary.language.Polari=Polari +controlledvocabulary.language.Polish=Polish +controlledvocabulary.language.Polish_Sign_Language=Polish Sign Language +controlledvocabulary.language.Polonombauk=Polonombauk +controlledvocabulary.language.Pom=Pom +controlledvocabulary.language.Pomo=Pomo +controlledvocabulary.language.Ponam=Ponam +controlledvocabulary.language.Ponosakan=Ponosakan +controlledvocabulary.language.Pontic=Pontic +controlledvocabulary.language.Ponyo-Gongwang_Naga=Ponyo-Gongwang Naga +controlledvocabulary.language.Popti'=Popti' +controlledvocabulary.language.Poqomam=Poqomam +controlledvocabulary.language.Poqomchi'=Poqomchi' +controlledvocabulary.language.Porohanon=Porohanon +controlledvocabulary.language.Port_Sandwich=Port Sandwich +controlledvocabulary.language.Port_Sorell_Tasmanian=Port Sorell Tasmanian +controlledvocabulary.language.Port_Vato=Port Vato +controlledvocabulary.language.Portuguese=Portuguese +controlledvocabulary.language.Portuguese_Sign_Language=Portuguese Sign Language +controlledvocabulary.language.Potawatomi=Potawatomi +controlledvocabulary.language.Potigu�ra=Potigu�ra +controlledvocabulary.language.Pottangi_Ollar_Gadaba=Pottangi Ollar Gadaba +controlledvocabulary.language.Poumei_Naga=Poumei Naga +controlledvocabulary.language.Pouye=Pouye +controlledvocabulary.language.Powari=Powari +controlledvocabulary.language.Powhatan=Powhatan +controlledvocabulary.language.Poyan�wa=Poyan�wa +controlledvocabulary.language.Prasuni=Prasuni +controlledvocabulary.language.Primitive_Irish=Primitive Irish +controlledvocabulary.language.Principense=Principense +controlledvocabulary.language.Providencia_Sign_Language=Providencia Sign Language +controlledvocabulary.language.Prussian=Prussian +controlledvocabulary.language.Psikye=Psikye +controlledvocabulary.language.Pu-Xian_Chinese=Pu-Xian Chinese +controlledvocabulary.language.Puare=Puare +controlledvocabulary.language.Pudtol_Atta=Pudtol Atta +controlledvocabulary.language.Puebla_Mazatec=Puebla Mazatec +controlledvocabulary.language.Puelche=Puelche +controlledvocabulary.language.Puerto_Rican_Sign_Language=Puerto Rican Sign Language +controlledvocabulary.language.Puimei_Naga=Puimei Naga +controlledvocabulary.language.Puinave=Puinave +controlledvocabulary.language.Pukapuka=Pukapuka +controlledvocabulary.language.Pulaar=Pulaar +controlledvocabulary.language.Pulabu=Pulabu +controlledvocabulary.language.Pular=Pular +controlledvocabulary.language.Puluwatese=Puluwatese +controlledvocabulary.language.Puma=Puma +controlledvocabulary.language.Pumpokol=Pumpokol +controlledvocabulary.language.Pum�=Pum� +controlledvocabulary.language.Punan_Aput=Punan Aput +controlledvocabulary.language.Punan_Bah-Biau=Punan Bah-Biau +controlledvocabulary.language.Punan_Batu_1=Punan Batu 1 +controlledvocabulary.language.Punan_Merah=Punan Merah +controlledvocabulary.language.Punan_Merap=Punan Merap +controlledvocabulary.language.Punan_Tubu=Punan Tubu +controlledvocabulary.language.Punic=Punic +controlledvocabulary.language.Puno_Quechua=Puno Quechua +controlledvocabulary.language.Punthamara=Punthamara +controlledvocabulary.language.Punu=Punu +controlledvocabulary.language.Puoc=Puoc +controlledvocabulary.language.Puquina=Puquina +controlledvocabulary.language.Puragi=Puragi +controlledvocabulary.language.Purari=Purari +controlledvocabulary.language.Purepecha=Purepecha +controlledvocabulary.language.Puri=Puri +controlledvocabulary.language.Purik=Purik +controlledvocabulary.language.Purisime�o=Purisime�o +controlledvocabulary.language.Puroik=Puroik +controlledvocabulary.language.Purubor�=Purubor� +controlledvocabulary.language.Purum=Purum +controlledvocabulary.language.Putai=Putai +controlledvocabulary.language.Putoh=Putoh +controlledvocabulary.language.Putukwam=Putukwam +controlledvocabulary.language.Puyo=Puyo +controlledvocabulary.language.Puyo-Paekche=Puyo-Paekche +controlledvocabulary.language.Puyuma=Puyuma +controlledvocabulary.language.Pwaamei=Pwaamei +controlledvocabulary.language.Pwapw�=Pwapw� +controlledvocabulary.language.Pwo_Eastern_Karen=Pwo Eastern Karen +controlledvocabulary.language.Pwo_Northern_Karen=Pwo Northern Karen +controlledvocabulary.language.Pwo_Western_Karen=Pwo Western Karen +controlledvocabulary.language.Pyapun=Pyapun +controlledvocabulary.language.Pye_Krumen=Pye Krumen +controlledvocabulary.language.Pyen=Pyen +controlledvocabulary.language.Pyu_(Myanmar)=Pyu (Myanmar) +controlledvocabulary.language.Pyu_(Papua_New_Guinea)=Pyu (Papua New Guinea) +controlledvocabulary.language.P�ez=P�ez +controlledvocabulary.language.P��fang=P��fang +controlledvocabulary.language.P�ri=P�ri +controlledvocabulary.language.P�mono=P�mono +controlledvocabulary.language.P�v�=P�v� +controlledvocabulary.language.P�koot=P�koot +controlledvocabulary.language.Pli=P?li +controlledvocabulary.language.Q'anjob'al=Q'anjob'al +controlledvocabulary.language.Qabiao=Qabiao +controlledvocabulary.language.Qaqet=Qaqet +controlledvocabulary.language.Qashqa'i=Qashqa'i +controlledvocabulary.language.Qatabanian=Qatabanian +controlledvocabulary.language.Qau=Qau +controlledvocabulary.language.Qawasqar=Qawasqar +controlledvocabulary.language.Qila_Muji=Qila Muji +controlledvocabulary.language.Qimant=Qimant +controlledvocabulary.language.Qiubei_Zhuang=Qiubei Zhuang +controlledvocabulary.language.Quapaw=Quapaw +controlledvocabulary.language.Quebec_Sign_Language=Quebec Sign Language +controlledvocabulary.language.Quechan=Quechan +controlledvocabulary.language.Quechua=Quechua +controlledvocabulary.language.Quenya=Quenya +controlledvocabulary.language.Quer�taro_Otomi=Quer�taro Otomi +controlledvocabulary.language.Quetzaltepec_Mixe=Quetzaltepec Mixe +controlledvocabulary.language.Queyu=Queyu +controlledvocabulary.language.Quiavicuzas_Zapotec=Quiavicuzas Zapotec +controlledvocabulary.language.Quileute=Quileute +controlledvocabulary.language.Quinault=Quinault +controlledvocabulary.language.Quinqui=Quinqui +controlledvocabulary.language.Quioquitani-Quier�_Zapotec=Quioquitani-Quier� Zapotec +controlledvocabulary.language.Quiotepec_Chinantec=Quiotepec Chinantec +controlledvocabulary.language.Quiripi=Quiripi +controlledvocabulary.language.Rabha=Rabha +controlledvocabulary.language.Rade=Rade +controlledvocabulary.language.Raetic=Raetic +controlledvocabulary.language.Rahambuu=Rahambuu +controlledvocabulary.language.Rajah_Kabunsuwan_Manobo=Rajah Kabunsuwan Manobo +controlledvocabulary.language.Rajasthani=Rajasthani +controlledvocabulary.language.Rajbanshi=Rajbanshi +controlledvocabulary.language.Raji=Raji +controlledvocabulary.language.Rajong=Rajong +controlledvocabulary.language.Rajput_Garasia=Rajput Garasia +controlledvocabulary.language.Rakahanga-Manihiki=Rakahanga-Manihiki +controlledvocabulary.language.Rakhine=Rakhine +controlledvocabulary.language.Ralte=Ralte +controlledvocabulary.language.Rama=Rama +controlledvocabulary.language.Ramoaaina=Ramoaaina +controlledvocabulary.language.Ramopa=Ramopa +controlledvocabulary.language.Rampi=Rampi +controlledvocabulary.language.Rana_Tharu=Rana Tharu +controlledvocabulary.language.Rang=Rang +controlledvocabulary.language.Rangi=Rangi +controlledvocabulary.language.Rangkas=Rangkas +controlledvocabulary.language.Ranglong=Ranglong +controlledvocabulary.language.Rangpuri=Rangpuri +controlledvocabulary.language.Rao=Rao +controlledvocabulary.language.Rapa=Rapa +controlledvocabulary.language.Rapanui=Rapanui +controlledvocabulary.language.Rapoisi=Rapoisi +controlledvocabulary.language.Rapting=Rapting +controlledvocabulary.language.Rara_Bakati'=Rara Bakati' +controlledvocabulary.language.Rarotongan=Rarotongan +controlledvocabulary.language.Rasawa=Rasawa +controlledvocabulary.language.Ratagnon=Ratagnon +controlledvocabulary.language.Ratahan=Ratahan +controlledvocabulary.language.Rathawi=Rathawi +controlledvocabulary.language.Rathwi_Bareli=Rathwi Bareli +controlledvocabulary.language.Raute=Raute +controlledvocabulary.language.Ravula=Ravula +controlledvocabulary.language.Rawa=Rawa +controlledvocabulary.language.Rawang=Rawang +controlledvocabulary.language.Rawat=Rawat +controlledvocabulary.language.Rawngtu_Chin=Rawngtu Chin +controlledvocabulary.language.Rawo=Rawo +controlledvocabulary.language.Ray�n_Zoque=Ray�n Zoque +controlledvocabulary.language.Razajerdi=Razajerdi +controlledvocabulary.language.Red_Gelao=Red Gelao +controlledvocabulary.language.Reel=Reel +controlledvocabulary.language.Rejang=Rejang +controlledvocabulary.language.Rejang_Kayan=Rejang Kayan +controlledvocabulary.language.Reli=Reli +controlledvocabulary.language.Rema=Rema +controlledvocabulary.language.Rembarrnga=Rembarrnga +controlledvocabulary.language.Rembong=Rembong +controlledvocabulary.language.Remo=Remo +controlledvocabulary.language.Remontado_Dumagat=Remontado Dumagat +controlledvocabulary.language.Rempi=Rempi +controlledvocabulary.language.Remun=Remun +controlledvocabulary.language.Rendille=Rendille +controlledvocabulary.language.Rengao=Rengao +controlledvocabulary.language.Rennell-Bellona=Rennell-Bellona +controlledvocabulary.language.Repanbitip=Repanbitip +controlledvocabulary.language.Rer_Bare=Rer Bare +controlledvocabulary.language.Rerau=Rerau +controlledvocabulary.language.Rerep=Rerep +controlledvocabulary.language.Reshe=Reshe +controlledvocabulary.language.Res�garo=Res�garo +controlledvocabulary.language.Retta=Retta +controlledvocabulary.language.Reyesano=Reyesano +controlledvocabulary.language.Riang_(India)=Riang (India) +controlledvocabulary.language.Riang_Lai=Riang Lai +controlledvocabulary.language.Riang_Lang=Riang Lang +controlledvocabulary.language.Riantana=Riantana +controlledvocabulary.language.Ribun=Ribun +controlledvocabulary.language.Rigwe=Rigwe +controlledvocabulary.language.Rikbaktsa=Rikbaktsa +controlledvocabulary.language.Rinconada_Bikol=Rinconada Bikol +controlledvocabulary.language.Rinc�n_Zapotec=Rinc�n Zapotec +controlledvocabulary.language.Ringgou=Ringgou +controlledvocabulary.language.Ririo=Ririo +controlledvocabulary.language.Rishiwa=Rishiwa +controlledvocabulary.language.Ritharrngu=Ritharrngu +controlledvocabulary.language.Riung=Riung +controlledvocabulary.language.Riverain_Sango=Riverain Sango +controlledvocabulary.language.Rmeet=Rmeet +controlledvocabulary.language.Rogo=Rogo +controlledvocabulary.language.Rohingya=Rohingya +controlledvocabulary.language.Roma=Roma +controlledvocabulary.language.Romagnol=Romagnol +controlledvocabulary.language.Romam=Romam +controlledvocabulary.language.Romanian=Romanian +controlledvocabulary.language.Romanian_Sign_Language=Romanian Sign Language +controlledvocabulary.language.Romano-Greek=Romano-Greek +controlledvocabulary.language.Romano-Serbian=Romano-Serbian +controlledvocabulary.language.Romanova=Romanova +controlledvocabulary.language.Romansh=Romansh +controlledvocabulary.language.Romany=Romany +controlledvocabulary.language.Romblomanon=Romblomanon +controlledvocabulary.language.Rombo=Rombo +controlledvocabulary.language.Romkun=Romkun +controlledvocabulary.language.Ron=Ron +controlledvocabulary.language.Ronga=Ronga +controlledvocabulary.language.Rongga=Rongga +controlledvocabulary.language.Rongmei_Naga=Rongmei Naga +controlledvocabulary.language.Rongpo=Rongpo +controlledvocabulary.language.Ronji=Ronji +controlledvocabulary.language.Roon=Roon +controlledvocabulary.language.Roria=Roria +controlledvocabulary.language.Rotokas=Rotokas +controlledvocabulary.language.Rotuman=Rotuman +controlledvocabulary.language.Roviana=Roviana +controlledvocabulary.language.Ruching_Palaung=Ruching Palaung +controlledvocabulary.language.Rudbari=Rudbari +controlledvocabulary.language.Rufiji=Rufiji +controlledvocabulary.language.Ruga=Ruga +controlledvocabulary.language.Rukai=Rukai +controlledvocabulary.language.Ruma=Ruma +controlledvocabulary.language.Rumai_Palaung=Rumai Palaung +controlledvocabulary.language.Rumu=Rumu +controlledvocabulary.language.Runga=Runga +controlledvocabulary.language.Rungtu_Chin=Rungtu Chin +controlledvocabulary.language.Rungus=Rungus +controlledvocabulary.language.Rungwa=Rungwa +controlledvocabulary.language.Russia_Buriat=Russia Buriat +controlledvocabulary.language.Russian=Russian +controlledvocabulary.language.Russian_Sign_Language=Russian Sign Language +controlledvocabulary.language.Rusyn=Rusyn +controlledvocabulary.language.Ruthenian=Ruthenian +controlledvocabulary.language.Rutul=Rutul +controlledvocabulary.language.Ruuli=Ruuli +controlledvocabulary.language.Ruund=Ruund +controlledvocabulary.language.Ruwila=Ruwila +controlledvocabulary.language.Rwa=Rwa +controlledvocabulary.language.Rwandan_Sign_Language=Rwandan Sign Language +controlledvocabulary.language.R�union_Creole_French=R�union Creole French +controlledvocabulary.language.Rzi=R?zi?? +controlledvocabulary.language.S'gaw_Karen=S'gaw Karen +controlledvocabulary.language.Sa=Sa +controlledvocabulary.language.Sa'a=Sa'a +controlledvocabulary.language.Sa'ban=Sa'ban +controlledvocabulary.language.Sa'och=Sa'och +controlledvocabulary.language.Saafi-Saafi=Saafi-Saafi +controlledvocabulary.language.Saam=Saam +controlledvocabulary.language.Saamia=Saamia +controlledvocabulary.language.Saaroa=Saaroa +controlledvocabulary.language.Saba=Saba +controlledvocabulary.language.Sabaean=Sabaean +controlledvocabulary.language.Sabah_Bisaya=Sabah Bisaya +controlledvocabulary.language.Sabah_Malay=Sabah Malay +controlledvocabulary.language.Saban�=Saban� +controlledvocabulary.language.Sabaot=Sabaot +controlledvocabulary.language.Sabine=Sabine +controlledvocabulary.language.Sabu=Sabu +controlledvocabulary.language.Sab�m=Sab�m +controlledvocabulary.language.Sacapulteco=Sacapulteco +controlledvocabulary.language.Sadri=Sadri +controlledvocabulary.language.Saek=Saek +controlledvocabulary.language.Saep=Saep +controlledvocabulary.language.Safaliba=Safaliba +controlledvocabulary.language.Safeyoka=Safeyoka +controlledvocabulary.language.Safwa=Safwa +controlledvocabulary.language.Sagala=Sagala +controlledvocabulary.language.Sagalla=Sagalla +controlledvocabulary.language.Saho=Saho +controlledvocabulary.language.Sahu=Sahu +controlledvocabulary.language.Saidi_Arabic=Saidi Arabic +controlledvocabulary.language.Saint_Lucian_Creole_French=Saint Lucian Creole French +controlledvocabulary.language.Saisiyat=Saisiyat +controlledvocabulary.language.Sajalong=Sajalong +controlledvocabulary.language.Sajau_Basap=Sajau Basap +controlledvocabulary.language.Sakachep=Sakachep +controlledvocabulary.language.Sakalava_Malagasy=Sakalava Malagasy +controlledvocabulary.language.Sakao=Sakao +controlledvocabulary.language.Sakata=Sakata +controlledvocabulary.language.Sake=Sake +controlledvocabulary.language.Sakirabi�=Sakirabi� +controlledvocabulary.language.Sakizaya=Sakizaya +controlledvocabulary.language.Sala=Sala +controlledvocabulary.language.Salampasu=Salampasu +controlledvocabulary.language.Salar=Salar +controlledvocabulary.language.Salas=Salas +controlledvocabulary.language.Salasaca_Highland_Quichua=Salasaca Highland Quichua +controlledvocabulary.language.Salawati=Salawati +controlledvocabulary.language.Saleman=Saleman +controlledvocabulary.language.Saliba=Saliba +controlledvocabulary.language.Salinan=Salinan +controlledvocabulary.language.Sallands=Sallands +controlledvocabulary.language.Salt-Yui=Salt-Yui +controlledvocabulary.language.Saluan=Saluan +controlledvocabulary.language.Salum�=Salum� +controlledvocabulary.language.Salvadoran_Sign_Language=Salvadoran Sign Language +controlledvocabulary.language.Sam=Sam +controlledvocabulary.language.Samaritan=Samaritan +controlledvocabulary.language.Samaritan_Aramaic=Samaritan Aramaic +controlledvocabulary.language.Samarokena=Samarokena +controlledvocabulary.language.Samatao=Samatao +controlledvocabulary.language.Samay=Samay +controlledvocabulary.language.Samba=Samba +controlledvocabulary.language.Samba_Daka=Samba Daka +controlledvocabulary.language.Samba_Leko=Samba Leko +controlledvocabulary.language.Sambal=Sambal +controlledvocabulary.language.Sambalpuri=Sambalpuri +controlledvocabulary.language.Sambe=Sambe +controlledvocabulary.language.Samberigi=Samberigi +controlledvocabulary.language.Samburu=Samburu +controlledvocabulary.language.Samei=Samei +controlledvocabulary.language.Samo=Samo +controlledvocabulary.language.Samoan=Samoan +controlledvocabulary.language.Samogitian=Samogitian +controlledvocabulary.language.Samosa=Samosa +controlledvocabulary.language.Sampang=Sampang +controlledvocabulary.language.Samre=Samre +controlledvocabulary.language.Samtao=Samtao +controlledvocabulary.language.Samvedi=Samvedi +controlledvocabulary.language.San_Agust�n_Mixtepec_Zapotec=San Agust�n Mixtepec Zapotec +controlledvocabulary.language.San_Baltazar_Loxicha_Zapotec=San Baltazar Loxicha Zapotec +controlledvocabulary.language.San_Blas_Kuna=San Blas Kuna +controlledvocabulary.language.San_Dionisio_Del_Mar_Huave=San Dionisio Del Mar Huave +controlledvocabulary.language.San_Felipe_Otlaltepec_Popoloca=San Felipe Otlaltepec Popoloca +controlledvocabulary.language.San_Francisco_Del_Mar_Huave=San Francisco Del Mar Huave +controlledvocabulary.language.San_Francisco_Matlatzinca=San Francisco Matlatzinca +controlledvocabulary.language.San_Jer�nimo_Tec�atl_Mazatec=San Jer�nimo Tec�atl Mazatec +controlledvocabulary.language.San_Juan_Atzingo_Popoloca=San Juan Atzingo Popoloca +controlledvocabulary.language.San_Juan_Colorado_Mixtec=San Juan Colorado Mixtec +controlledvocabulary.language.San_Juan_Teita_Mixtec=San Juan Teita Mixtec +controlledvocabulary.language.San_Lu�s_Temalacayuca_Popoloca=San Lu�s Temalacayuca Popoloca +controlledvocabulary.language.San_Marcos_Tlacoyalco_Popoloca=San Marcos Tlacoyalco Popoloca +controlledvocabulary.language.San_Mart�n_Itunyoso_Triqui=San Mart�n Itunyoso Triqui +controlledvocabulary.language.San_Mart�n_Quechua=San Mart�n Quechua +controlledvocabulary.language.San_Mateo_Del_Mar_Huave=San Mateo Del Mar Huave +controlledvocabulary.language.San_Miguel_Creole_French=San Miguel Creole French +controlledvocabulary.language.San_Miguel_El_Grande_Mixtec=San Miguel El Grande Mixtec +controlledvocabulary.language.San_Miguel_Piedras_Mixtec=San Miguel Piedras Mixtec +controlledvocabulary.language.San_Pedro_Amuzgos_Amuzgo=San Pedro Amuzgos Amuzgo +controlledvocabulary.language.San_Pedro_Quiatoni_Zapotec=San Pedro Quiatoni Zapotec +controlledvocabulary.language.San_Salvador_Kongo=San Salvador Kongo +controlledvocabulary.language.San_Vicente_Coatl�n_Zapotec=San Vicente Coatl�n Zapotec +controlledvocabulary.language.Sanaani_Arabic=Sanaani Arabic +controlledvocabulary.language.Sanapan�=Sanapan� +controlledvocabulary.language.Sandawe=Sandawe +controlledvocabulary.language.Sanga_(Democratic_Republic_of_Congo)=Sanga (Democratic Republic of Congo) +controlledvocabulary.language.Sanga_(Nigeria)=Sanga (Nigeria) +controlledvocabulary.language.Sanggau=Sanggau +controlledvocabulary.language.Sangil=Sangil +controlledvocabulary.language.Sangir=Sangir +controlledvocabulary.language.Sangisari=Sangisari +controlledvocabulary.language.Sangkong=Sangkong +controlledvocabulary.language.Sanglechi=Sanglechi +controlledvocabulary.language.Sango=Sango +controlledvocabulary.language.Sangtam_Naga=Sangtam Naga +controlledvocabulary.language.Sangu_(Gabon)=Sangu (Gabon) +controlledvocabulary.language.Sangu_(Tanzania)=Sangu (Tanzania) +controlledvocabulary.language.Sani=Sani +controlledvocabulary.language.Sanie=Sanie +controlledvocabulary.language.Saniyo-Hiyewe=Saniyo-Hiyewe +controlledvocabulary.language.Sankaran_Maninka=Sankaran Maninka +controlledvocabulary.language.Sansi=Sansi +controlledvocabulary.language.Sanskrit_(Saskta)=Sanskrit (Sa?sk?ta) +controlledvocabulary.language.Santa_Ana_de_Tusi_Pasco_Quechua=Santa Ana de Tusi Pasco Quechua +controlledvocabulary.language.Santa_Catarina_Albarradas_Zapotec=Santa Catarina Albarradas Zapotec +controlledvocabulary.language.Santa_In�s_Ahuatempan_Popoloca=Santa In�s Ahuatempan Popoloca +controlledvocabulary.language.Santa_In�s_Yatzechi_Zapotec=Santa In�s Yatzechi Zapotec +controlledvocabulary.language.Santa_Luc�a_Monteverde_Mixtec=Santa Luc�a Monteverde Mixtec +controlledvocabulary.language.Santa_Mar�a_Del_Mar_Huave=Santa Mar�a Del Mar Huave +controlledvocabulary.language.Santa_Mar�a_La_Alta_Nahuatl=Santa Mar�a La Alta Nahuatl +controlledvocabulary.language.Santa_Mar�a_Quiegolani_Zapotec=Santa Mar�a Quiegolani Zapotec +controlledvocabulary.language.Santa_Mar�a_Zacatepec_Mixtec=Santa Mar�a Zacatepec Mixtec +controlledvocabulary.language.Santa_Teresa_Cora=Santa Teresa Cora +controlledvocabulary.language.Santali=Santali +controlledvocabulary.language.Santiago_Xanica_Zapotec=Santiago Xanica Zapotec +controlledvocabulary.language.Santiago_del_Estero_Quichua=Santiago del Estero Quichua +controlledvocabulary.language.Santo_Domingo_Albarradas_Zapotec=Santo Domingo Albarradas Zapotec +controlledvocabulary.language.Sanum�=Sanum� +controlledvocabulary.language.Saparua=Saparua +controlledvocabulary.language.Sapo=Sapo +controlledvocabulary.language.Saponi=Saponi +controlledvocabulary.language.Saposa=Saposa +controlledvocabulary.language.Sapuan=Sapuan +controlledvocabulary.language.Sap�=Sap� +controlledvocabulary.language.Sar=Sar +controlledvocabulary.language.Sara=Sara +controlledvocabulary.language.Sara_Kaba=Sara Kaba +controlledvocabulary.language.Sara_Kaba_Deme=Sara Kaba Deme +controlledvocabulary.language.Sara_Kaba_N��=Sara Kaba N�� +controlledvocabulary.language.Saraiki=Saraiki +controlledvocabulary.language.Saramaccan=Saramaccan +controlledvocabulary.language.Sarangani_Blaan=Sarangani Blaan +controlledvocabulary.language.Sarangani_Manobo=Sarangani Manobo +controlledvocabulary.language.Sarasira=Sarasira +controlledvocabulary.language.Saraveca=Saraveca +controlledvocabulary.language.Sardinian=Sardinian +controlledvocabulary.language.Sari=Sari +controlledvocabulary.language.Sarikoli=Sarikoli +controlledvocabulary.language.Sarli=Sarli +controlledvocabulary.language.Sarsi=Sarsi +controlledvocabulary.language.Sartang=Sartang +controlledvocabulary.language.Sarua=Sarua +controlledvocabulary.language.Sarudu=Sarudu +controlledvocabulary.language.Saruga=Saruga +controlledvocabulary.language.Sasak=Sasak +controlledvocabulary.language.Sasaru=Sasaru +controlledvocabulary.language.Sassarese_Sardinian=Sassarese Sardinian +controlledvocabulary.language.Satawalese=Satawalese +controlledvocabulary.language.Saterfriesisch=Saterfriesisch +controlledvocabulary.language.Sater�-Maw�=Sater�-Maw� +controlledvocabulary.language.Saudi_Arabian_Sign_Language=Saudi Arabian Sign Language +controlledvocabulary.language.Sauraseni_Prkrit=Sauraseni Pr?krit +controlledvocabulary.language.Saurashtra=Saurashtra +controlledvocabulary.language.Sauri=Sauri +controlledvocabulary.language.Sauria_Paharia=Sauria Paharia +controlledvocabulary.language.Sause=Sause +controlledvocabulary.language.Sausi=Sausi +controlledvocabulary.language.Savi=Savi +controlledvocabulary.language.Savosavo=Savosavo +controlledvocabulary.language.Sawai=Sawai +controlledvocabulary.language.Saweru=Saweru +controlledvocabulary.language.Sawi=Sawi +controlledvocabulary.language.Sawila=Sawila +controlledvocabulary.language.Sawknah=Sawknah +controlledvocabulary.language.Saxwe_Gbe=Saxwe Gbe +controlledvocabulary.language.Saya=Saya +controlledvocabulary.language.Sayula_Popoluca=Sayula Popoluca +controlledvocabulary.language.Scots=Scots +controlledvocabulary.language.Scythian=Scythian +controlledvocabulary.language.Sea_Island_Creole_English=Sea Island Creole English +controlledvocabulary.language.Seba=Seba +controlledvocabulary.language.Sebat_Bet_Gurage=Sebat Bet Gurage +controlledvocabulary.language.Seberuang=Seberuang +controlledvocabulary.language.Sebop=Sebop +controlledvocabulary.language.Sechelt=Sechelt +controlledvocabulary.language.Secoya=Secoya +controlledvocabulary.language.Sedang=Sedang +controlledvocabulary.language.Sediq=Sediq +controlledvocabulary.language.Sedoa=Sedoa +controlledvocabulary.language.Seeku=Seeku +controlledvocabulary.language.Segai=Segai +controlledvocabulary.language.Segeju=Segeju +controlledvocabulary.language.Seget=Seget +controlledvocabulary.language.Sehwi=Sehwi +controlledvocabulary.language.Seimat=Seimat +controlledvocabulary.language.Seit-Kaitetu=Seit-Kaitetu +controlledvocabulary.language.Sekani=Sekani +controlledvocabulary.language.Sekapan=Sekapan +controlledvocabulary.language.Sekar=Sekar +controlledvocabulary.language.Seke_(Nepal)=Seke (Nepal) +controlledvocabulary.language.Seke_(Vanuatu)=Seke (Vanuatu) +controlledvocabulary.language.Sekele=Sekele +controlledvocabulary.language.Seki=Seki +controlledvocabulary.language.Seko_Padang=Seko Padang +controlledvocabulary.language.Seko_Tengah=Seko Tengah +controlledvocabulary.language.Sekpele=Sekpele +controlledvocabulary.language.Selangor_Sign_Language=Selangor Sign Language +controlledvocabulary.language.Selaru=Selaru +controlledvocabulary.language.Selayar=Selayar +controlledvocabulary.language.Selee=Selee +controlledvocabulary.language.Selepet=Selepet +controlledvocabulary.language.Selian=Selian +controlledvocabulary.language.Selkup=Selkup +controlledvocabulary.language.Selungai_Murut=Selungai Murut +controlledvocabulary.language.Seluwasan=Seluwasan +controlledvocabulary.language.Semai=Semai +controlledvocabulary.language.Semandang=Semandang +controlledvocabulary.language.Semaq_Beri=Semaq Beri +controlledvocabulary.language.Sembakung_Murut=Sembakung Murut +controlledvocabulary.language.Semelai=Semelai +controlledvocabulary.language.Semimi=Semimi +controlledvocabulary.language.Semnam=Semnam +controlledvocabulary.language.Semnani=Semnani +controlledvocabulary.language.Sempan=Sempan +controlledvocabulary.language.Sena=Sena +controlledvocabulary.language.Senara_S�noufo=Senara S�noufo +controlledvocabulary.language.Senaya=Senaya +controlledvocabulary.language.Sene=Sene +controlledvocabulary.language.Seneca=Seneca +controlledvocabulary.language.Sened=Sened +controlledvocabulary.language.Sengele=Sengele +controlledvocabulary.language.Senggi=Senggi +controlledvocabulary.language.Sengo=Sengo +controlledvocabulary.language.Sengseng=Sengseng +controlledvocabulary.language.Senhaja_De_Srair=Senhaja De Srair +controlledvocabulary.language.Sensi=Sensi +controlledvocabulary.language.Sentani=Sentani +controlledvocabulary.language.Senthang_Chin=Senthang Chin +controlledvocabulary.language.Sentinel=Sentinel +controlledvocabulary.language.Sepa_(Indonesia)=Sepa (Indonesia) +controlledvocabulary.language.Sepa_(Papua_New_Guinea)=Sepa (Papua New Guinea) +controlledvocabulary.language.Sepik_Iwam=Sepik Iwam +controlledvocabulary.language.Sera=Sera +controlledvocabulary.language.Serbian=Serbian +controlledvocabulary.language.Serbo-Croatian=Serbo-Croatian +controlledvocabulary.language.Sere=Sere +controlledvocabulary.language.Serer=Serer +controlledvocabulary.language.Seri=Seri +controlledvocabulary.language.Serili=Serili +controlledvocabulary.language.Seroa=Seroa +controlledvocabulary.language.Serrano=Serrano +controlledvocabulary.language.Serua=Serua +controlledvocabulary.language.Serudung_Murut=Serudung Murut +controlledvocabulary.language.Serui-Laut=Serui-Laut +controlledvocabulary.language.Seselwa_Creole_French=Seselwa Creole French +controlledvocabulary.language.Seta=Seta +controlledvocabulary.language.Setaman=Setaman +controlledvocabulary.language.Seti=Seti +controlledvocabulary.language.Settla=Settla +controlledvocabulary.language.Severn_Ojibwa=Severn Ojibwa +controlledvocabulary.language.Sewa_Bay=Sewa Bay +controlledvocabulary.language.Seychelles_Sign_Language=Seychelles Sign Language +controlledvocabulary.language.Seze=Seze +controlledvocabulary.language.Sha=Sha +controlledvocabulary.language.Shabak=Shabak +controlledvocabulary.language.Shahmirzadi=Shahmirzadi +controlledvocabulary.language.Shahrudi=Shahrudi +controlledvocabulary.language.Shall-Zwall=Shall-Zwall +controlledvocabulary.language.Shama-Sambuga=Shama-Sambuga +controlledvocabulary.language.Shamang=Shamang +controlledvocabulary.language.Shambala=Shambala +controlledvocabulary.language.Shan=Shan +controlledvocabulary.language.Shanenawa=Shanenawa +controlledvocabulary.language.Shanga=Shanga +controlledvocabulary.language.Sharanahua=Sharanahua +controlledvocabulary.language.Shark_Bay=Shark Bay +controlledvocabulary.language.Sharwa=Sharwa +controlledvocabulary.language.Shasta=Shasta +controlledvocabulary.language.Shatt=Shatt +controlledvocabulary.language.Shau=Shau +controlledvocabulary.language.Shawnee=Shawnee +controlledvocabulary.language.She=She +controlledvocabulary.language.Shehri=Shehri +controlledvocabulary.language.Shekhawati=Shekhawati +controlledvocabulary.language.Shekkacho=Shekkacho +controlledvocabulary.language.Sheko=Sheko +controlledvocabulary.language.Shelta=Shelta +controlledvocabulary.language.Shempire_Senoufo=Shempire Senoufo +controlledvocabulary.language.Shendu=Shendu +controlledvocabulary.language.Sheni=Sheni +controlledvocabulary.language.Sherbro=Sherbro +controlledvocabulary.language.Sherdukpen=Sherdukpen +controlledvocabulary.language.Sherpa=Sherpa +controlledvocabulary.language.Sheshi_Kham=Sheshi Kham +controlledvocabulary.language.Shi=Shi +controlledvocabulary.language.Shihhi_Arabic=Shihhi Arabic +controlledvocabulary.language.Shiki=Shiki +controlledvocabulary.language.Shilluk=Shilluk +controlledvocabulary.language.Shina=Shina +controlledvocabulary.language.Shipibo-Conibo=Shipibo-Conibo +controlledvocabulary.language.Sholaga=Sholaga +controlledvocabulary.language.Shom_Peng=Shom Peng +controlledvocabulary.language.Shona=Shona +controlledvocabulary.language.Shoo-Minda-Nye=Shoo-Minda-Nye +controlledvocabulary.language.Shor=Shor +controlledvocabulary.language.Shoshoni=Shoshoni +controlledvocabulary.language.Shua=Shua +controlledvocabulary.language.Shuadit=Shuadit +controlledvocabulary.language.Shuar=Shuar +controlledvocabulary.language.Shubi=Shubi +controlledvocabulary.language.Shughni=Shughni +controlledvocabulary.language.Shuhi=Shuhi +controlledvocabulary.language.Shumashti=Shumashti +controlledvocabulary.language.Shumcho=Shumcho +controlledvocabulary.language.Shuswap=Shuswap +controlledvocabulary.language.Shwai=Shwai +controlledvocabulary.language.Shwe_Palaung=Shwe Palaung +controlledvocabulary.language.Sialum=Sialum +controlledvocabulary.language.Siamou=Siamou +controlledvocabulary.language.Sian=Sian +controlledvocabulary.language.Siane=Siane +controlledvocabulary.language.Siang=Siang +controlledvocabulary.language.Siar-Lak=Siar-Lak +controlledvocabulary.language.Siawi=Siawi +controlledvocabulary.language.Sibe=Sibe +controlledvocabulary.language.Siberian_Tatar=Siberian Tatar +controlledvocabulary.language.Sibu_Melanau=Sibu Melanau +controlledvocabulary.language.Sicanian=Sicanian +controlledvocabulary.language.Sicel=Sicel +controlledvocabulary.language.Sicilian=Sicilian +controlledvocabulary.language.Siculo_Arabic=Siculo Arabic +controlledvocabulary.language.Sidamo=Sidamo +controlledvocabulary.language.Sidetic=Sidetic +controlledvocabulary.language.Sie=Sie +controlledvocabulary.language.Sierra_Leone_Sign_Language=Sierra Leone Sign Language +controlledvocabulary.language.Sierra_Negra_Nahuatl=Sierra Negra Nahuatl +controlledvocabulary.language.Sierra_de_Ju�rez_Zapotec=Sierra de Ju�rez Zapotec +controlledvocabulary.language.Sighu=Sighu +controlledvocabulary.language.Sihan=Sihan +controlledvocabulary.language.Sihuas_Ancash_Quechua=Sihuas Ancash Quechua +controlledvocabulary.language.Sika=Sika +controlledvocabulary.language.Sikaiana=Sikaiana +controlledvocabulary.language.Sikaritai=Sikaritai +controlledvocabulary.language.Sikiana=Sikiana +controlledvocabulary.language.Sikkimese=Sikkimese +controlledvocabulary.language.Siksika=Siksika +controlledvocabulary.language.Sikule=Sikule +controlledvocabulary.language.Sila=Sila +controlledvocabulary.language.Silacayoapan_Mixtec=Silacayoapan Mixtec +controlledvocabulary.language.Sileibi=Sileibi +controlledvocabulary.language.Silesian=Silesian +controlledvocabulary.language.Silimo=Silimo +controlledvocabulary.language.Siliput=Siliput +controlledvocabulary.language.Silopi=Silopi +controlledvocabulary.language.Silt'e=Silt'e +controlledvocabulary.language.Simaa=Simaa +controlledvocabulary.language.Simba=Simba +controlledvocabulary.language.Simbali=Simbali +controlledvocabulary.language.Simbari=Simbari +controlledvocabulary.language.Simbo=Simbo +controlledvocabulary.language.Simeku=Simeku +controlledvocabulary.language.Simeulue=Simeulue +controlledvocabulary.language.Simte=Simte +controlledvocabulary.language.Sinagen=Sinagen +controlledvocabulary.language.Sinasina=Sinasina +controlledvocabulary.language.Sinaugoro=Sinaugoro +controlledvocabulary.language.Sindarin=Sindarin +controlledvocabulary.language.Sindhi=Sindhi +controlledvocabulary.language.Sindhi_Bhil=Sindhi Bhil +controlledvocabulary.language.Sindihui_Mixtec=Sindihui Mixtec +controlledvocabulary.language.Singa=Singa +controlledvocabulary.language.Singapore_Sign_Language=Singapore Sign Language +controlledvocabulary.language.Singpho=Singpho +controlledvocabulary.language.Sinhala,_Sinhalese=Sinhala, Sinhalese +controlledvocabulary.language.Sinicahua_Mixtec=Sinicahua Mixtec +controlledvocabulary.language.Sininkere=Sininkere +controlledvocabulary.language.Sinte_Romani=Sinte Romani +controlledvocabulary.language.Sinyar=Sinyar +controlledvocabulary.language.Sio=Sio +controlledvocabulary.language.Siona=Siona +controlledvocabulary.language.Sipacapense=Sipacapense +controlledvocabulary.language.Sira=Sira +controlledvocabulary.language.Siraya=Siraya +controlledvocabulary.language.Sirenik_Yupik=Sirenik Yupik +controlledvocabulary.language.Siri=Siri +controlledvocabulary.language.Siriano=Siriano +controlledvocabulary.language.Sirion�=Sirion� +controlledvocabulary.language.Sirmauri=Sirmauri +controlledvocabulary.language.Siroi=Siroi +controlledvocabulary.language.Sissala=Sissala +controlledvocabulary.language.Sissano=Sissano +controlledvocabulary.language.Siuslaw=Siuslaw +controlledvocabulary.language.Sivandi=Sivandi +controlledvocabulary.language.Sivia_Sign_Language=Sivia Sign Language +controlledvocabulary.language.Siwai=Siwai +controlledvocabulary.language.Siwi=Siwi +controlledvocabulary.language.Siwu=Siwu +controlledvocabulary.language.Siyin_Chin=Siyin Chin +controlledvocabulary.language.Skagit=Skagit +controlledvocabulary.language.Skalvian=Skalvian +controlledvocabulary.language.Skepi_Creole_Dutch=Skepi Creole Dutch +controlledvocabulary.language.Skolt_Sami=Skolt Sami +controlledvocabulary.language.Skou=Skou +controlledvocabulary.language.Slave_(Athapascan)=Slave (Athapascan) +controlledvocabulary.language.Slavomolisano=Slavomolisano +controlledvocabulary.language.Slovak=Slovak +controlledvocabulary.language.Slovakian_Sign_Language=Slovakian Sign Language +controlledvocabulary.language.Slovenian=Slovenian +controlledvocabulary.language.Small_Flowery_Miao=Small Flowery Miao +controlledvocabulary.language.Sm�rky_Kanum=Sm�rky Kanum +controlledvocabulary.language.Snohomish=Snohomish +controlledvocabulary.language.So_(Democratic_Republic_of_Congo)=So (Democratic Republic of Congo) +controlledvocabulary.language.So'a=So'a +controlledvocabulary.language.Sobei=Sobei +controlledvocabulary.language.Sochiapam_Chinantec=Sochiapam Chinantec +controlledvocabulary.language.Soga=Soga +controlledvocabulary.language.Sogdian=Sogdian +controlledvocabulary.language.Soi=Soi +controlledvocabulary.language.Sokoro=Sokoro +controlledvocabulary.language.Solano=Solano +controlledvocabulary.language.Soli=Soli +controlledvocabulary.language.Solomon_Islands_Sign_Language=Solomon Islands Sign Language +controlledvocabulary.language.Solong=Solong +controlledvocabulary.language.Solos=Solos +controlledvocabulary.language.Som=Som +controlledvocabulary.language.Somali=Somali +controlledvocabulary.language.Somba-Siawari=Somba-Siawari +controlledvocabulary.language.Somrai=Somrai +controlledvocabulary.language.Somray=Somray +controlledvocabulary.language.Somyev=Somyev +controlledvocabulary.language.Sonaga=Sonaga +controlledvocabulary.language.Sonde=Sonde +controlledvocabulary.language.Songe=Songe +controlledvocabulary.language.Songlai_Chin=Songlai Chin +controlledvocabulary.language.Songo=Songo +controlledvocabulary.language.Songomeno=Songomeno +controlledvocabulary.language.Songoora=Songoora +controlledvocabulary.language.Sonha=Sonha +controlledvocabulary.language.Sonia=Sonia +controlledvocabulary.language.Soninke=Soninke +controlledvocabulary.language.Sonsorol=Sonsorol +controlledvocabulary.language.Soo=Soo +controlledvocabulary.language.Sop=Sop +controlledvocabulary.language.Soqotri=Soqotri +controlledvocabulary.language.Sora=Sora +controlledvocabulary.language.Sori-Harengan=Sori-Harengan +controlledvocabulary.language.Sorkhei=Sorkhei +controlledvocabulary.language.Sorothaptic=Sorothaptic +controlledvocabulary.language.Sorsogon_Ayta=Sorsogon Ayta +controlledvocabulary.language.Sos_Kundi=Sos Kundi +controlledvocabulary.language.Sota_Kanum=Sota Kanum +controlledvocabulary.language.Sou=Sou +controlledvocabulary.language.Sou_Nama=Sou Nama +controlledvocabulary.language.Sou_Upaa=Sou Upaa +controlledvocabulary.language.South_African_Sign_Language=South African Sign Language +controlledvocabulary.language.South_Awyu=South Awyu +controlledvocabulary.language.South_Azerbaijani=South Azerbaijani +controlledvocabulary.language.South_Bolivian_Quechua=South Bolivian Quechua +controlledvocabulary.language.South_Central_Banda=South Central Banda +controlledvocabulary.language.South_Central_Dinka=South Central Dinka +controlledvocabulary.language.South_Efate=South Efate +controlledvocabulary.language.South_Fali=South Fali +controlledvocabulary.language.South_Giziga=South Giziga +controlledvocabulary.language.South_Lembata=South Lembata +controlledvocabulary.language.South_Marquesan=South Marquesan +controlledvocabulary.language.South_Muyu=South Muyu +controlledvocabulary.language.South_Nuaulu=South Nuaulu +controlledvocabulary.language.South_Picene=South Picene +controlledvocabulary.language.South_Slavey=South Slavey +controlledvocabulary.language.South_Tairora=South Tairora +controlledvocabulary.language.South_Ucayali_Ash�ninka=South Ucayali Ash�ninka +controlledvocabulary.language.South_Watut=South Watut +controlledvocabulary.language.South_West_Bay=South West Bay +controlledvocabulary.language.Southeast_Ambrym=Southeast Ambrym +controlledvocabulary.language.Southeast_Babar=Southeast Babar +controlledvocabulary.language.Southeast_Ijo=Southeast Ijo +controlledvocabulary.language.Southeast_Pashai=Southeast Pashai +controlledvocabulary.language.Southeast_Tasmanian=Southeast Tasmanian +controlledvocabulary.language.Southeastern_Dinka=Southeastern Dinka +controlledvocabulary.language.Southeastern_Ixtl�n_Zapotec=Southeastern Ixtl�n Zapotec +controlledvocabulary.language.Southeastern_Kolami=Southeastern Kolami +controlledvocabulary.language.Southeastern_Nochixtl�n_Mixtec=Southeastern Nochixtl�n Mixtec +controlledvocabulary.language.Southeastern_Pomo=Southeastern Pomo +controlledvocabulary.language.Southeastern_Puebla_Nahuatl=Southeastern Puebla Nahuatl +controlledvocabulary.language.Southeastern_Tarahumara=Southeastern Tarahumara +controlledvocabulary.language.Southeastern_Tepehuan=Southeastern Tepehuan +controlledvocabulary.language.Southern_Alta=Southern Alta +controlledvocabulary.language.Southern_Altai=Southern Altai +controlledvocabulary.language.Southern_Amami-Oshima=Southern Amami-Oshima +controlledvocabulary.language.Southern_Aymara=Southern Aymara +controlledvocabulary.language.Southern_Bai=Southern Bai +controlledvocabulary.language.Southern_Balochi=Southern Balochi +controlledvocabulary.language.Southern_Betsimisaraka_Malagasy=Southern Betsimisaraka Malagasy +controlledvocabulary.language.Southern_Binukidnon=Southern Binukidnon +controlledvocabulary.language.Southern_Birifor=Southern Birifor +controlledvocabulary.language.Southern_Bobo_Madar�=Southern Bobo Madar� +controlledvocabulary.language.Southern_Bontok=Southern Bontok +controlledvocabulary.language.Southern_Carrier=Southern Carrier +controlledvocabulary.language.Southern_Catanduanes_Bikol=Southern Catanduanes Bikol +controlledvocabulary.language.Southern_Conchucos_Ancash_Quechua=Southern Conchucos Ancash Quechua +controlledvocabulary.language.Southern_Dagaare=Southern Dagaare +controlledvocabulary.language.Southern_Dong=Southern Dong +controlledvocabulary.language.Southern_East_Cree=Southern East Cree +controlledvocabulary.language.Southern_Ghale=Southern Ghale +controlledvocabulary.language.Southern_Grebo=Southern Grebo +controlledvocabulary.language.Southern_Guiyang_Hmong=Southern Guiyang Hmong +controlledvocabulary.language.Southern_Haida=Southern Haida +controlledvocabulary.language.Southern_Hindko=Southern Hindko +controlledvocabulary.language.Southern_Kalapuya=Southern Kalapuya +controlledvocabulary.language.Southern_Kalinga=Southern Kalinga +controlledvocabulary.language.Southern_Katang=Southern Katang +controlledvocabulary.language.Southern_Kisi=Southern Kisi +controlledvocabulary.language.Southern_Kiwai=Southern Kiwai +controlledvocabulary.language.Southern_Kurdish=Southern Kurdish +controlledvocabulary.language.Southern_Lolopo=Southern Lolopo +controlledvocabulary.language.Southern_Luri=Southern Luri +controlledvocabulary.language.Southern_Ma'di=Southern Ma'di +controlledvocabulary.language.Southern_Mashan_Hmong=Southern Mashan Hmong +controlledvocabulary.language.Southern_Mnong=Southern Mnong +controlledvocabulary.language.Southern_Muji=Southern Muji +controlledvocabulary.language.Southern_Nago=Southern Nago +controlledvocabulary.language.Southern_Nambiku�ra=Southern Nambiku�ra +controlledvocabulary.language.Southern_Ndebele=Southern Ndebele +controlledvocabulary.language.Southern_Ngbandi=Southern Ngbandi +controlledvocabulary.language.Southern_Nicobarese=Southern Nicobarese +controlledvocabulary.language.Southern_Nisu=Southern Nisu +controlledvocabulary.language.Southern_Nuni=Southern Nuni +controlledvocabulary.language.Southern_Ohlone=Southern Ohlone +controlledvocabulary.language.Southern_One=Southern One +controlledvocabulary.language.Southern_Pame=Southern Pame +controlledvocabulary.language.Southern_Pashto=Southern Pashto +controlledvocabulary.language.Southern_Pastaza_Quechua=Southern Pastaza Quechua +controlledvocabulary.language.Southern_Ping_Chinese=Southern Ping Chinese +controlledvocabulary.language.Southern_Pomo=Southern Pomo +controlledvocabulary.language.Southern_Puebla_Mixtec=Southern Puebla Mixtec +controlledvocabulary.language.Southern_Puget_Sound_Salish=Southern Puget Sound Salish +controlledvocabulary.language.Southern_Pumi=Southern Pumi +controlledvocabulary.language.Southern_Qiandong_Miao=Southern Qiandong Miao +controlledvocabulary.language.Southern_Qiang=Southern Qiang +controlledvocabulary.language.Southern_Rengma_Naga=Southern Rengma Naga +controlledvocabulary.language.Southern_Rincon_Zapotec=Southern Rincon Zapotec +controlledvocabulary.language.Southern_Roglai=Southern Roglai +controlledvocabulary.language.Southern_Sama=Southern Sama +controlledvocabulary.language.Southern_Sami=Southern Sami +controlledvocabulary.language.Southern_Samo=Southern Samo +controlledvocabulary.language.Southern_Sierra_Miwok=Southern Sierra Miwok +controlledvocabulary.language.Southern_Sorsoganon=Southern Sorsoganon +controlledvocabulary.language.Southern_Sotho=Southern Sotho +controlledvocabulary.language.Southern_Subanen=Southern Subanen +controlledvocabulary.language.Southern_Thai=Southern Thai +controlledvocabulary.language.Southern_Tidung=Southern Tidung +controlledvocabulary.language.Southern_Tiwa=Southern Tiwa +controlledvocabulary.language.Southern_Toussian=Southern Toussian +controlledvocabulary.language.Southern_Tujia=Southern Tujia +controlledvocabulary.language.Southern_Tutchone=Southern Tutchone +controlledvocabulary.language.Southern_Uzbek=Southern Uzbek +controlledvocabulary.language.Southern_Yamphu=Southern Yamphu +controlledvocabulary.language.Southern_Yukaghir=Southern Yukaghir +controlledvocabulary.language.Southwest_Gbaya=Southwest Gbaya +controlledvocabulary.language.Southwest_Palawano=Southwest Palawano +controlledvocabulary.language.Southwest_Pashai=Southwest Pashai +controlledvocabulary.language.Southwest_Tanna=Southwest Tanna +controlledvocabulary.language.Southwestern_Bontok=Southwestern Bontok +controlledvocabulary.language.Southwestern_Dinka=Southwestern Dinka +controlledvocabulary.language.Southwestern_Fars=Southwestern Fars +controlledvocabulary.language.Southwestern_Guiyang_Hmong=Southwestern Guiyang Hmong +controlledvocabulary.language.Southwestern_Huishui_Hmong=Southwestern Huishui Hmong +controlledvocabulary.language.Southwestern_Nisu=Southwestern Nisu +controlledvocabulary.language.Southwestern_Tarahumara=Southwestern Tarahumara +controlledvocabulary.language.Southwestern_Tasmanian=Southwestern Tasmanian +controlledvocabulary.language.Southwestern_Tepehuan=Southwestern Tepehuan +controlledvocabulary.language.Southwestern_Tlaxiaco_Mixtec=Southwestern Tlaxiaco Mixtec +controlledvocabulary.language.Sowa=Sowa +controlledvocabulary.language.Sowanda=Sowanda +controlledvocabulary.language.Soyaltepec_Mazatec=Soyaltepec Mazatec +controlledvocabulary.language.Soyaltepec_Mixtec=Soyaltepec Mixtec +controlledvocabulary.language.Spanish_Sign_Language=Spanish Sign Language +controlledvocabulary.language.Spanish,_Castilian=Spanish, Castilian +controlledvocabulary.language.Spiti_Bhoti=Spiti Bhoti +controlledvocabulary.language.Spokane=Spokane +controlledvocabulary.language.Squamish=Squamish +controlledvocabulary.language.Sranan_Tongo=Sranan Tongo +controlledvocabulary.language.Sri_Lankan_Creole_Malay=Sri Lankan Creole Malay +controlledvocabulary.language.Sri_Lankan_Sign_Language=Sri Lankan Sign Language +controlledvocabulary.language.Standard_Arabic=Standard Arabic +controlledvocabulary.language.Standard_Estonian=Standard Estonian +controlledvocabulary.language.Standard_Latvian=Standard Latvian +controlledvocabulary.language.Standard_Malay=Standard Malay +controlledvocabulary.language.Standard_Moroccan_Tamazight=Standard Moroccan Tamazight +controlledvocabulary.language.Stellingwerfs=Stellingwerfs +controlledvocabulary.language.Stod_Bhoti=Stod Bhoti +controlledvocabulary.language.Stoney=Stoney +controlledvocabulary.language.Straits_Salish=Straits Salish +controlledvocabulary.language.Suabo=Suabo +controlledvocabulary.language.Suarmin=Suarmin +controlledvocabulary.language.Suau=Suau +controlledvocabulary.language.Suba=Suba +controlledvocabulary.language.Suba-Simbiti=Suba-Simbiti +controlledvocabulary.language.Subi=Subi +controlledvocabulary.language.Subiya=Subiya +controlledvocabulary.language.Subtiaba=Subtiaba +controlledvocabulary.language.Sudanese_Arabic=Sudanese Arabic +controlledvocabulary.language.Sudanese_Creole_Arabic=Sudanese Creole Arabic +controlledvocabulary.language.Sudest=Sudest +controlledvocabulary.language.Sudovian=Sudovian +controlledvocabulary.language.Suena=Suena +controlledvocabulary.language.Suga=Suga +controlledvocabulary.language.Suganga=Suganga +controlledvocabulary.language.Sugut_Dusun=Sugut Dusun +controlledvocabulary.language.Sui=Sui +controlledvocabulary.language.Suki=Suki +controlledvocabulary.language.Suku=Suku +controlledvocabulary.language.Sukuma=Sukuma +controlledvocabulary.language.Sukur=Sukur +controlledvocabulary.language.Sukurum=Sukurum +controlledvocabulary.language.Sula=Sula +controlledvocabulary.language.Sulka=Sulka +controlledvocabulary.language.Sulod=Sulod +controlledvocabulary.language.Suma=Suma +controlledvocabulary.language.Sumariup=Sumariup +controlledvocabulary.language.Sumau=Sumau +controlledvocabulary.language.Sumbawa=Sumbawa +controlledvocabulary.language.Sumbwa=Sumbwa +controlledvocabulary.language.Sumerian=Sumerian +controlledvocabulary.language.Sumi_Naga=Sumi Naga +controlledvocabulary.language.Sumtu_Chin=Sumtu Chin +controlledvocabulary.language.Sunam=Sunam +controlledvocabulary.language.Sundanese=Sundanese +controlledvocabulary.language.Sunwar=Sunwar +controlledvocabulary.language.Suoy=Suoy +controlledvocabulary.language.Supyire_Senoufo=Supyire Senoufo +controlledvocabulary.language.Sur=Sur +controlledvocabulary.language.Surbakhal=Surbakhal +controlledvocabulary.language.Surgujia=Surgujia +controlledvocabulary.language.Surigaonon=Surigaonon +controlledvocabulary.language.Surjapuri=Surjapuri +controlledvocabulary.language.Sursurunga=Sursurunga +controlledvocabulary.language.Suruah�=Suruah� +controlledvocabulary.language.Surubu=Surubu +controlledvocabulary.language.Suru�=Suru� +controlledvocabulary.language.Suru�_Do_Par�=Suru� Do Par� +controlledvocabulary.language.Susquehannock=Susquehannock +controlledvocabulary.language.Susu=Susu +controlledvocabulary.language.Susuami=Susuami +controlledvocabulary.language.Suundi=Suundi +controlledvocabulary.language.Suwawa=Suwawa +controlledvocabulary.language.Suy�=Suy� +controlledvocabulary.language.Svan=Svan +controlledvocabulary.language.Swabian=Swabian +controlledvocabulary.language.Swahili=Swahili +controlledvocabulary.language.Swahili_(individual_language)=Swahili (individual language) +controlledvocabulary.language.Swampy_Cree=Swampy Cree +controlledvocabulary.language.Swati=Swati +controlledvocabulary.language.Swedish=Swedish +controlledvocabulary.language.Swedish_Sign_Language=Swedish Sign Language +controlledvocabulary.language.Swiss_German=Swiss German +controlledvocabulary.language.Swiss-French_Sign_Language=Swiss-French Sign Language +controlledvocabulary.language.Swiss-German_Sign_Language=Swiss-German Sign Language +controlledvocabulary.language.Swiss-Italian_Sign_Language=Swiss-Italian Sign Language +controlledvocabulary.language.Swo=Swo +controlledvocabulary.language.Syenara_Senoufo=Syenara Senoufo +controlledvocabulary.language.Sylheti=Sylheti +controlledvocabulary.language.Syriac=Syriac +controlledvocabulary.language.S�liba=S�liba +controlledvocabulary.language.S�o_Paulo_Kaing�ng=S�o Paulo Kaing�ng +controlledvocabulary.language.S�otomense=S�otomense +controlledvocabulary.language.S�c�t�_S�noufo=S�c�t� S�noufo +controlledvocabulary.language.S�=S� +controlledvocabulary.language.T'apo=T'apo +controlledvocabulary.language.T'en=T'en +controlledvocabulary.language.Ta'izzi-Adeni_Arabic=Ta'izzi-Adeni Arabic +controlledvocabulary.language.Taabwa=Taabwa +controlledvocabulary.language.Tabaa_Zapotec=Tabaa Zapotec +controlledvocabulary.language.Tabaru=Tabaru +controlledvocabulary.language.Tabasco_Chontal=Tabasco Chontal +controlledvocabulary.language.Tabasco_Nahuatl=Tabasco Nahuatl +controlledvocabulary.language.Tabasco_Zoque=Tabasco Zoque +controlledvocabulary.language.Tabassaran=Tabassaran +controlledvocabulary.language.Tabla=Tabla +controlledvocabulary.language.Tabo=Tabo +controlledvocabulary.language.Tabriak=Tabriak +controlledvocabulary.language.Tacahua_Mixtec=Tacahua Mixtec +controlledvocabulary.language.Tacana=Tacana +controlledvocabulary.language.Tachawit=Tachawit +controlledvocabulary.language.Tachelhit=Tachelhit +controlledvocabulary.language.Tachoni=Tachoni +controlledvocabulary.language.Tadaksahak=Tadaksahak +controlledvocabulary.language.Tado=Tado +controlledvocabulary.language.Tadyawan=Tadyawan +controlledvocabulary.language.Tae'=Tae' +controlledvocabulary.language.Tafi=Tafi +controlledvocabulary.language.Tagabawa=Tagabawa +controlledvocabulary.language.Tagakaulo=Tagakaulo +controlledvocabulary.language.Tagal_Murut=Tagal Murut +controlledvocabulary.language.Tagalaka=Tagalaka +controlledvocabulary.language.Tagalog=Tagalog +controlledvocabulary.language.Tagargrent=Tagargrent +controlledvocabulary.language.Tagbanwa=Tagbanwa +controlledvocabulary.language.Tagbu=Tagbu +controlledvocabulary.language.Tagdal=Tagdal +controlledvocabulary.language.Tagin=Tagin +controlledvocabulary.language.Tagish=Tagish +controlledvocabulary.language.Tagoi=Tagoi +controlledvocabulary.language.Tagwana_Senoufo=Tagwana Senoufo +controlledvocabulary.language.Tahaggart_Tamahaq=Tahaggart Tamahaq +controlledvocabulary.language.Tahitian=Tahitian +controlledvocabulary.language.Tahltan=Tahltan +controlledvocabulary.language.Tai=Tai +controlledvocabulary.language.Tai_Daeng=Tai Daeng +controlledvocabulary.language.Tai_Dam=Tai Dam +controlledvocabulary.language.Tai_Do=Tai Do +controlledvocabulary.language.Tai_D�n=Tai D�n +controlledvocabulary.language.Tai_Hongjin=Tai Hongjin +controlledvocabulary.language.Tai_Laing=Tai Laing +controlledvocabulary.language.Tai_Loi=Tai Loi +controlledvocabulary.language.Tai_Long=Tai Long +controlledvocabulary.language.Tai_N�a=Tai N�a +controlledvocabulary.language.Tai_Pao=Tai Pao +controlledvocabulary.language.Tai_Thanh=Tai Thanh +controlledvocabulary.language.Tai_Ya=Tai Ya +controlledvocabulary.language.Taiap=Taiap +controlledvocabulary.language.Taikat=Taikat +controlledvocabulary.language.Tainae=Tainae +controlledvocabulary.language.Taino=Taino +controlledvocabulary.language.Tairaha=Tairaha +controlledvocabulary.language.Tairuma=Tairuma +controlledvocabulary.language.Taita=Taita +controlledvocabulary.language.Taivoan=Taivoan +controlledvocabulary.language.Taiwan_Sign_Language=Taiwan Sign Language +controlledvocabulary.language.Taje=Taje +controlledvocabulary.language.Tajik=Tajik +controlledvocabulary.language.Tajiki_Arabic=Tajiki Arabic +controlledvocabulary.language.Tajio=Tajio +controlledvocabulary.language.Tajuasohn=Tajuasohn +controlledvocabulary.language.Takelma=Takelma +controlledvocabulary.language.Takestani=Takestani +controlledvocabulary.language.Takia=Takia +controlledvocabulary.language.Takua=Takua +controlledvocabulary.language.Takuu=Takuu +controlledvocabulary.language.Takwane=Takwane +controlledvocabulary.language.Tal=Tal +controlledvocabulary.language.Tala=Tala +controlledvocabulary.language.Talaud=Talaud +controlledvocabulary.language.Taliabu=Taliabu +controlledvocabulary.language.Talieng=Talieng +controlledvocabulary.language.Talinga-Bwisi=Talinga-Bwisi +controlledvocabulary.language.Talise=Talise +controlledvocabulary.language.Talodi=Talodi +controlledvocabulary.language.Taloki=Taloki +controlledvocabulary.language.Talondo'=Talondo' +controlledvocabulary.language.Talossan=Talossan +controlledvocabulary.language.Talu=Talu +controlledvocabulary.language.Talysh=Talysh +controlledvocabulary.language.Tama_(Chad)=Tama (Chad) +controlledvocabulary.language.Tama_(Colombia)=Tama (Colombia) +controlledvocabulary.language.Tamagario=Tamagario +controlledvocabulary.language.Taman_(Indonesia)=Taman (Indonesia) +controlledvocabulary.language.Taman_(Myanmar)=Taman (Myanmar) +controlledvocabulary.language.Tamanaku=Tamanaku +controlledvocabulary.language.Tamashek=Tamashek +controlledvocabulary.language.Tamasheq=Tamasheq +controlledvocabulary.language.Tamazola_Mixtec=Tamazola Mixtec +controlledvocabulary.language.Tambas=Tambas +controlledvocabulary.language.Tambora=Tambora +controlledvocabulary.language.Tambotalo=Tambotalo +controlledvocabulary.language.Tami=Tami +controlledvocabulary.language.Tamil=Tamil +controlledvocabulary.language.Tamki=Tamki +controlledvocabulary.language.Tamnim_Citak=Tamnim Citak +controlledvocabulary.language.Tampias_Lobu=Tampias Lobu +controlledvocabulary.language.Tampuan=Tampuan +controlledvocabulary.language.Tampulma=Tampulma +controlledvocabulary.language.Tanacross=Tanacross +controlledvocabulary.language.Tanahmerah=Tanahmerah +controlledvocabulary.language.Tanaina=Tanaina +controlledvocabulary.language.Tanapag=Tanapag +controlledvocabulary.language.Tandaganon=Tandaganon +controlledvocabulary.language.Tandia=Tandia +controlledvocabulary.language.Tandroy-Mahafaly_Malagasy=Tandroy-Mahafaly Malagasy +controlledvocabulary.language.Tanema=Tanema +controlledvocabulary.language.Tangale=Tangale +controlledvocabulary.language.Tangchangya=Tangchangya +controlledvocabulary.language.Tanggu=Tanggu +controlledvocabulary.language.Tangkhul_Naga_(India)=Tangkhul Naga (India) +controlledvocabulary.language.Tangkhul_Naga_(Myanmar)=Tangkhul Naga (Myanmar) +controlledvocabulary.language.Tangko=Tangko +controlledvocabulary.language.Tanglang=Tanglang +controlledvocabulary.language.Tangoa=Tangoa +controlledvocabulary.language.Tanguat=Tanguat +controlledvocabulary.language.Tangut=Tangut +controlledvocabulary.language.Tanimbili=Tanimbili +controlledvocabulary.language.Tanimuca-Retuar�=Tanimuca-Retuar� +controlledvocabulary.language.Tanjijili=Tanjijili +controlledvocabulary.language.Tanosy_Malagasy=Tanosy Malagasy +controlledvocabulary.language.Tanudan_Kalinga=Tanudan Kalinga +controlledvocabulary.language.Tanzanian_Sign_Language=Tanzanian Sign Language +controlledvocabulary.language.Tapei=Tapei +controlledvocabulary.language.Tapiet�=Tapiet� +controlledvocabulary.language.Tapirap�=Tapirap� +controlledvocabulary.language.Tarao_Naga=Tarao Naga +controlledvocabulary.language.Tareng=Tareng +controlledvocabulary.language.Tariana=Tariana +controlledvocabulary.language.Tarifit=Tarifit +controlledvocabulary.language.Tarjumo=Tarjumo +controlledvocabulary.language.Tarok=Tarok +controlledvocabulary.language.Tarpia=Tarpia +controlledvocabulary.language.Tartessian=Tartessian +controlledvocabulary.language.Taruma=Taruma +controlledvocabulary.language.Tasawaq=Tasawaq +controlledvocabulary.language.Tase_Naga=Tase Naga +controlledvocabulary.language.Tasmate=Tasmate +controlledvocabulary.language.Tataltepec_Chatino=Tataltepec Chatino +controlledvocabulary.language.Tatana=Tatana +controlledvocabulary.language.Tatar=Tatar +controlledvocabulary.language.Tatuyo=Tatuyo +controlledvocabulary.language.Tauade=Tauade +controlledvocabulary.language.Taulil=Taulil +controlledvocabulary.language.Taungyo=Taungyo +controlledvocabulary.language.Taupota=Taupota +controlledvocabulary.language.Tause=Tause +controlledvocabulary.language.Taushiro=Taushiro +controlledvocabulary.language.Tausug=Tausug +controlledvocabulary.language.Tauya=Tauya +controlledvocabulary.language.Taveta=Taveta +controlledvocabulary.language.Tavoyan=Tavoyan +controlledvocabulary.language.Tavringer_Romani=Tavringer Romani +controlledvocabulary.language.Tawala=Tawala +controlledvocabulary.language.Tawallammat_Tamajaq=Tawallammat Tamajaq +controlledvocabulary.language.Tawand�=Tawand� +controlledvocabulary.language.Tawang_Monpa=Tawang Monpa +controlledvocabulary.language.Tawara=Tawara +controlledvocabulary.language.Taworta=Taworta +controlledvocabulary.language.Tawoyan=Tawoyan +controlledvocabulary.language.Tawr_Chin=Tawr Chin +controlledvocabulary.language.Tay_Boi=Tay Boi +controlledvocabulary.language.Tay_Khang=Tay Khang +controlledvocabulary.language.Tayart_Tamajeq=Tayart Tamajeq +controlledvocabulary.language.Tayo=Tayo +controlledvocabulary.language.Taznatit=Taznatit +controlledvocabulary.language.Tboli=Tboli +controlledvocabulary.language.Tchitchege=Tchitchege +controlledvocabulary.language.Tchumbuli=Tchumbuli +controlledvocabulary.language.Te'un=Te'un +controlledvocabulary.language.Teanu=Teanu +controlledvocabulary.language.Tebul_Sign_Language=Tebul Sign Language +controlledvocabulary.language.Tebul_Ure_Dogon=Tebul Ure Dogon +controlledvocabulary.language.Tecpatl�n_Totonac=Tecpatl�n Totonac +controlledvocabulary.language.Tedaga=Tedaga +controlledvocabulary.language.Tedim_Chin=Tedim Chin +controlledvocabulary.language.Tee=Tee +controlledvocabulary.language.Tefaro=Tefaro +controlledvocabulary.language.Tegali=Tegali +controlledvocabulary.language.Tehit=Tehit +controlledvocabulary.language.Tehuelche=Tehuelche +controlledvocabulary.language.Tejalapan_Zapotec=Tejalapan Zapotec +controlledvocabulary.language.Teke-Ebo=Teke-Ebo +controlledvocabulary.language.Teke-Fuumu=Teke-Fuumu +controlledvocabulary.language.Teke-Kukuya=Teke-Kukuya +controlledvocabulary.language.Teke-Laali=Teke-Laali +controlledvocabulary.language.Teke-Nzikou=Teke-Nzikou +controlledvocabulary.language.Teke-Tege=Teke-Tege +controlledvocabulary.language.Teke-Tsaayi=Teke-Tsaayi +controlledvocabulary.language.Teke-Tyee=Teke-Tyee +controlledvocabulary.language.Tektiteko=Tektiteko +controlledvocabulary.language.Tela-Masbuar=Tela-Masbuar +controlledvocabulary.language.Telefol=Telefol +controlledvocabulary.language.Telugu=Telugu +controlledvocabulary.language.Tem=Tem +controlledvocabulary.language.Temacine_Tamazight=Temacine Tamazight +controlledvocabulary.language.Temascaltepec_Nahuatl=Temascaltepec Nahuatl +controlledvocabulary.language.Tembo_(Kitembo)=Tembo (Kitembo) +controlledvocabulary.language.Tembo_(Motembo)=Tembo (Motembo) +controlledvocabulary.language.Temb�=Temb� +controlledvocabulary.language.Teme=Teme +controlledvocabulary.language.Temein=Temein +controlledvocabulary.language.Temi=Temi +controlledvocabulary.language.Temiar=Temiar +controlledvocabulary.language.Temoaya_Otomi=Temoaya Otomi +controlledvocabulary.language.Temoq=Temoq +controlledvocabulary.language.Temuan=Temuan +controlledvocabulary.language.Ten'edn=Ten'edn +controlledvocabulary.language.Tena_Lowland_Quichua=Tena Lowland Quichua +controlledvocabulary.language.Tenango_Otomi=Tenango Otomi +controlledvocabulary.language.Tene_Kan_Dogon=Tene Kan Dogon +controlledvocabulary.language.Tenggarong_Kutai_Malay=Tenggarong Kutai Malay +controlledvocabulary.language.Tengger=Tengger +controlledvocabulary.language.Tenharim=Tenharim +controlledvocabulary.language.Tenino=Tenino +controlledvocabulary.language.Tenis=Tenis +controlledvocabulary.language.Tennet=Tennet +controlledvocabulary.language.Teop=Teop +controlledvocabulary.language.Teor=Teor +controlledvocabulary.language.Tepecano=Tepecano +controlledvocabulary.language.Tepetotutla_Chinantec=Tepetotutla Chinantec +controlledvocabulary.language.Tepeuxila_Cuicatec=Tepeuxila Cuicatec +controlledvocabulary.language.Tepinapa_Chinantec=Tepinapa Chinantec +controlledvocabulary.language.Tepo_Krumen=Tepo Krumen +controlledvocabulary.language.Ter_Sami=Ter Sami +controlledvocabulary.language.Tera=Tera +controlledvocabulary.language.Terebu=Terebu +controlledvocabulary.language.Terei=Terei +controlledvocabulary.language.Tereno=Tereno +controlledvocabulary.language.Teressa=Teressa +controlledvocabulary.language.Tereweng=Tereweng +controlledvocabulary.language.Teribe=Teribe +controlledvocabulary.language.Terik=Terik +controlledvocabulary.language.Termanu=Termanu +controlledvocabulary.language.Ternate=Ternate +controlledvocabulary.language.Ternate�o=Ternate�o +controlledvocabulary.language.Tesaka_Malagasy=Tesaka Malagasy +controlledvocabulary.language.Tese=Tese +controlledvocabulary.language.Teshenawa=Teshenawa +controlledvocabulary.language.Teso=Teso +controlledvocabulary.language.Tetela=Tetela +controlledvocabulary.language.Tetelcingo_Nahuatl=Tetelcingo Nahuatl +controlledvocabulary.language.Tetete=Tetete +controlledvocabulary.language.Tetserret=Tetserret +controlledvocabulary.language.Tetum=Tetum +controlledvocabulary.language.Tetun_Dili=Tetun Dili +controlledvocabulary.language.Teutila_Cuicatec=Teutila Cuicatec +controlledvocabulary.language.Tewa_(Indonesia)=Tewa (Indonesia) +controlledvocabulary.language.Tewa_(USA)=Tewa (USA) +controlledvocabulary.language.Tewe=Tewe +controlledvocabulary.language.Texcatepec_Otomi=Texcatepec Otomi +controlledvocabulary.language.Texistepec_Popoluca=Texistepec Popoluca +controlledvocabulary.language.Texmelucan_Zapotec=Texmelucan Zapotec +controlledvocabulary.language.Tezoatl�n_Mixtec=Tezoatl�n Mixtec +controlledvocabulary.language.Tha=Tha +controlledvocabulary.language.Thachanadan=Thachanadan +controlledvocabulary.language.Thado_Chin=Thado Chin +controlledvocabulary.language.Thai=Thai +controlledvocabulary.language.Thai_Sign_Language=Thai Sign Language +controlledvocabulary.language.Thai_Song=Thai Song +controlledvocabulary.language.Thaiphum_Chin=Thaiphum Chin +controlledvocabulary.language.Thakali=Thakali +controlledvocabulary.language.Thangal_Naga=Thangal Naga +controlledvocabulary.language.Thangmi=Thangmi +controlledvocabulary.language.Thao=Thao +controlledvocabulary.language.Tharaka=Tharaka +controlledvocabulary.language.Thawa=Thawa +controlledvocabulary.language.Thaypan=Thaypan +controlledvocabulary.language.Thiin=Thiin +controlledvocabulary.language.Tho=Tho +controlledvocabulary.language.Thompson=Thompson +controlledvocabulary.language.Thopho=Thopho +controlledvocabulary.language.Thracian=Thracian +controlledvocabulary.language.Thu_Lao=Thu Lao +controlledvocabulary.language.Thulung=Thulung +controlledvocabulary.language.Thur=Thur +controlledvocabulary.language.Thuri=Thuri +controlledvocabulary.language.Tiagbamrin_Aizi=Tiagbamrin Aizi +controlledvocabulary.language.Tiale=Tiale +controlledvocabulary.language.Tiang=Tiang +controlledvocabulary.language.Tibea=Tibea +controlledvocabulary.language.Tibetan_Sign_Language=Tibetan Sign Language +controlledvocabulary.language.Tibetan,_Tibetan_Standard,_Central=Tibetan, Tibetan Standard, Central +controlledvocabulary.language.Tichurong=Tichurong +controlledvocabulary.language.Ticuna=Ticuna +controlledvocabulary.language.Tida�_Mixtec=Tida� Mixtec +controlledvocabulary.language.Tidikelt_Tamazight=Tidikelt Tamazight +controlledvocabulary.language.Tidore=Tidore +controlledvocabulary.language.Tiemac�w�_Bozo=Tiemac�w� Bozo +controlledvocabulary.language.Tiene=Tiene +controlledvocabulary.language.Tifal=Tifal +controlledvocabulary.language.Tigak=Tigak +controlledvocabulary.language.Tigon_Mbembe=Tigon Mbembe +controlledvocabulary.language.Tigre=Tigre +controlledvocabulary.language.Tigrinya=Tigrinya +controlledvocabulary.language.Tii=Tii +controlledvocabulary.language.Tijaltepec_Mixtec=Tijaltepec Mixtec +controlledvocabulary.language.Tikar=Tikar +controlledvocabulary.language.Tikopia=Tikopia +controlledvocabulary.language.Tilapa_Otomi=Tilapa Otomi +controlledvocabulary.language.Tillamook=Tillamook +controlledvocabulary.language.Tilquiapan_Zapotec=Tilquiapan Zapotec +controlledvocabulary.language.Tilung=Tilung +controlledvocabulary.language.Tima=Tima +controlledvocabulary.language.Timbe=Timbe +controlledvocabulary.language.Timne=Timne +controlledvocabulary.language.Timor_Pidgin=Timor Pidgin +controlledvocabulary.language.Timucua=Timucua +controlledvocabulary.language.Timugon_Murut=Timugon Murut +controlledvocabulary.language.Tinani=Tinani +controlledvocabulary.language.Tindi=Tindi +controlledvocabulary.language.Tingui-Boto=Tingui-Boto +controlledvocabulary.language.Tinigua=Tinigua +controlledvocabulary.language.Tinputz=Tinputz +controlledvocabulary.language.Tippera=Tippera +controlledvocabulary.language.Tira=Tira +controlledvocabulary.language.Tirahi=Tirahi +controlledvocabulary.language.Tiranige_Diga_Dogon=Tiranige Diga Dogon +controlledvocabulary.language.Tiri=Tiri +controlledvocabulary.language.Tirmaga-Chai_Suri=Tirmaga-Chai Suri +controlledvocabulary.language.Tiruray=Tiruray +controlledvocabulary.language.Tita=Tita +controlledvocabulary.language.Titan=Titan +controlledvocabulary.language.Tiv=Tiv +controlledvocabulary.language.Tiwa=Tiwa +controlledvocabulary.language.Tiwi=Tiwi +controlledvocabulary.language.Tiyaa=Tiyaa +controlledvocabulary.language.Ti�fo=Ti�fo +controlledvocabulary.language.Ti�yaxo_Bozo=Ti�yaxo Bozo +controlledvocabulary.language.Tjungundji=Tjungundji +controlledvocabulary.language.Tjupany=Tjupany +controlledvocabulary.language.Tjurruru=Tjurruru +controlledvocabulary.language.Tlachichilco_Tepehua=Tlachichilco Tepehua +controlledvocabulary.language.Tlacoapa_Me'phaa=Tlacoapa Me'phaa +controlledvocabulary.language.Tlacoatzintepec_Chinantec=Tlacoatzintepec Chinantec +controlledvocabulary.language.Tlacolulita_Zapotec=Tlacolulita Zapotec +controlledvocabulary.language.Tlahuitoltepec_Mixe=Tlahuitoltepec Mixe +controlledvocabulary.language.Tlamacazapa_Nahuatl=Tlamacazapa Nahuatl +controlledvocabulary.language.Tlazoyaltepec_Mixtec=Tlazoyaltepec Mixtec +controlledvocabulary.language.Tlicho=Tlicho +controlledvocabulary.language.Tlingit=Tlingit +controlledvocabulary.language.To=To +controlledvocabulary.language.To'abaita=To'abaita +controlledvocabulary.language.Toaripi=Toaripi +controlledvocabulary.language.Toba=Toba +controlledvocabulary.language.Toba-Maskoy=Toba-Maskoy +controlledvocabulary.language.Tobagonian_Creole_English=Tobagonian Creole English +controlledvocabulary.language.Tobanga=Tobanga +controlledvocabulary.language.Tobati=Tobati +controlledvocabulary.language.Tobelo=Tobelo +controlledvocabulary.language.Tobian=Tobian +controlledvocabulary.language.Tobilung=Tobilung +controlledvocabulary.language.Tobo=Tobo +controlledvocabulary.language.Tocantins_Asurini=Tocantins Asurini +controlledvocabulary.language.Tocho=Tocho +controlledvocabulary.language.Toda=Toda +controlledvocabulary.language.Todrah=Todrah +controlledvocabulary.language.Tofanma=Tofanma +controlledvocabulary.language.Tofin_Gbe=Tofin Gbe +controlledvocabulary.language.Togbo-Vara_Banda=Togbo-Vara Banda +controlledvocabulary.language.Togoyo=Togoyo +controlledvocabulary.language.Tohono_O'odham=Tohono O'odham +controlledvocabulary.language.Tojolabal=Tojolabal +controlledvocabulary.language.Tok_Pisin=Tok Pisin +controlledvocabulary.language.Tokano=Tokano +controlledvocabulary.language.Tokelau=Tokelau +controlledvocabulary.language.Tokharian_A=Tokharian A +controlledvocabulary.language.Tokharian_B=Tokharian B +controlledvocabulary.language.Toki_Pona=Toki Pona +controlledvocabulary.language.Toku-No-Shima=Toku-No-Shima +controlledvocabulary.language.Tol=Tol +controlledvocabulary.language.Tolaki=Tolaki +controlledvocabulary.language.Tolomako=Tolomako +controlledvocabulary.language.Tolowa=Tolowa +controlledvocabulary.language.Toma=Toma +controlledvocabulary.language.Tomadino=Tomadino +controlledvocabulary.language.Tombelala=Tombelala +controlledvocabulary.language.Tombonuo=Tombonuo +controlledvocabulary.language.Tombulu=Tombulu +controlledvocabulary.language.Tomini=Tomini +controlledvocabulary.language.Tommo_So_Dogon=Tommo So Dogon +controlledvocabulary.language.Tomo_Kan_Dogon=Tomo Kan Dogon +controlledvocabulary.language.Tomoip=Tomoip +controlledvocabulary.language.Tondano=Tondano +controlledvocabulary.language.Tondi_Songway_Kiini=Tondi Songway Kiini +controlledvocabulary.language.Tonga_(Nyasa)=Tonga (Nyasa) +controlledvocabulary.language.Tonga_(Tonga_Islands)=Tonga (Tonga Islands) +controlledvocabulary.language.Tonga_(Zambia)=Tonga (Zambia) +controlledvocabulary.language.Tongwe=Tongwe +controlledvocabulary.language.Tonjon=Tonjon +controlledvocabulary.language.Tonkawa=Tonkawa +controlledvocabulary.language.Tonsawang=Tonsawang +controlledvocabulary.language.Tonsea=Tonsea +controlledvocabulary.language.Tontemboan=Tontemboan +controlledvocabulary.language.Tooro=Tooro +controlledvocabulary.language.Topoiyo=Topoiyo +controlledvocabulary.language.Toposa=Toposa +controlledvocabulary.language.Toraja-Sa'dan=Toraja-Sa'dan +controlledvocabulary.language.Toram=Toram +controlledvocabulary.language.Torau=Torau +controlledvocabulary.language.Tornedalen_Finnish=Tornedalen Finnish +controlledvocabulary.language.Toro=Toro +controlledvocabulary.language.Toro_So_Dogon=Toro So Dogon +controlledvocabulary.language.Toro_Tegu_Dogon=Toro Tegu Dogon +controlledvocabulary.language.Toromono=Toromono +controlledvocabulary.language.Torona=Torona +controlledvocabulary.language.Torres_Strait_Creole=Torres Strait Creole +controlledvocabulary.language.Torricelli=Torricelli +controlledvocabulary.language.Torwali=Torwali +controlledvocabulary.language.Tor�=Tor� +controlledvocabulary.language.Tosk_Albanian=Tosk Albanian +controlledvocabulary.language.Totela=Totela +controlledvocabulary.language.Toto=Toto +controlledvocabulary.language.Totoli=Totoli +controlledvocabulary.language.Totomachapan_Zapotec=Totomachapan Zapotec +controlledvocabulary.language.Totontepec_Mixe=Totontepec Mixe +controlledvocabulary.language.Totoro=Totoro +controlledvocabulary.language.Touo=Touo +controlledvocabulary.language.Toura_(C�te_d'Ivoire)=Toura (C�te d'Ivoire) +controlledvocabulary.language.Toura_(Papua_New_Guinea)=Toura (Papua New Guinea) +controlledvocabulary.language.Towei=Towei +controlledvocabulary.language.Transalpine_Gaulish=Transalpine Gaulish +controlledvocabulary.language.Traveller_Danish=Traveller Danish +controlledvocabulary.language.Traveller_Norwegian=Traveller Norwegian +controlledvocabulary.language.Traveller_Scottish=Traveller Scottish +controlledvocabulary.language.Tregami=Tregami +controlledvocabulary.language.Trememb�=Trememb� +controlledvocabulary.language.Trieng=Trieng +controlledvocabulary.language.Trimuris=Trimuris +controlledvocabulary.language.Tring=Tring +controlledvocabulary.language.Tringgus-Sembaan_Bidayuh=Tringgus-Sembaan Bidayuh +controlledvocabulary.language.Trinidad_and_Tobago_Sign_Language=Trinidad and Tobago Sign Language +controlledvocabulary.language.Trinidadian_Creole_English=Trinidadian Creole English +controlledvocabulary.language.Trinitario=Trinitario +controlledvocabulary.language.Tri�=Tri� +controlledvocabulary.language.Truk�=Truk� +controlledvocabulary.language.Trumai=Trumai +controlledvocabulary.language.Ts'�n-Lao=Ts'�n-Lao +controlledvocabulary.language.Tsaangi=Tsaangi +controlledvocabulary.language.Tsakhur=Tsakhur +controlledvocabulary.language.Tsakonian=Tsakonian +controlledvocabulary.language.Tsakwambo=Tsakwambo +controlledvocabulary.language.Tsamai=Tsamai +controlledvocabulary.language.Tsat=Tsat +controlledvocabulary.language.Tseku=Tseku +controlledvocabulary.language.Tsetsaut=Tsetsaut +controlledvocabulary.language.Tshangla=Tshangla +controlledvocabulary.language.Tsikimba=Tsikimba +controlledvocabulary.language.Tsiman�=Tsiman� +controlledvocabulary.language.Tsimihety_Malagasy=Tsimihety Malagasy +controlledvocabulary.language.Tsimshian=Tsimshian +controlledvocabulary.language.Tsishingini=Tsishingini +controlledvocabulary.language.Tso=Tso +controlledvocabulary.language.Tsoa=Tsoa +controlledvocabulary.language.Tsogo=Tsogo +controlledvocabulary.language.Tsonga=Tsonga +controlledvocabulary.language.Tsotso=Tsotso +controlledvocabulary.language.Tsou=Tsou +controlledvocabulary.language.Tsucuba=Tsucuba +controlledvocabulary.language.Tsum=Tsum +controlledvocabulary.language.Tsuvadi=Tsuvadi +controlledvocabulary.language.Tsuvan=Tsuvan +controlledvocabulary.language.Tswa=Tswa +controlledvocabulary.language.Tswana=Tswana +controlledvocabulary.language.Tswapong=Tswapong +controlledvocabulary.language.Tu=Tu +controlledvocabulary.language.Tuamotuan=Tuamotuan +controlledvocabulary.language.Tubar=Tubar +controlledvocabulary.language.Tucano=Tucano +controlledvocabulary.language.Tugen=Tugen +controlledvocabulary.language.Tugun=Tugun +controlledvocabulary.language.Tugutil=Tugutil +controlledvocabulary.language.Tukang_Besi_North=Tukang Besi North +controlledvocabulary.language.Tukang_Besi_South=Tukang Besi South +controlledvocabulary.language.Tuki=Tuki +controlledvocabulary.language.Tukpa=Tukpa +controlledvocabulary.language.Tukudede=Tukudede +controlledvocabulary.language.Tukumanf�d=Tukumanf�d +controlledvocabulary.language.Tula=Tula +controlledvocabulary.language.Tulai=Tulai +controlledvocabulary.language.Tulehu=Tulehu +controlledvocabulary.language.Tulishi=Tulishi +controlledvocabulary.language.Tulu=Tulu +controlledvocabulary.language.Tulu-Bohuai=Tulu-Bohuai +controlledvocabulary.language.Tuma-Irumu=Tuma-Irumu +controlledvocabulary.language.Tumak=Tumak +controlledvocabulary.language.Tumari_Kanuri=Tumari Kanuri +controlledvocabulary.language.Tumbuka=Tumbuka +controlledvocabulary.language.Tumi=Tumi +controlledvocabulary.language.Tumleo=Tumleo +controlledvocabulary.language.Tumshuqese=Tumshuqese +controlledvocabulary.language.Tumtum=Tumtum +controlledvocabulary.language.Tumulung_Sisaala=Tumulung Sisaala +controlledvocabulary.language.Tumzabt=Tumzabt +controlledvocabulary.language.Tundra_Enets=Tundra Enets +controlledvocabulary.language.Tunen=Tunen +controlledvocabulary.language.Tungag=Tungag +controlledvocabulary.language.Tunggare=Tunggare +controlledvocabulary.language.Tunia=Tunia +controlledvocabulary.language.Tunica=Tunica +controlledvocabulary.language.Tunisian_Arabic=Tunisian Arabic +controlledvocabulary.language.Tunisian_Sign_Language=Tunisian Sign Language +controlledvocabulary.language.Tunjung=Tunjung +controlledvocabulary.language.Tunni=Tunni +controlledvocabulary.language.Tunzu=Tunzu +controlledvocabulary.language.Tuotomb=Tuotomb +controlledvocabulary.language.Tupar�=Tupar� +controlledvocabulary.language.Tupinamb�=Tupinamb� +controlledvocabulary.language.Tupinikin=Tupinikin +controlledvocabulary.language.Tupuri=Tupuri +controlledvocabulary.language.Turaka=Turaka +controlledvocabulary.language.Turi=Turi +controlledvocabulary.language.Turiw�ra=Turiw�ra +controlledvocabulary.language.Turka=Turka +controlledvocabulary.language.Turkana=Turkana +controlledvocabulary.language.Turkish=Turkish +controlledvocabulary.language.Turkish_Sign_Language=Turkish Sign Language +controlledvocabulary.language.Turkmen=Turkmen +controlledvocabulary.language.Turks_And_Caicos_Creole_English=Turks And Caicos Creole English +controlledvocabulary.language.Turoyo=Turoyo +controlledvocabulary.language.Turumsa=Turumsa +controlledvocabulary.language.Turung=Turung +controlledvocabulary.language.Tuscarora=Tuscarora +controlledvocabulary.language.Tutelo=Tutelo +controlledvocabulary.language.Tutong=Tutong +controlledvocabulary.language.Tutsa_Naga=Tutsa Naga +controlledvocabulary.language.Tutuba=Tutuba +controlledvocabulary.language.Tututepec_Mixtec=Tututepec Mixtec +controlledvocabulary.language.Tututni=Tututni +controlledvocabulary.language.Tuvalu=Tuvalu +controlledvocabulary.language.Tuvinian=Tuvinian +controlledvocabulary.language.Tuwali_Ifugao=Tuwali Ifugao +controlledvocabulary.language.Tuwari=Tuwari +controlledvocabulary.language.Tuwuli=Tuwuli +controlledvocabulary.language.Tuxin�wa=Tuxin�wa +controlledvocabulary.language.Tux�=Tux� +controlledvocabulary.language.Tuyuca=Tuyuca +controlledvocabulary.language.Twana=Twana +controlledvocabulary.language.Twendi=Twendi +controlledvocabulary.language.Twents=Twents +controlledvocabulary.language.Twi=Twi +controlledvocabulary.language.Tyap=Tyap +controlledvocabulary.language.Tz'utujil=Tz'utujil +controlledvocabulary.language.Tzeltal=Tzeltal +controlledvocabulary.language.Tzotzil=Tzotzil +controlledvocabulary.language.T�y=T�y +controlledvocabulary.language.T�y_Sa_Pa=T�y Sa Pa +controlledvocabulary.language.T�y_Tac=T�y Tac +controlledvocabulary.language.T��n=T��n +controlledvocabulary.language.T�batulabal=T�batulabal +controlledvocabulary.language.U=U +controlledvocabulary.language.Uab_Meto=Uab Meto +controlledvocabulary.language.Uamu�=Uamu� +controlledvocabulary.language.Uare=Uare +controlledvocabulary.language.Ubaghara=Ubaghara +controlledvocabulary.language.Ubang=Ubang +controlledvocabulary.language.Ubi=Ubi +controlledvocabulary.language.Ubir=Ubir +controlledvocabulary.language.Ubykh=Ubykh +controlledvocabulary.language.Ucayali-Yur�a_Ash�ninka=Ucayali-Yur�a Ash�ninka +controlledvocabulary.language.Uda=Uda +controlledvocabulary.language.Udi=Udi +controlledvocabulary.language.Udihe=Udihe +controlledvocabulary.language.Udmurt=Udmurt +controlledvocabulary.language.Uduk=Uduk +controlledvocabulary.language.Ufim=Ufim +controlledvocabulary.language.Ugandan_Sign_Language=Ugandan Sign Language +controlledvocabulary.language.Ugaritic=Ugaritic +controlledvocabulary.language.Ughele=Ughele +controlledvocabulary.language.Ugong=Ugong +controlledvocabulary.language.Uhami=Uhami +controlledvocabulary.language.Uighur,_Uyghur=Uighur, Uyghur +controlledvocabulary.language.Uisai=Uisai +controlledvocabulary.language.Ujir=Ujir +controlledvocabulary.language.Ukaan=Ukaan +controlledvocabulary.language.Ukhwejo=Ukhwejo +controlledvocabulary.language.Ukit=Ukit +controlledvocabulary.language.Ukpe-Bayobiri=Ukpe-Bayobiri +controlledvocabulary.language.Ukpet-Ehom=Ukpet-Ehom +controlledvocabulary.language.Ukrainian=Ukrainian +controlledvocabulary.language.Ukrainian_Sign_Language=Ukrainian Sign Language +controlledvocabulary.language.Ukue=Ukue +controlledvocabulary.language.Ukuriguma=Ukuriguma +controlledvocabulary.language.Ukwa=Ukwa +controlledvocabulary.language.Ukwuani-Aboh-Ndoni=Ukwuani-Aboh-Ndoni +controlledvocabulary.language.Ulau-Suain=Ulau-Suain +controlledvocabulary.language.Ulch=Ulch +controlledvocabulary.language.Ulithian=Ulithian +controlledvocabulary.language.Ullatan=Ullatan +controlledvocabulary.language.Ulukwumi=Ulukwumi +controlledvocabulary.language.Ulumanda'=Ulumanda' +controlledvocabulary.language.Ulwa=Ulwa +controlledvocabulary.language.Uma=Uma +controlledvocabulary.language.Uma'_Lasan=Uma' Lasan +controlledvocabulary.language.Uma'_Lung=Uma' Lung +controlledvocabulary.language.Umanakaina=Umanakaina +controlledvocabulary.language.Umatilla=Umatilla +controlledvocabulary.language.Umbindhamu=Umbindhamu +controlledvocabulary.language.Umbrian=Umbrian +controlledvocabulary.language.Umbu-Ungu=Umbu-Ungu +controlledvocabulary.language.Umbugarla=Umbugarla +controlledvocabulary.language.Umbundu=Umbundu +controlledvocabulary.language.Ume_Sami=Ume Sami +controlledvocabulary.language.Umeda=Umeda +controlledvocabulary.language.Umiida=Umiida +controlledvocabulary.language.Umiray_Dumaget_Agta=Umiray Dumaget Agta +controlledvocabulary.language.Umon=Umon +controlledvocabulary.language.Umot�na=Umot�na +controlledvocabulary.language.Umpila=Umpila +controlledvocabulary.language.Una=Una +controlledvocabulary.language.Unami=Unami +controlledvocabulary.language.Uncoded_languages=Uncoded languages +controlledvocabulary.language.Unde_Kaili=Unde Kaili +controlledvocabulary.language.Undetermined=Undetermined +controlledvocabulary.language.Uneapa=Uneapa +controlledvocabulary.language.Uneme=Uneme +controlledvocabulary.language.Unggaranggu=Unggaranggu +controlledvocabulary.language.Unggumi=Unggumi +controlledvocabulary.language.Uni=Uni +controlledvocabulary.language.Unserdeutsch=Unserdeutsch +controlledvocabulary.language.Unua=Unua +controlledvocabulary.language.Unubahe=Unubahe +controlledvocabulary.language.Upper_Chehalis=Upper Chehalis +controlledvocabulary.language.Upper_Grand_Valley_Dani=Upper Grand Valley Dani +controlledvocabulary.language.Upper_Guinea_Crioulo=Upper Guinea Crioulo +controlledvocabulary.language.Upper_Kinabatangan=Upper Kinabatangan +controlledvocabulary.language.Upper_Kuskokwim=Upper Kuskokwim +controlledvocabulary.language.Upper_Necaxa_Totonac=Upper Necaxa Totonac +controlledvocabulary.language.Upper_Saxon=Upper Saxon +controlledvocabulary.language.Upper_Sorbian=Upper Sorbian +controlledvocabulary.language.Upper_Ta'oih=Upper Ta'oih +controlledvocabulary.language.Upper_Tanana=Upper Tanana +controlledvocabulary.language.Upper_Taromi=Upper Taromi +controlledvocabulary.language.Upper_Umpqua=Upper Umpqua +controlledvocabulary.language.Ura_(Papua_New_Guinea)=Ura (Papua New Guinea) +controlledvocabulary.language.Ura_(Vanuatu)=Ura (Vanuatu) +controlledvocabulary.language.Uradhi=Uradhi +controlledvocabulary.language.Urak_Lawoi'=Urak Lawoi' +controlledvocabulary.language.Urali=Urali +controlledvocabulary.language.Urapmin=Urapmin +controlledvocabulary.language.Urarina=Urarina +controlledvocabulary.language.Urartian=Urartian +controlledvocabulary.language.Urat=Urat +controlledvocabulary.language.Urdu=Urdu +controlledvocabulary.language.Urhobo=Urhobo +controlledvocabulary.language.Uri=Uri +controlledvocabulary.language.Urigina=Urigina +controlledvocabulary.language.Urim=Urim +controlledvocabulary.language.Urimo=Urimo +controlledvocabulary.language.Uripiv-Wala-Rano-Atchin=Uripiv-Wala-Rano-Atchin +controlledvocabulary.language.Urningangg=Urningangg +controlledvocabulary.language.Uru=Uru +controlledvocabulary.language.Uru-Eu-Wau-Wau=Uru-Eu-Wau-Wau +controlledvocabulary.language.Uru-Pa-In=Uru-Pa-In +controlledvocabulary.language.Uruangnirin=Uruangnirin +controlledvocabulary.language.Uruava=Uruava +controlledvocabulary.language.Urub�-Kaapor=Urub�-Kaapor +controlledvocabulary.language.Urub�-Kaapor_Sign_Language=Urub�-Kaapor Sign Language +controlledvocabulary.language.Uruguayan_Sign_Language=Uruguayan Sign Language +controlledvocabulary.language.Urum=Urum +controlledvocabulary.language.Urumi=Urumi +controlledvocabulary.language.Usaghade=Usaghade +controlledvocabulary.language.Usan=Usan +controlledvocabulary.language.Usarufa=Usarufa +controlledvocabulary.language.Ushojo=Ushojo +controlledvocabulary.language.Usila_Chinantec=Usila Chinantec +controlledvocabulary.language.Usku=Usku +controlledvocabulary.language.Uspanteco=Uspanteco +controlledvocabulary.language.Usui=Usui +controlledvocabulary.language.Utarmbung=Utarmbung +controlledvocabulary.language.Ute-Southern_Paiute=Ute-Southern Paiute +controlledvocabulary.language.Utu=Utu +controlledvocabulary.language.Uvbie=Uvbie +controlledvocabulary.language.Uya=Uya +controlledvocabulary.language.Uyajitaya=Uyajitaya +controlledvocabulary.language.Uzbek=Uzbek +controlledvocabulary.language.Uzbeki_Arabic=Uzbeki Arabic +controlledvocabulary.language.Uzekwe=Uzekwe +controlledvocabulary.language.Vaagri_Booli=Vaagri Booli +controlledvocabulary.language.Vafsi=Vafsi +controlledvocabulary.language.Vaghri=Vaghri +controlledvocabulary.language.Vaghua=Vaghua +controlledvocabulary.language.Vagla=Vagla +controlledvocabulary.language.Vai=Vai +controlledvocabulary.language.Vaiphei=Vaiphei +controlledvocabulary.language.Vale=Vale +controlledvocabulary.language.Valencian_Sign_Language=Valencian Sign Language +controlledvocabulary.language.Valle_Nacional_Chinantec=Valle Nacional Chinantec +controlledvocabulary.language.Valley_Maidu=Valley Maidu +controlledvocabulary.language.Valman=Valman +controlledvocabulary.language.Valpei=Valpei +controlledvocabulary.language.Vamale=Vamale +controlledvocabulary.language.Vame=Vame +controlledvocabulary.language.Vandalic=Vandalic +controlledvocabulary.language.Vangunu=Vangunu +controlledvocabulary.language.Vanimo=Vanimo +controlledvocabulary.language.Vano=Vano +controlledvocabulary.language.Vanuma=Vanuma +controlledvocabulary.language.Vao=Vao +controlledvocabulary.language.Varhadi-Nagpuri=Varhadi-Nagpuri +controlledvocabulary.language.Varisi=Varisi +controlledvocabulary.language.Varli=Varli +controlledvocabulary.language.Vasavi=Vasavi +controlledvocabulary.language.Veddah=Veddah +controlledvocabulary.language.Vedic_Sanskrit=Vedic Sanskrit +controlledvocabulary.language.Vehes=Vehes +controlledvocabulary.language.Veluws=Veluws +controlledvocabulary.language.Vemgo-Mabas=Vemgo-Mabas +controlledvocabulary.language.Venda=Venda +controlledvocabulary.language.Venetian=Venetian +controlledvocabulary.language.Venetic=Venetic +controlledvocabulary.language.Venezuelan_Sign_Language=Venezuelan Sign Language +controlledvocabulary.language.Vengo=Vengo +controlledvocabulary.language.Venture�o=Venture�o +controlledvocabulary.language.Veps=Veps +controlledvocabulary.language.Vera'a=Vera'a +controlledvocabulary.language.Vestinian=Vestinian +controlledvocabulary.language.Vidunda=Vidunda +controlledvocabulary.language.Viemo=Viemo +controlledvocabulary.language.Vietnamese=Vietnamese +controlledvocabulary.language.Vilela=Vilela +controlledvocabulary.language.Vili=Vili +controlledvocabulary.language.Villa_Viciosa_Agta=Villa Viciosa Agta +controlledvocabulary.language.Vincentian_Creole_English=Vincentian Creole English +controlledvocabulary.language.Vinmavis=Vinmavis +controlledvocabulary.language.Vinza=Vinza +controlledvocabulary.language.Virgin_Islands_Creole_English=Virgin Islands Creole English +controlledvocabulary.language.Vishavan=Vishavan +controlledvocabulary.language.Viti=Viti +controlledvocabulary.language.Vitou=Vitou +controlledvocabulary.language.Vitu=Vitu +controlledvocabulary.language.Vlaams=Vlaams +controlledvocabulary.language.Vlaamse_Gebarentaal=Vlaamse Gebarentaal +controlledvocabulary.language.Vlax_Romani=Vlax Romani +controlledvocabulary.language.Volap�k=Volap�k +controlledvocabulary.language.Volscian=Volscian +controlledvocabulary.language.Vono=Vono +controlledvocabulary.language.Voro=Voro +controlledvocabulary.language.Votic=Votic +controlledvocabulary.language.Vumbu=Vumbu +controlledvocabulary.language.Vunapu=Vunapu +controlledvocabulary.language.Vunjo=Vunjo +controlledvocabulary.language.Vur�s=Vur�s +controlledvocabulary.language.Vute=Vute +controlledvocabulary.language.Vwanji=Vwanji +controlledvocabulary.language.V�ro=V�ro +controlledvocabulary.language.Wa=Wa +controlledvocabulary.language.Wa'ema=Wa'ema +controlledvocabulary.language.Waama=Waama +controlledvocabulary.language.Waamwang=Waamwang +controlledvocabulary.language.Waata=Waata +controlledvocabulary.language.Wab=Wab +controlledvocabulary.language.Wabo=Wabo +controlledvocabulary.language.Waboda=Waboda +controlledvocabulary.language.Waci_Gbe=Waci Gbe +controlledvocabulary.language.Wadaginam=Wadaginam +controlledvocabulary.language.Waddar=Waddar +controlledvocabulary.language.Wadi_Wadi=Wadi Wadi +controlledvocabulary.language.Wadikali=Wadikali +controlledvocabulary.language.Wadiyara_Koli=Wadiyara Koli +controlledvocabulary.language.Wadjabangayi=Wadjabangayi +controlledvocabulary.language.Wadjiginy=Wadjiginy +controlledvocabulary.language.Wadjigu=Wadjigu +controlledvocabulary.language.Wae_Rana=Wae Rana +controlledvocabulary.language.Waffa=Waffa +controlledvocabulary.language.Wagawaga=Wagawaga +controlledvocabulary.language.Wagaya=Wagaya +controlledvocabulary.language.Wagdi=Wagdi +controlledvocabulary.language.Wagi=Wagi +controlledvocabulary.language.Wagiman=Wagiman +controlledvocabulary.language.Wahau_Kayan=Wahau Kayan +controlledvocabulary.language.Wahau_Kenyah=Wahau Kenyah +controlledvocabulary.language.Wahgi=Wahgi +controlledvocabulary.language.Waigali=Waigali +controlledvocabulary.language.Waigeo=Waigeo +controlledvocabulary.language.Wailaki=Wailaki +controlledvocabulary.language.Wailapa=Wailapa +controlledvocabulary.language.Waima=Waima +controlledvocabulary.language.Waima'a=Waima'a +controlledvocabulary.language.Waimaha=Waimaha +controlledvocabulary.language.Waimiri-Atroari=Waimiri-Atroari +controlledvocabulary.language.Waioli=Waioli +controlledvocabulary.language.Waiwai=Waiwai +controlledvocabulary.language.Waja=Waja +controlledvocabulary.language.Wajarri=Wajarri +controlledvocabulary.language.Wajuk=Wajuk +controlledvocabulary.language.Waka=Waka +controlledvocabulary.language.Wakabunga=Wakabunga +controlledvocabulary.language.Wakawaka=Wakawaka +controlledvocabulary.language.Wakde=Wakde +controlledvocabulary.language.Wakhi=Wakhi +controlledvocabulary.language.Wakon�=Wakon� +controlledvocabulary.language.Wala=Wala +controlledvocabulary.language.Walak=Walak +controlledvocabulary.language.Walangama=Walangama +controlledvocabulary.language.Wali_(Ghana)=Wali (Ghana) +controlledvocabulary.language.Wali_(Sudan)=Wali (Sudan) +controlledvocabulary.language.Waling=Waling +controlledvocabulary.language.Walio=Walio +controlledvocabulary.language.Walla_Walla=Walla Walla +controlledvocabulary.language.Wallisian=Wallisian +controlledvocabulary.language.Walloon=Walloon +controlledvocabulary.language.Walmajarri=Walmajarri +controlledvocabulary.language.Walser=Walser +controlledvocabulary.language.Walungge=Walungge +controlledvocabulary.language.Waluwarra=Waluwarra +controlledvocabulary.language.Wamas=Wamas +controlledvocabulary.language.Wambaya=Wambaya +controlledvocabulary.language.Wambon=Wambon +controlledvocabulary.language.Wambule=Wambule +controlledvocabulary.language.Wamesa=Wamesa +controlledvocabulary.language.Wamey=Wamey +controlledvocabulary.language.Wamin=Wamin +controlledvocabulary.language.Wampanoag=Wampanoag +controlledvocabulary.language.Wampar=Wampar +controlledvocabulary.language.Wampur=Wampur +controlledvocabulary.language.Wan=Wan +controlledvocabulary.language.Wanap=Wanap +controlledvocabulary.language.Wancho_Naga=Wancho Naga +controlledvocabulary.language.Wanda=Wanda +controlledvocabulary.language.Wandala=Wandala +controlledvocabulary.language.Wandarang=Wandarang +controlledvocabulary.language.Wandji=Wandji +controlledvocabulary.language.Waneci=Waneci +controlledvocabulary.language.Wanga=Wanga +controlledvocabulary.language.Wangaaybuwan-Ngiyambaa=Wangaaybuwan-Ngiyambaa +controlledvocabulary.language.Wanggamala=Wanggamala +controlledvocabulary.language.Wanggom=Wanggom +controlledvocabulary.language.Wangkangurru=Wangkangurru +controlledvocabulary.language.Wangkayutyuru=Wangkayutyuru +controlledvocabulary.language.Wangkumara=Wangkumara +controlledvocabulary.language.Wannu=Wannu +controlledvocabulary.language.Wano=Wano +controlledvocabulary.language.Wantoat=Wantoat +controlledvocabulary.language.Wanukaka=Wanukaka +controlledvocabulary.language.Wanyi=Wanyi +controlledvocabulary.language.Wan�=Wan� +controlledvocabulary.language.Waorani=Waorani +controlledvocabulary.language.Wapan=Wapan +controlledvocabulary.language.Wapishana=Wapishana +controlledvocabulary.language.Wappo=Wappo +controlledvocabulary.language.War-Jaintia=War-Jaintia +controlledvocabulary.language.Wara=Wara +controlledvocabulary.language.Warao=Warao +controlledvocabulary.language.Waray_(Australia)=Waray (Australia) +controlledvocabulary.language.Waray_(Philippines)=Waray (Philippines) +controlledvocabulary.language.Wardaman=Wardaman +controlledvocabulary.language.Wardandi=Wardandi +controlledvocabulary.language.Warembori=Warembori +controlledvocabulary.language.Wares=Wares +controlledvocabulary.language.Waris=Waris +controlledvocabulary.language.Waritai=Waritai +controlledvocabulary.language.Wariyangga=Wariyangga +controlledvocabulary.language.Warji=Warji +controlledvocabulary.language.Warkay-Bipim=Warkay-Bipim +controlledvocabulary.language.Warlmanpa=Warlmanpa +controlledvocabulary.language.Warlpiri=Warlpiri +controlledvocabulary.language.Warnang=Warnang +controlledvocabulary.language.Warnman=Warnman +controlledvocabulary.language.Waropen=Waropen +controlledvocabulary.language.Warrgamay=Warrgamay +controlledvocabulary.language.Warrwa=Warrwa +controlledvocabulary.language.Waru=Waru +controlledvocabulary.language.Warumungu=Warumungu +controlledvocabulary.language.Waruna=Waruna +controlledvocabulary.language.Warungu=Warungu +controlledvocabulary.language.Warwar_Feni=Warwar Feni +controlledvocabulary.language.Wasa=Wasa +controlledvocabulary.language.Wasco-Wishram=Wasco-Wishram +controlledvocabulary.language.Wasembo=Wasembo +controlledvocabulary.language.Washo=Washo +controlledvocabulary.language.Waskia=Waskia +controlledvocabulary.language.Wasu=Wasu +controlledvocabulary.language.Watakataui=Watakataui +controlledvocabulary.language.Watam=Watam +controlledvocabulary.language.Wathawurrung=Wathawurrung +controlledvocabulary.language.Watiwa=Watiwa +controlledvocabulary.language.Watubela=Watubela +controlledvocabulary.language.Waube=Waube +controlledvocabulary.language.Waur�=Waur� +controlledvocabulary.language.Wauyai=Wauyai +controlledvocabulary.language.Wawa=Wawa +controlledvocabulary.language.Wawonii=Wawonii +controlledvocabulary.language.Waxianghua=Waxianghua +controlledvocabulary.language.Wayampi=Wayampi +controlledvocabulary.language.Wayana=Wayana +controlledvocabulary.language.Wayanad_Chetti=Wayanad Chetti +controlledvocabulary.language.Wayor�=Wayor� +controlledvocabulary.language.Wayu=Wayu +controlledvocabulary.language.Wayuu=Wayuu +controlledvocabulary.language.Wedau=Wedau +controlledvocabulary.language.Weh=Weh +controlledvocabulary.language.Wejewa=Wejewa +controlledvocabulary.language.Welaun=Welaun +controlledvocabulary.language.Weliki=Weliki +controlledvocabulary.language.Welsh=Welsh +controlledvocabulary.language.Welsh_Romani=Welsh Romani +controlledvocabulary.language.Wemale=Wemale +controlledvocabulary.language.Wemba_Wemba=Wemba Wemba +controlledvocabulary.language.Weme_Gbe=Weme Gbe +controlledvocabulary.language.Wendat=Wendat +controlledvocabulary.language.Wergaia=Wergaia +controlledvocabulary.language.Weri=Weri +controlledvocabulary.language.Wersing=Wersing +controlledvocabulary.language.West_Albay_Bikol=West Albay Bikol +controlledvocabulary.language.West_Ambae=West Ambae +controlledvocabulary.language.West_Bengal_Sign_Language=West Bengal Sign Language +controlledvocabulary.language.West_Berawan=West Berawan +controlledvocabulary.language.West_Central_Banda=West Central Banda +controlledvocabulary.language.West_Central_Oromo=West Central Oromo +controlledvocabulary.language.West_Coast_Bajau=West Coast Bajau +controlledvocabulary.language.West_Damar=West Damar +controlledvocabulary.language.West_Goodenough=West Goodenough +controlledvocabulary.language.West_Kewa=West Kewa +controlledvocabulary.language.West_Lembata=West Lembata +controlledvocabulary.language.West_Makian=West Makian +controlledvocabulary.language.West_Masela=West Masela +controlledvocabulary.language.West_Tarangan=West Tarangan +controlledvocabulary.language.West_Uvean=West Uvean +controlledvocabulary.language.West_Yugur=West Yugur +controlledvocabulary.language.West-Central_Limba=West-Central Limba +controlledvocabulary.language.Western_Abnaki=Western Abnaki +controlledvocabulary.language.Western_Apache=Western Apache +controlledvocabulary.language.Western_Armenian=Western Armenian +controlledvocabulary.language.Western_Arrarnta=Western Arrarnta +controlledvocabulary.language.Western_Balochi=Western Balochi +controlledvocabulary.language.Western_Bolivian_Guaran�=Western Bolivian Guaran� +controlledvocabulary.language.Western_Bru=Western Bru +controlledvocabulary.language.Western_Bukidnon_Manobo=Western Bukidnon Manobo +controlledvocabulary.language.Western_Cham=Western Cham +controlledvocabulary.language.Western_Dani=Western Dani +controlledvocabulary.language.Western_Durango_Nahuatl=Western Durango Nahuatl +controlledvocabulary.language.Western_Fijian=Western Fijian +controlledvocabulary.language.Western_Frisian=Western Frisian +controlledvocabulary.language.Western_Highland_Chatino=Western Highland Chatino +controlledvocabulary.language.Western_Highland_Purepecha=Western Highland Purepecha +controlledvocabulary.language.Western_Huasteca_Nahuatl=Western Huasteca Nahuatl +controlledvocabulary.language.Western_Juxtlahuaca_Mixtec=Western Juxtlahuaca Mixtec +controlledvocabulary.language.Western_Kanjobal=Western Kanjobal +controlledvocabulary.language.Western_Karaboro=Western Karaboro +controlledvocabulary.language.Western_Katu=Western Katu +controlledvocabulary.language.Western_Kayah=Western Kayah +controlledvocabulary.language.Western_Keres=Western Keres +controlledvocabulary.language.Western_Krahn=Western Krahn +controlledvocabulary.language.Western_Lalu=Western Lalu +controlledvocabulary.language.Western_Lawa=Western Lawa +controlledvocabulary.language.Western_Magar=Western Magar +controlledvocabulary.language.Western_Maninkakan=Western Maninkakan +controlledvocabulary.language.Western_Mari=Western Mari +controlledvocabulary.language.Western_Mashan_Hmong=Western Mashan Hmong +controlledvocabulary.language.Western_Meohang=Western Meohang +controlledvocabulary.language.Western_Minyag=Western Minyag +controlledvocabulary.language.Western_Muria=Western Muria +controlledvocabulary.language.Western_Neo-Aramaic=Western Neo-Aramaic +controlledvocabulary.language.Western_Niger_Fulfulde=Western Niger Fulfulde +controlledvocabulary.language.Western_Ojibwa=Western Ojibwa +controlledvocabulary.language.Western_Panjabi=Western Panjabi +controlledvocabulary.language.Western_Parbate_Kham=Western Parbate Kham +controlledvocabulary.language.Western_Penan=Western Penan +controlledvocabulary.language.Western_Sisaala=Western Sisaala +controlledvocabulary.language.Western_Subanon=Western Subanon +controlledvocabulary.language.Western_Tamang=Western Tamang +controlledvocabulary.language.Western_Tawbuid=Western Tawbuid +controlledvocabulary.language.Western_Tlacolula_Valley_Zapotec=Western Tlacolula Valley Zapotec +controlledvocabulary.language.Western_Totonac=Western Totonac +controlledvocabulary.language.Western_Tunebo=Western Tunebo +controlledvocabulary.language.Western_Xiangxi_Miao=Western Xiangxi Miao +controlledvocabulary.language.Western_Xwla_Gbe=Western Xwla Gbe +controlledvocabulary.language.Western_Yiddish=Western Yiddish +controlledvocabulary.language.Westphalien=Westphalien +controlledvocabulary.language.Wetamut=Wetamut +controlledvocabulary.language.Wewaw=Wewaw +controlledvocabulary.language.Weyto=Weyto +controlledvocabulary.language.White_Gelao=White Gelao +controlledvocabulary.language.White_Lachi=White Lachi +controlledvocabulary.language.Whitesands=Whitesands +controlledvocabulary.language.Wiarumus=Wiarumus +controlledvocabulary.language.Wichita=Wichita +controlledvocabulary.language.Wich�_Lhamt�s_G�isnay=Wich� Lhamt�s G�isnay +controlledvocabulary.language.Wich�_Lhamt�s_Nocten=Wich� Lhamt�s Nocten +controlledvocabulary.language.Wich�_Lhamt�s_Vejoz=Wich� Lhamt�s Vejoz +controlledvocabulary.language.Wik_Ngathan=Wik Ngathan +controlledvocabulary.language.Wik-Epa=Wik-Epa +controlledvocabulary.language.Wik-Iiyanh=Wik-Iiyanh +controlledvocabulary.language.Wik-Keyangan=Wik-Keyangan +controlledvocabulary.language.Wik-Me'anha=Wik-Me'anha +controlledvocabulary.language.Wik-Mungkan=Wik-Mungkan +controlledvocabulary.language.Wikalkan=Wikalkan +controlledvocabulary.language.Wikngenchera=Wikngenchera +controlledvocabulary.language.Wilawila=Wilawila +controlledvocabulary.language.Wintu=Wintu +controlledvocabulary.language.Winy�=Winy� +controlledvocabulary.language.Wipi=Wipi +controlledvocabulary.language.Wiradjuri=Wiradjuri +controlledvocabulary.language.Wiraf�d=Wiraf�d +controlledvocabulary.language.Wirangu=Wirangu +controlledvocabulary.language.Wiru=Wiru +controlledvocabulary.language.Wiyot=Wiyot +controlledvocabulary.language.Woccon=Woccon +controlledvocabulary.language.Wogamusin=Wogamusin +controlledvocabulary.language.Wogeo=Wogeo +controlledvocabulary.language.Woi=Woi +controlledvocabulary.language.Woiwurrung=Woiwurrung +controlledvocabulary.language.Wojenaka=Wojenaka +controlledvocabulary.language.Wolane=Wolane +controlledvocabulary.language.Wolani=Wolani +controlledvocabulary.language.Wolaytta=Wolaytta +controlledvocabulary.language.Woleaian=Woleaian +controlledvocabulary.language.Wolio=Wolio +controlledvocabulary.language.Wolof=Wolof +controlledvocabulary.language.Wom_(Nigeria)=Wom (Nigeria) +controlledvocabulary.language.Wom_(Papua_New_Guinea)=Wom (Papua New Guinea) +controlledvocabulary.language.Womo=Womo +controlledvocabulary.language.Wongo=Wongo +controlledvocabulary.language.Woods_Cree=Woods Cree +controlledvocabulary.language.Woria=Woria +controlledvocabulary.language.Worimi=Worimi +controlledvocabulary.language.Worodougou=Worodougou +controlledvocabulary.language.Worrorra=Worrorra +controlledvocabulary.language.Wotapuri-Katarqalai=Wotapuri-Katarqalai +controlledvocabulary.language.Wotjobaluk=Wotjobaluk +controlledvocabulary.language.Wotu=Wotu +controlledvocabulary.language.Woun_Meu=Woun Meu +controlledvocabulary.language.Written_Oirat=Written Oirat +controlledvocabulary.language.Wu_Chinese=Wu Chinese +controlledvocabulary.language.Wuding-Luquan_Yi=Wuding-Luquan Yi +controlledvocabulary.language.Wudu=Wudu +controlledvocabulary.language.Wuliwuli=Wuliwuli +controlledvocabulary.language.Wulna=Wulna +controlledvocabulary.language.Wumboko=Wumboko +controlledvocabulary.language.Wumbvu=Wumbvu +controlledvocabulary.language.Wumeng_Nasu=Wumeng Nasu +controlledvocabulary.language.Wunai_Bunu=Wunai Bunu +controlledvocabulary.language.Wunambal=Wunambal +controlledvocabulary.language.Wunumara=Wunumara +controlledvocabulary.language.Wurrugu=Wurrugu +controlledvocabulary.language.Wusa_Nasu=Wusa Nasu +controlledvocabulary.language.Wushi=Wushi +controlledvocabulary.language.Wusi=Wusi +controlledvocabulary.language.Wutung=Wutung +controlledvocabulary.language.Wutunhua=Wutunhua +controlledvocabulary.language.Wuvulu-Aua=Wuvulu-Aua +controlledvocabulary.language.Wuzlam=Wuzlam +controlledvocabulary.language.Wyandot=Wyandot +controlledvocabulary.language.Wymysorys=Wymysorys +controlledvocabulary.language.W�ra=W�ra +controlledvocabulary.language.W�pha=W�pha +controlledvocabulary.language.W�_Northern=W� Northern +controlledvocabulary.language.W�_Southern=W� Southern +controlledvocabulary.language.W�_Western=W� Western +controlledvocabulary.language.Xaasongaxango=Xaasongaxango +controlledvocabulary.language.Xadani_Zapotec=Xadani Zapotec +controlledvocabulary.language.Xakriab�=Xakriab� +controlledvocabulary.language.Xamtanga=Xamtanga +controlledvocabulary.language.Xanagu�a_Zapotec=Xanagu�a Zapotec +controlledvocabulary.language.Xav�nte=Xav�nte +controlledvocabulary.language.Xer�nte=Xer�nte +controlledvocabulary.language.Xet�=Xet� +controlledvocabulary.language.Xhosa=Xhosa +controlledvocabulary.language.Xiang_Chinese=Xiang Chinese +controlledvocabulary.language.Xibe=Xibe +controlledvocabulary.language.Xicotepec_De_Ju�rez_Totonac=Xicotepec De Ju�rez Totonac +controlledvocabulary.language.Xinca=Xinca +controlledvocabulary.language.Xing�_Asurin�=Xing� Asurin� +controlledvocabulary.language.Xipaya=Xipaya +controlledvocabulary.language.Xiri=Xiri +controlledvocabulary.language.Xiri�na=Xiri�na +controlledvocabulary.language.Xishanba_Lalo=Xishanba Lalo +controlledvocabulary.language.Xokleng=Xokleng +controlledvocabulary.language.Xukur�=Xukur� +controlledvocabulary.language.Xwela_Gbe=Xwela Gbe +controlledvocabulary.language.X�r�c��=X�r�c�� +controlledvocabulary.language.X�r�gur�=X�r�gur� +controlledvocabulary.language.Yaaku=Yaaku +controlledvocabulary.language.Yabarana=Yabarana +controlledvocabulary.language.Yaba�na=Yaba�na +controlledvocabulary.language.Yabem=Yabem +controlledvocabulary.language.Yaben=Yaben +controlledvocabulary.language.Yabong=Yabong +controlledvocabulary.language.Yabula_Yabula=Yabula Yabula +controlledvocabulary.language.Yace=Yace +controlledvocabulary.language.Yaeyama=Yaeyama +controlledvocabulary.language.Yafi=Yafi +controlledvocabulary.language.Yagara=Yagara +controlledvocabulary.language.Yagaria=Yagaria +controlledvocabulary.language.Yagnobi=Yagnobi +controlledvocabulary.language.Yagomi=Yagomi +controlledvocabulary.language.Yagua=Yagua +controlledvocabulary.language.Yagwoia=Yagwoia +controlledvocabulary.language.Yahadian=Yahadian +controlledvocabulary.language.Yahang=Yahang +controlledvocabulary.language.Yahuna=Yahuna +controlledvocabulary.language.Yaka_(Central_African_Republic)=Yaka (Central African Republic) +controlledvocabulary.language.Yaka_(Congo)=Yaka (Congo) +controlledvocabulary.language.Yaka_(Democratic_Republic_of_Congo)=Yaka (Democratic Republic of Congo) +controlledvocabulary.language.Yakaikeke=Yakaikeke +controlledvocabulary.language.Yakama=Yakama +controlledvocabulary.language.Yakan=Yakan +controlledvocabulary.language.Yakha=Yakha +controlledvocabulary.language.Yakoma=Yakoma +controlledvocabulary.language.Yakut=Yakut +controlledvocabulary.language.Yala=Yala +controlledvocabulary.language.Yalahatan=Yalahatan +controlledvocabulary.language.Yalakalore=Yalakalore +controlledvocabulary.language.Yalarnnga=Yalarnnga +controlledvocabulary.language.Yale=Yale +controlledvocabulary.language.Yaleba=Yaleba +controlledvocabulary.language.Yalunka=Yalunka +controlledvocabulary.language.Yal�lag_Zapotec=Yal�lag Zapotec +controlledvocabulary.language.Yamap=Yamap +controlledvocabulary.language.Yamba=Yamba +controlledvocabulary.language.Yambes=Yambes +controlledvocabulary.language.Yambeta=Yambeta +controlledvocabulary.language.Yamdena=Yamdena +controlledvocabulary.language.Yameo=Yameo +controlledvocabulary.language.Yami=Yami +controlledvocabulary.language.Yaminahua=Yaminahua +controlledvocabulary.language.Yamna=Yamna +controlledvocabulary.language.Yamongeri=Yamongeri +controlledvocabulary.language.Yamphu=Yamphu +controlledvocabulary.language.Yan-nhangu=Yan-nhangu +controlledvocabulary.language.Yan-nhau_Sign_Language=Yan-nha?u Sign Language +controlledvocabulary.language.Yana=Yana +controlledvocabulary.language.Yanahuanca_Pasco_Quechua=Yanahuanca Pasco Quechua +controlledvocabulary.language.Yanda=Yanda +controlledvocabulary.language.Yanda_Dom_Dogon=Yanda Dom Dogon +controlledvocabulary.language.Yandjibara=Yandjibara +controlledvocabulary.language.Yandruwandha=Yandruwandha +controlledvocabulary.language.Yanesha'=Yanesha' +controlledvocabulary.language.Yang_Zhuang=Yang Zhuang +controlledvocabulary.language.Yangben=Yangben +controlledvocabulary.language.Yangkam=Yangkam +controlledvocabulary.language.Yangman=Yangman +controlledvocabulary.language.Yango=Yango +controlledvocabulary.language.Yangulam=Yangulam +controlledvocabulary.language.Yangum_Dey=Yangum Dey +controlledvocabulary.language.Yangum_Gel=Yangum Gel +controlledvocabulary.language.Yangum_Mon=Yangum Mon +controlledvocabulary.language.Yankunytjatjara=Yankunytjatjara +controlledvocabulary.language.Yanomam�=Yanomam� +controlledvocabulary.language.Yanom�mi=Yanom�mi +controlledvocabulary.language.Yansi=Yansi +controlledvocabulary.language.Yanyuwa=Yanyuwa +controlledvocabulary.language.Yao=Yao +controlledvocabulary.language.Yaosakor_Asmat=Yaosakor Asmat +controlledvocabulary.language.Yaour�=Yaour� +controlledvocabulary.language.Yapese=Yapese +controlledvocabulary.language.Yapunda=Yapunda +controlledvocabulary.language.Yaqay=Yaqay +controlledvocabulary.language.Yaqui=Yaqui +controlledvocabulary.language.Yarawata=Yarawata +controlledvocabulary.language.Yardliyawarra=Yardliyawarra +controlledvocabulary.language.Yareba=Yareba +controlledvocabulary.language.Yareni_Zapotec=Yareni Zapotec +controlledvocabulary.language.Yarluyandi=Yarluyandi +controlledvocabulary.language.Yaroam�=Yaroam� +controlledvocabulary.language.Yarsun=Yarsun +controlledvocabulary.language.Yasa=Yasa +controlledvocabulary.language.Yassic=Yassic +controlledvocabulary.language.Yatay=Yatay +controlledvocabulary.language.Yatee_Zapotec=Yatee Zapotec +controlledvocabulary.language.Yatzachi_Zapotec=Yatzachi Zapotec +controlledvocabulary.language.Yau_(Morobe_Province)=Yau (Morobe Province) +controlledvocabulary.language.Yau_(Sandaun_Province)=Yau (Sandaun Province) +controlledvocabulary.language.Yaul=Yaul +controlledvocabulary.language.Yauma=Yauma +controlledvocabulary.language.Yaur=Yaur +controlledvocabulary.language.Yautepec_Zapotec=Yautepec Zapotec +controlledvocabulary.language.Yauyos_Quechua=Yauyos Quechua +controlledvocabulary.language.Yavitero=Yavitero +controlledvocabulary.language.Yawa=Yawa +controlledvocabulary.language.Yawalapit�=Yawalapit� +controlledvocabulary.language.Yawanawa=Yawanawa +controlledvocabulary.language.Yawarawarga=Yawarawarga +controlledvocabulary.language.Yaweyuha=Yaweyuha +controlledvocabulary.language.Yawijibaya=Yawijibaya +controlledvocabulary.language.Yawiyo=Yawiyo +controlledvocabulary.language.Yawuru=Yawuru +controlledvocabulary.language.Yaygir=Yaygir +controlledvocabulary.language.Yazgulyam=Yazgulyam +controlledvocabulary.language.Yecuatla_Totonac=Yecuatla Totonac +controlledvocabulary.language.Yei=Yei +controlledvocabulary.language.Yekhee=Yekhee +controlledvocabulary.language.Yekora=Yekora +controlledvocabulary.language.Yela=Yela +controlledvocabulary.language.Yele=Yele +controlledvocabulary.language.Yelmek=Yelmek +controlledvocabulary.language.Yelogu=Yelogu +controlledvocabulary.language.Yemba=Yemba +controlledvocabulary.language.Yemsa=Yemsa +controlledvocabulary.language.Yendang=Yendang +controlledvocabulary.language.Yeni=Yeni +controlledvocabulary.language.Yeniche=Yeniche +controlledvocabulary.language.Yerakai=Yerakai +controlledvocabulary.language.Yeretuar=Yeretuar +controlledvocabulary.language.Yerong=Yerong +controlledvocabulary.language.Yerukula=Yerukula +controlledvocabulary.language.Yessan-Mayo=Yessan-Mayo +controlledvocabulary.language.Yetfa=Yetfa +controlledvocabulary.language.Yevanic=Yevanic +controlledvocabulary.language.Yeyi=Yeyi +controlledvocabulary.language.Yiddish=Yiddish +controlledvocabulary.language.Yidgha=Yidgha +controlledvocabulary.language.Yidiny=Yidiny +controlledvocabulary.language.Yil=Yil +controlledvocabulary.language.Yilan_Creole=Yilan Creole +controlledvocabulary.language.Yimas=Yimas +controlledvocabulary.language.Yimchungru_Naga=Yimchungru Naga +controlledvocabulary.language.Yinbaw_Karen=Yinbaw Karen +controlledvocabulary.language.Yindjibarndi=Yindjibarndi +controlledvocabulary.language.Yindjilandji=Yindjilandji +controlledvocabulary.language.Yine=Yine +controlledvocabulary.language.Yinggarda=Yinggarda +controlledvocabulary.language.Yinhawangka=Yinhawangka +controlledvocabulary.language.Yiningayi=Yiningayi +controlledvocabulary.language.Yintale_Karen=Yintale Karen +controlledvocabulary.language.Yinwum=Yinwum +controlledvocabulary.language.Yir_Yoront=Yir Yoront +controlledvocabulary.language.Yirandali=Yirandali +controlledvocabulary.language.Yirrk-Mel=Yirrk-Mel +controlledvocabulary.language.Yis=Yis +controlledvocabulary.language.Yitha_Yitha=Yitha Yitha +controlledvocabulary.language.Yoba=Yoba +controlledvocabulary.language.Yocobou�_Dida=Yocobou� Dida +controlledvocabulary.language.Yogad=Yogad +controlledvocabulary.language.Yoidik=Yoidik +controlledvocabulary.language.Yoke=Yoke +controlledvocabulary.language.Yokuts=Yokuts +controlledvocabulary.language.Yola=Yola +controlledvocabulary.language.Yoloxochitl_Mixtec=Yoloxochitl Mixtec +controlledvocabulary.language.Yolu_Sign_Language=Yol?u Sign Language +controlledvocabulary.language.Yom=Yom +controlledvocabulary.language.Yombe=Yombe +controlledvocabulary.language.Yonaguni=Yonaguni +controlledvocabulary.language.Yong=Yong +controlledvocabulary.language.Yongbei_Zhuang=Yongbei Zhuang +controlledvocabulary.language.Yongkom=Yongkom +controlledvocabulary.language.Yongnan_Zhuang=Yongnan Zhuang +controlledvocabulary.language.Yopno=Yopno +controlledvocabulary.language.Yora=Yora +controlledvocabulary.language.Yoron=Yoron +controlledvocabulary.language.Yorta_Yorta=Yorta Yorta +controlledvocabulary.language.Yoruba=Yoruba +controlledvocabulary.language.Yosond�a_Mixtec=Yosond�a Mixtec +controlledvocabulary.language.Yotti=Yotti +controlledvocabulary.language.Youjiang_Zhuang=Youjiang Zhuang +controlledvocabulary.language.Youle_Jinuo=Youle Jinuo +controlledvocabulary.language.Younuo_Bunu=Younuo Bunu +controlledvocabulary.language.Yout_Wam=Yout Wam +controlledvocabulary.language.Yoy=Yoy +controlledvocabulary.language.Yuanga=Yuanga +controlledvocabulary.language.Yucatec_Maya_Sign_Language=Yucatec Maya Sign Language +controlledvocabulary.language.Yucateco=Yucateco +controlledvocabulary.language.Yuchi=Yuchi +controlledvocabulary.language.Yucua�e_Mixtec=Yucua�e Mixtec +controlledvocabulary.language.Yucuna=Yucuna +controlledvocabulary.language.Yue_Chinese=Yue Chinese +controlledvocabulary.language.Yug=Yug +controlledvocabulary.language.Yugambal=Yugambal +controlledvocabulary.language.Yugoslavian_Sign_Language=Yugoslavian Sign Language +controlledvocabulary.language.Yugul=Yugul +controlledvocabulary.language.Yuhup=Yuhup +controlledvocabulary.language.Yuki=Yuki +controlledvocabulary.language.Yukpa=Yukpa +controlledvocabulary.language.Yukuben=Yukuben +controlledvocabulary.language.Yulu=Yulu +controlledvocabulary.language.Yuqui=Yuqui +controlledvocabulary.language.Yuracare=Yuracare +controlledvocabulary.language.Yurats=Yurats +controlledvocabulary.language.Yurok=Yurok +controlledvocabulary.language.Yuru=Yuru +controlledvocabulary.language.Yurut�=Yurut� +controlledvocabulary.language.Yutanduchi_Mixtec=Yutanduchi Mixtec +controlledvocabulary.language.Yuwana=Yuwana +controlledvocabulary.language.Yuyu=Yuyu +controlledvocabulary.language.Ywom=Ywom +controlledvocabulary.language.Y�mana=Y�mana +controlledvocabulary.language.Zaachila_Zapotec=Zaachila Zapotec +controlledvocabulary.language.Zabana=Zabana +controlledvocabulary.language.Zacatepec_Chatino=Zacatepec Chatino +controlledvocabulary.language.Zacatl�n-Ahuacatl�n-Tepetzintla_Nahuatl=Zacatl�n-Ahuacatl�n-Tepetzintla Nahuatl +controlledvocabulary.language.Zaghawa=Zaghawa +controlledvocabulary.language.Zaiwa=Zaiwa +controlledvocabulary.language.Zakhring=Zakhring +controlledvocabulary.language.Zambian_Sign_Language=Zambian Sign Language +controlledvocabulary.language.Zan_Gula=Zan Gula +controlledvocabulary.language.Zanaki=Zanaki +controlledvocabulary.language.Zande_(individual_language)=Zande (individual language) +controlledvocabulary.language.Zangskari=Zangskari +controlledvocabulary.language.Zangwal=Zangwal +controlledvocabulary.language.Zaniza_Zapotec=Zaniza Zapotec +controlledvocabulary.language.Zapotec=Zapotec +controlledvocabulary.language.Zaramo=Zaramo +controlledvocabulary.language.Zari=Zari +controlledvocabulary.language.Zarma=Zarma +controlledvocabulary.language.Zarphatic=Zarphatic +controlledvocabulary.language.Zauzou=Zauzou +controlledvocabulary.language.Zay=Zay +controlledvocabulary.language.Zayein_Karen=Zayein Karen +controlledvocabulary.language.Zayse-Zergulla=Zayse-Zergulla +controlledvocabulary.language.Zaza=Zaza +controlledvocabulary.language.Zazao=Zazao +controlledvocabulary.language.Zeem=Zeem +controlledvocabulary.language.Zeeuws=Zeeuws +controlledvocabulary.language.Zemba=Zemba +controlledvocabulary.language.Zeme_Naga=Zeme Naga +controlledvocabulary.language.Zemgalian=Zemgalian +controlledvocabulary.language.Zenag=Zenag +controlledvocabulary.language.Zenaga=Zenaga +controlledvocabulary.language.Zenzontepec_Chatino=Zenzontepec Chatino +controlledvocabulary.language.Zerenkel=Zerenkel +controlledvocabulary.language.Zhaba=Zhaba +controlledvocabulary.language.Zhang-Zhung=Zhang-Zhung +controlledvocabulary.language.Zhire=Zhire +controlledvocabulary.language.Zhoa=Zhoa +controlledvocabulary.language.Zhuang,_Chuang=Zhuang, Chuang +controlledvocabulary.language.Zia=Zia +controlledvocabulary.language.Zialo=Zialo +controlledvocabulary.language.Zigula=Zigula +controlledvocabulary.language.Zimakani=Zimakani +controlledvocabulary.language.Zimba=Zimba +controlledvocabulary.language.Zimbabwe_Sign_Language=Zimbabwe Sign Language +controlledvocabulary.language.Zinza=Zinza +controlledvocabulary.language.Zire=Zire +controlledvocabulary.language.Zizilivakan=Zizilivakan +controlledvocabulary.language.Zo'�=Zo'� +controlledvocabulary.language.Zokhuo=Zokhuo +controlledvocabulary.language.Zoogocho_Zapotec=Zoogocho Zapotec +controlledvocabulary.language.Zoroastrian_Dari=Zoroastrian Dari +controlledvocabulary.language.Zotung_Chin=Zotung Chin +controlledvocabulary.language.Zou=Zou +controlledvocabulary.language.Zul=Zul +controlledvocabulary.language.Zula=Zula +controlledvocabulary.language.Zulgo-Gemzek=Zulgo-Gemzek +controlledvocabulary.language.Zulu=Zulu +controlledvocabulary.language.Zumaya=Zumaya +controlledvocabulary.language.Zumbun=Zumbun +controlledvocabulary.language.Zuni=Zuni +controlledvocabulary.language.Zuojiang_Zhuang=Zuojiang Zhuang +controlledvocabulary.language.Zyphe_Chin=Zyphe Chin +controlledvocabulary.language.Z�paro=Z�paro +controlledvocabulary.language.sTodsde=sTodsde +controlledvocabulary.language.us-Saare=us-Saare +controlledvocabulary.language.ut-Hun=ut-Hun +controlledvocabulary.language.ut-Ma'in=ut-Ma'in +controlledvocabulary.language.�h�n=�h�n +controlledvocabulary.language.�nc�=�nc� +controlledvocabulary.language.�mie=�mie +controlledvocabulary.language.�nge=�nge +controlledvocabulary.language.Gwi=Gwi +controlledvocabulary.language.Xam=Xam +controlledvocabulary.language.Ani=Ani +controlledvocabulary.language.Xegwi=Xegwi +controlledvocabulary.language.Hua=Hua +controlledvocabulary.language.Ungkue=Ungkue +controlledvocabulary.language.X��=X�� +controlledvocabulary.language.Not_applicable=Not applicable diff --git a/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java b/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java index 8644de89709..42ac42956e2 100644 --- a/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java @@ -1,12 +1,19 @@ package edu.harvard.iq.dataverse; import edu.harvard.iq.dataverse.mocks.MocksFactory; +import edu.harvard.iq.dataverse.util.BundleUtil; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import java.io.BufferedReader; +import java.io.FileReader; +import java.util.Set; import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class MetadataBlockTest { @@ -76,4 +83,43 @@ public void getLocaleDisplayFacet_should_get_value_from_properties_based_on_name MatcherAssert.assertThat(target.getLocaleDisplayFacet(), Matchers.is("property_value_for_displayFacet")); Mockito.verify(target).getLocaleValue("metadatablock.displayFacet"); } -} \ No newline at end of file + + @Test + public void testLanguageBundle() throws Exception { + String fileName = "scripts/api/data/metadatablocks/citation.tsv"; + Set languages = BundleUtil.getResourceBundle("citation").keySet(); + try (BufferedReader reader = new BufferedReader(new FileReader(fileName))) { + String line; + String bundleKey = ""; + int missingCount = 0; + AtomicInteger unusedCount = new AtomicInteger(); + while ((line = reader.readLine()) != null) { + if (line.startsWith("#controlledVocabulary")) { + while ((line = reader.readLine()) != null) { + if (line.startsWith("\tlanguage")) { + String[] values = line.split("\t"); + String key = values[2]; + bundleKey = BundleUtil.getKeyFromRawString("controlledvocabulary.language." + key); + if (languages.contains(bundleKey)) { + languages.remove(bundleKey); + } else { + missingCount++; + System.out.println("Missing key:" + key.toLowerCase().replace(" ", "_") + " " + bundleKey); + } + } + } + languages.forEach(l -> { + if (l.startsWith("controlledvocabulary.language")) { + unusedCount.getAndIncrement(); + System.out.println("Unused key:" + l); + } + }); + System.out.println("Missing count:"+missingCount); + System.out.println("Unused Count:" + unusedCount.get()); + } + } + assertEquals(0, missingCount); + assertEquals(0, unusedCount.get()); + } + } +} diff --git a/tests/verify_mdb_properties.sh b/tests/verify_mdb_properties.sh index bc62c0f503a..54aea12bfbe 100755 --- a/tests/verify_mdb_properties.sh +++ b/tests/verify_mdb_properties.sh @@ -31,7 +31,8 @@ import java.io.IOException; class stripaccents { public static void main(String[] args) throws IOException { String input = new String(System.in.readAllBytes(), StandardCharsets.UTF_8).toLowerCase().replace(" ", "_"); - System.out.println(StringUtils.stripAccents(input)); + # System.out.println(StringUtils.stripAccents(input)); + System.out.println(input.replaceAll("[^\\x00-\\xFF]", "").trim()); } } EOF From 4accd1be2c67355a114564d7cb6982ff6a60f5b4 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:29:00 -0400 Subject: [PATCH 257/366] fixing key to lowercase --- .../harvard/iq/dataverse/util/BundleUtil.java | 2 +- .../java/propertyFiles/citation.properties | 15840 ++++++++-------- 2 files changed, 7921 insertions(+), 7921 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java index 2f3109a10c6..361ae812833 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java @@ -201,6 +201,6 @@ public static Locale getDefaultLocale() { * @return */ public static String getKeyFromRawString(String rawKey) { - return rawKey.replaceAll("[^\\x00-\\xFF]", "").trim().replace(" ", "_"); + return rawKey.replaceAll("[^\\x00-\\xFF]", "").trim().replace(" ", "_").toLowerCase(); } } diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index e2555525c9d..538258b2017 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -296,7923 +296,7923 @@ controlledvocabulary.authorIdentifierScheme.gnd=GND controlledvocabulary.authorIdentifierScheme.dai=DAI controlledvocabulary.authorIdentifierScheme.researcherid=ResearcherID controlledvocabulary.authorIdentifierScheme.scopusid=ScopusID -controlledvocabulary.language.'Are'are='Are'are -controlledvocabulary.language.'Auhelawa='Auhelawa -controlledvocabulary.language.A'ou=A'ou -controlledvocabulary.language.A-Pucikwar=A-Pucikwar -controlledvocabulary.language.Aari=Aari -controlledvocabulary.language.Aas�x=Aas�x -controlledvocabulary.language.Abadi=Abadi -controlledvocabulary.language.Abaga=Abaga -controlledvocabulary.language.Abai_Sungai=Abai Sungai -controlledvocabulary.language.Abanyom=Abanyom -controlledvocabulary.language.Abar=Abar -controlledvocabulary.language.Abau=Abau -controlledvocabulary.language.Abaza=Abaza -controlledvocabulary.language.Abellen_Ayta=Abellen Ayta -controlledvocabulary.language.Abidji=Abidji -controlledvocabulary.language.Abinomn=Abinomn -controlledvocabulary.language.Abipon=Abipon -controlledvocabulary.language.Abishira=Abishira -controlledvocabulary.language.Abkhaz=Abkhaz -controlledvocabulary.language.Abom=Abom -controlledvocabulary.language.Abon=Abon -controlledvocabulary.language.Abron=Abron -controlledvocabulary.language.Abu=Abu -controlledvocabulary.language.Abu'_Arapesh=Abu' Arapesh -controlledvocabulary.language.Abua=Abua -controlledvocabulary.language.Abui=Abui -controlledvocabulary.language.Abun=Abun -controlledvocabulary.language.Abure=Abure -controlledvocabulary.language.Abureni=Abureni -controlledvocabulary.language.Ab�=Ab� -controlledvocabulary.language.Acatepec_Me'phaa=Acatepec Me'phaa -controlledvocabulary.language.Achagua=Achagua -controlledvocabulary.language.Achang=Achang -controlledvocabulary.language.Ache=Ache -controlledvocabulary.language.Acheron=Acheron -controlledvocabulary.language.Achi=Achi -controlledvocabulary.language.Achinese=Achinese -controlledvocabulary.language.Achterhoeks=Achterhoeks -controlledvocabulary.language.Achuar-Shiwiar=Achuar-Shiwiar -controlledvocabulary.language.Achumawi=Achumawi -controlledvocabulary.language.Ach�=Ach� -controlledvocabulary.language.Acoli=Acoli -controlledvocabulary.language.Acro�=Acro� -controlledvocabulary.language.Adai=Adai -controlledvocabulary.language.Adamawa_Fulfulde=Adamawa Fulfulde -controlledvocabulary.language.Adamorobe_Sign_Language=Adamorobe Sign Language -controlledvocabulary.language.Adang=Adang -controlledvocabulary.language.Adangbe=Adangbe -controlledvocabulary.language.Adangme=Adangme -controlledvocabulary.language.Adara=Adara -controlledvocabulary.language.Adasen=Adasen -controlledvocabulary.language.Adele=Adele -controlledvocabulary.language.Adhola=Adhola -controlledvocabulary.language.Adi=Adi -controlledvocabulary.language.Adilabad_Gondi=Adilabad Gondi -controlledvocabulary.language.Adioukrou=Adioukrou -controlledvocabulary.language.Adithinngithigh=Adithinngithigh -controlledvocabulary.language.Adivasi_Oriya=Adivasi Oriya -controlledvocabulary.language.Adiwasi_Garasia=Adiwasi Garasia -controlledvocabulary.language.Adnyamathanha=Adnyamathanha -controlledvocabulary.language.Adonara=Adonara -controlledvocabulary.language.Aduge=Aduge -controlledvocabulary.language.Adyghe=Adyghe -controlledvocabulary.language.Adzera=Adzera -controlledvocabulary.language.Aeka=Aeka -controlledvocabulary.language.Aekyom=Aekyom -controlledvocabulary.language.Aequian=Aequian -controlledvocabulary.language.Aer=Aer -controlledvocabulary.language.Afade=Afade -controlledvocabulary.language.Afar=Afar -controlledvocabulary.language.Afghan_Sign_Language=Afghan Sign Language -controlledvocabulary.language.Afitti=Afitti -controlledvocabulary.language.Afrihili=Afrihili -controlledvocabulary.language.Afrikaans=Afrikaans -controlledvocabulary.language.Afro-Seminole_Creole=Afro-Seminole Creole -controlledvocabulary.language.Agarabi=Agarabi -controlledvocabulary.language.Agariya=Agariya -controlledvocabulary.language.Agatu=Agatu -controlledvocabulary.language.Agavotaguerra=Agavotaguerra -controlledvocabulary.language.Aghem=Aghem -controlledvocabulary.language.Aghu=Aghu -controlledvocabulary.language.Aghu-Tharnggala=Aghu-Tharnggala -controlledvocabulary.language.Aghul=Aghul -controlledvocabulary.language.Aghwan=Aghwan -controlledvocabulary.language.Agi=Agi -controlledvocabulary.language.Agob=Agob -controlledvocabulary.language.Agoi=Agoi -controlledvocabulary.language.Aguacateco=Aguacateco -controlledvocabulary.language.Aguano=Aguano -controlledvocabulary.language.Aguaruna=Aguaruna -controlledvocabulary.language.Aguna=Aguna -controlledvocabulary.language.Agusan_Manobo=Agusan Manobo -controlledvocabulary.language.Agutaynen=Agutaynen -controlledvocabulary.language.Agwagwune=Agwagwune -controlledvocabulary.language.Ahanta=Ahanta -controlledvocabulary.language.Aheri_Gondi=Aheri Gondi -controlledvocabulary.language.Aheu=Aheu -controlledvocabulary.language.Ahirani=Ahirani -controlledvocabulary.language.Ahom=Ahom -controlledvocabulary.language.Ahtena=Ahtena -controlledvocabulary.language.Ahwai=Ahwai -controlledvocabulary.language.Ai-Cham=Ai-Cham -controlledvocabulary.language.Aighon=Aighon -controlledvocabulary.language.Aikan�=Aikan� -controlledvocabulary.language.Aiklep=Aiklep -controlledvocabulary.language.Aimaq=Aimaq -controlledvocabulary.language.Aimele=Aimele -controlledvocabulary.language.Aimol=Aimol -controlledvocabulary.language.Ainbai=Ainbai -controlledvocabulary.language.Ainu_(China)=Ainu (China) -controlledvocabulary.language.Ainu_(Japan)=Ainu (Japan) -controlledvocabulary.language.Aiome=Aiome -controlledvocabulary.language.Airoran=Airoran -controlledvocabulary.language.Aiton=Aiton -controlledvocabulary.language.Aja_(Benin)=Aja (Benin) -controlledvocabulary.language.Aja_(South_Sudan)=Aja (South Sudan) -controlledvocabulary.language.Ajawa=Ajawa -controlledvocabulary.language.Aji�=Aji� -controlledvocabulary.language.Ajumbu=Ajumbu -controlledvocabulary.language.Ajy�ninka_Apurucayali=Ajy�ninka Apurucayali -controlledvocabulary.language.Ak=Ak -controlledvocabulary.language.Aka=Aka -controlledvocabulary.language.Aka-Bea=Aka-Bea -controlledvocabulary.language.Aka-Bo=Aka-Bo -controlledvocabulary.language.Aka-Cari=Aka-Cari -controlledvocabulary.language.Aka-Jeru=Aka-Jeru -controlledvocabulary.language.Aka-Kede=Aka-Kede -controlledvocabulary.language.Aka-Kol=Aka-Kol -controlledvocabulary.language.Aka-Kora=Aka-Kora -controlledvocabulary.language.Akan=Akan -controlledvocabulary.language.Akar-Bale=Akar-Bale -controlledvocabulary.language.Akaselem=Akaselem -controlledvocabulary.language.Akawaio=Akawaio -controlledvocabulary.language.Ake=Ake -controlledvocabulary.language.Akebu=Akebu -controlledvocabulary.language.Akei=Akei -controlledvocabulary.language.Akeu=Akeu -controlledvocabulary.language.Akha=Akha -controlledvocabulary.language.Akhvakh=Akhvakh -controlledvocabulary.language.Akkadian=Akkadian -controlledvocabulary.language.Akkala_Sami=Akkala Sami -controlledvocabulary.language.Aklanon=Aklanon -controlledvocabulary.language.Akolet=Akolet -controlledvocabulary.language.Akoose=Akoose -controlledvocabulary.language.Akoye=Akoye -controlledvocabulary.language.Akpa=Akpa -controlledvocabulary.language.Akpes=Akpes -controlledvocabulary.language.Akrukay=Akrukay -controlledvocabulary.language.Akukem=Akukem -controlledvocabulary.language.Akuku=Akuku -controlledvocabulary.language.Akum=Akum -controlledvocabulary.language.Akuntsu=Akuntsu -controlledvocabulary.language.Akurio=Akurio -controlledvocabulary.language.Akwa=Akwa -controlledvocabulary.language.Akyaung_Ari_Naga=Akyaung Ari Naga -controlledvocabulary.language.Al-Sayyid_Bedouin_Sign_Language=Al-Sayyid Bedouin Sign Language -controlledvocabulary.language.Alaba-Kabeena=Alaba-K?abeena -controlledvocabulary.language.Alabama=Alabama -controlledvocabulary.language.Alabat_Island_Agta=Alabat Island Agta -controlledvocabulary.language.Alacatlatzala_Mixtec=Alacatlatzala Mixtec -controlledvocabulary.language.Alago=Alago -controlledvocabulary.language.Alagwa=Alagwa -controlledvocabulary.language.Alak=Alak -controlledvocabulary.language.Alamblak=Alamblak -controlledvocabulary.language.Alangan=Alangan -controlledvocabulary.language.Alanic=Alanic -controlledvocabulary.language.Alapmunte=Alapmunte -controlledvocabulary.language.Alawa=Alawa -controlledvocabulary.language.Albanian=Albanian -controlledvocabulary.language.Albanian_Sign_Language=Albanian Sign Language -controlledvocabulary.language.Albarradas_Sign_Language=Albarradas Sign Language -controlledvocabulary.language.Alcozauca_Mixtec=Alcozauca Mixtec -controlledvocabulary.language.Alege=Alege -controlledvocabulary.language.Alekano=Alekano -controlledvocabulary.language.Aleut=Aleut -controlledvocabulary.language.Algerian_Arabic=Algerian Arabic -controlledvocabulary.language.Algerian_Jewish_Sign_Language=Algerian Jewish Sign Language -controlledvocabulary.language.Algerian_Saharan_Arabic=Algerian Saharan Arabic -controlledvocabulary.language.Algerian_Sign_Language=Algerian Sign Language -controlledvocabulary.language.Algonquin=Algonquin -controlledvocabulary.language.Ali=Ali -controlledvocabulary.language.Alladian=Alladian -controlledvocabulary.language.Allar=Allar -controlledvocabulary.language.Alngith=Alngith -controlledvocabulary.language.Alo_Phola=Alo Phola -controlledvocabulary.language.Alor=Alor -controlledvocabulary.language.Alo�pam_Zapotec=Alo�pam Zapotec -controlledvocabulary.language.Alsea=Alsea -controlledvocabulary.language.Alu_Kurumba=Alu Kurumba -controlledvocabulary.language.Alugu=Alugu -controlledvocabulary.language.Alumu-Tesu=Alumu-Tesu -controlledvocabulary.language.Alune=Alune -controlledvocabulary.language.Aluo=Aluo -controlledvocabulary.language.Alur=Alur -controlledvocabulary.language.Alutor=Alutor -controlledvocabulary.language.Alviri-Vidari=Alviri-Vidari -controlledvocabulary.language.Alyawarr=Alyawarr -controlledvocabulary.language.Ama_(Papua_New_Guinea)=Ama (Papua New Guinea) -controlledvocabulary.language.Ama_(Sudan)=Ama (Sudan) -controlledvocabulary.language.Amahai=Amahai -controlledvocabulary.language.Amahuaca=Amahuaca -controlledvocabulary.language.Amaimon=Amaimon -controlledvocabulary.language.Amal=Amal -controlledvocabulary.language.Amami_Koniya_Sign_Language=Amami Koniya Sign Language -controlledvocabulary.language.Amanab=Amanab -controlledvocabulary.language.Amanay�=Amanay� -controlledvocabulary.language.Amara=Amara -controlledvocabulary.language.Amarakaeri=Amarakaeri -controlledvocabulary.language.Amarasi=Amarasi -controlledvocabulary.language.Amatl�n_Zapotec=Amatl�n Zapotec -controlledvocabulary.language.Amba_(Solomon_Islands)=Amba (Solomon Islands) -controlledvocabulary.language.Amba_(Uganda)=Amba (Uganda) -controlledvocabulary.language.Ambai=Ambai -controlledvocabulary.language.Ambakich=Ambakich -controlledvocabulary.language.Ambala_Ayta=Ambala Ayta -controlledvocabulary.language.Ambelau=Ambelau -controlledvocabulary.language.Ambele=Ambele -controlledvocabulary.language.Amblong=Amblong -controlledvocabulary.language.Ambo=Ambo -controlledvocabulary.language.Ambo-Pasco_Quechua=Ambo-Pasco Quechua -controlledvocabulary.language.Ambonese_Malay=Ambonese Malay -controlledvocabulary.language.Ambrak=Ambrak -controlledvocabulary.language.Ambul=Ambul -controlledvocabulary.language.Ambulas=Ambulas -controlledvocabulary.language.Amdang=Amdang -controlledvocabulary.language.Amdo_Tibetan=Amdo Tibetan -controlledvocabulary.language.Amele=Amele -controlledvocabulary.language.American_Sign_Language=American Sign Language -controlledvocabulary.language.Amganad_Ifugao=Amganad Ifugao -controlledvocabulary.language.Amharic=Amharic -controlledvocabulary.language.Ami=Ami -controlledvocabulary.language.Amis=Amis -controlledvocabulary.language.Amo=Amo -controlledvocabulary.language.Amol=Amol -controlledvocabulary.language.Amoltepec_Mixtec=Amoltepec Mixtec -controlledvocabulary.language.Ampanang=Ampanang -controlledvocabulary.language.Ampari_Dogon=Ampari Dogon -controlledvocabulary.language.Amri_Karbi=Amri Karbi -controlledvocabulary.language.Amto=Amto -controlledvocabulary.language.Amundava=Amundava -controlledvocabulary.language.Amurdak=Amurdak -controlledvocabulary.language.Ana_Tinga_Dogon=Ana Tinga Dogon -controlledvocabulary.language.Anaang=Anaang -controlledvocabulary.language.Anakalangu=Anakalangu -controlledvocabulary.language.Anal=Anal -controlledvocabulary.language.Anam=Anam -controlledvocabulary.language.Anamb�=Anamb� -controlledvocabulary.language.Anamgura=Anamgura -controlledvocabulary.language.Anasi=Anasi -controlledvocabulary.language.Ancient_Greek_(to_1453)=Ancient Greek (to 1453) -controlledvocabulary.language.Ancient_Hebrew=Ancient Hebrew -controlledvocabulary.language.Ancient_Macedonian=Ancient Macedonian -controlledvocabulary.language.Ancient_North_Arabian=Ancient North Arabian -controlledvocabulary.language.Ancient_Zapotec=Ancient Zapotec -controlledvocabulary.language.Andaandi=Andaandi -controlledvocabulary.language.Andai=Andai -controlledvocabulary.language.Andajin=Andajin -controlledvocabulary.language.Andalusian_Arabic=Andalusian Arabic -controlledvocabulary.language.Andaman_Creole_Hindi=Andaman Creole Hindi -controlledvocabulary.language.Andaqui=Andaqui -controlledvocabulary.language.Andarum=Andarum -controlledvocabulary.language.Andegerebinha=Andegerebinha -controlledvocabulary.language.Andh=Andh -controlledvocabulary.language.Andi=Andi -controlledvocabulary.language.Andio=Andio -controlledvocabulary.language.Andoa=Andoa -controlledvocabulary.language.Andoque=Andoque -controlledvocabulary.language.Andra-Hus=Andra-Hus -controlledvocabulary.language.Aneityum=Aneityum -controlledvocabulary.language.Anem=Anem -controlledvocabulary.language.Aneme_Wake=Aneme Wake -controlledvocabulary.language.Anfillo=Anfillo -controlledvocabulary.language.Angaataha=Angaataha -controlledvocabulary.language.Angait�=Angait� -controlledvocabulary.language.Angal=Angal -controlledvocabulary.language.Angal_Enen=Angal Enen -controlledvocabulary.language.Angal_Heneng=Angal Heneng -controlledvocabulary.language.Angami_Naga=Angami Naga -controlledvocabulary.language.Angguruk_Yali=Angguruk Yali -controlledvocabulary.language.Angika=Angika -controlledvocabulary.language.Angkamuthi=Angkamuthi -controlledvocabulary.language.Anglo-Norman=Anglo-Norman -controlledvocabulary.language.Angloromani=Angloromani -controlledvocabulary.language.Angolar=Angolar -controlledvocabulary.language.Angor=Angor -controlledvocabulary.language.Angoram=Angoram -controlledvocabulary.language.Angosturas_Tunebo=Angosturas Tunebo -controlledvocabulary.language.Anguthimri=Anguthimri -controlledvocabulary.language.Ani_Phowa=Ani Phowa -controlledvocabulary.language.Anii=Anii -controlledvocabulary.language.Animere=Animere -controlledvocabulary.language.Anindilyakwa=Anindilyakwa -controlledvocabulary.language.Aninka=Aninka -controlledvocabulary.language.Anjam=Anjam -controlledvocabulary.language.Ankave=Ankave -controlledvocabulary.language.Anmatyerre=Anmatyerre -controlledvocabulary.language.Anong=Anong -controlledvocabulary.language.Anor=Anor -controlledvocabulary.language.Anserma=Anserma -controlledvocabulary.language.Ansus=Ansus -controlledvocabulary.language.Antakarinya=Antakarinya -controlledvocabulary.language.Antankarana_Malagasy=Antankarana Malagasy -controlledvocabulary.language.Antigua_and_Barbuda_Creole_English=Antigua and Barbuda Creole English -controlledvocabulary.language.Anu-Hkongso_Chin=Anu-Hkongso Chin -controlledvocabulary.language.Anuak=Anuak -controlledvocabulary.language.Anufo=Anufo -controlledvocabulary.language.Anuki=Anuki -controlledvocabulary.language.Anus=Anus -controlledvocabulary.language.Anuta=Anuta -controlledvocabulary.language.Anyin=Anyin -controlledvocabulary.language.Anyin_Morofo=Anyin Morofo -controlledvocabulary.language.Ao_Naga=Ao Naga -controlledvocabulary.language.Aoheng=Aoheng -controlledvocabulary.language.Aore=Aore -controlledvocabulary.language.Ap_Ma=Ap Ma -controlledvocabulary.language.Apalachee=Apalachee -controlledvocabulary.language.Apala�=Apala� -controlledvocabulary.language.Apali=Apali -controlledvocabulary.language.Apasco-Apoala_Mixtec=Apasco-Apoala Mixtec -controlledvocabulary.language.Apatani=Apatani -controlledvocabulary.language.Apiak�=Apiak� -controlledvocabulary.language.Apinay�=Apinay� -controlledvocabulary.language.Apma=Apma -controlledvocabulary.language.Aproumu_Aizi=Aproumu Aizi -controlledvocabulary.language.Apurin�=Apurin� -controlledvocabulary.language.Aputai=Aputai -controlledvocabulary.language.Aquitanian=Aquitanian -controlledvocabulary.language.Arabana=Arabana -controlledvocabulary.language.Arabela=Arabela -controlledvocabulary.language.Arabic=Arabic -controlledvocabulary.language.Aragonese=Aragonese -controlledvocabulary.language.Araki=Araki -controlledvocabulary.language.Arakwal=Arakwal -controlledvocabulary.language.Aralle-Tabulahan=Aralle-Tabulahan -controlledvocabulary.language.Arammba=Arammba -controlledvocabulary.language.Aranadan=Aranadan -controlledvocabulary.language.Aranama-Tamique=Aranama-Tamique -controlledvocabulary.language.Arandai=Arandai -controlledvocabulary.language.Araona=Araona -controlledvocabulary.language.Arapaho=Arapaho -controlledvocabulary.language.Arapaso=Arapaso -controlledvocabulary.language.Ararandew�ra=Ararandew�ra -controlledvocabulary.language.Arawak=Arawak -controlledvocabulary.language.Arawet�=Arawet� -controlledvocabulary.language.Arawum=Arawum -controlledvocabulary.language.Arbore=Arbore -controlledvocabulary.language.Arb�resh�_Albanian=Arb�resh� Albanian -controlledvocabulary.language.Archi=Archi -controlledvocabulary.language.Ardhamgadh_Prkrit=Ardham?gadh? Pr?krit -controlledvocabulary.language.Are=Are -controlledvocabulary.language.Areba=Areba -controlledvocabulary.language.Arem=Arem -controlledvocabulary.language.Arequipa-La_Uni�n_Quechua=Arequipa-La Uni�n Quechua -controlledvocabulary.language.Argentine_Sign_Language=Argentine Sign Language -controlledvocabulary.language.Argobba=Argobba -controlledvocabulary.language.Arguni=Arguni -controlledvocabulary.language.Arhuaco=Arhuaco -controlledvocabulary.language.Arh�=Arh� -controlledvocabulary.language.Arh�=Arh� -controlledvocabulary.language.Ari=Ari -controlledvocabulary.language.Aribwatsa=Aribwatsa -controlledvocabulary.language.Aribwaung=Aribwaung -controlledvocabulary.language.Arifama-Miniafia=Arifama-Miniafia -controlledvocabulary.language.Arigidi=Arigidi -controlledvocabulary.language.Arikap�=Arikap� -controlledvocabulary.language.Arikara=Arikara -controlledvocabulary.language.Arikem=Arikem -controlledvocabulary.language.Arin=Arin -controlledvocabulary.language.Aringa=Aringa -controlledvocabulary.language.Armazic=Armazic -controlledvocabulary.language.Armenian=Armenian -controlledvocabulary.language.Armenian_Sign_Language=Armenian Sign Language -controlledvocabulary.language.Arop-Lokep=Arop-Lokep -controlledvocabulary.language.Arop-Sissano=Arop-Sissano -controlledvocabulary.language.Arosi=Arosi -controlledvocabulary.language.Arpitan=Arpitan -controlledvocabulary.language.Arritinngithigh=Arritinngithigh -controlledvocabulary.language.Arta=Arta -controlledvocabulary.language.Aruamu=Aruamu -controlledvocabulary.language.Aruek=Aruek -controlledvocabulary.language.Aruop=Aruop -controlledvocabulary.language.Arutani=Arutani -controlledvocabulary.language.Aru�_(Amazonas_State)=Aru� (Amazonas State) -controlledvocabulary.language.Aru�_(Rodonia_State)=Aru� (Rodonia State) -controlledvocabulary.language.Arvanitika_Albanian=Arvanitika Albanian -controlledvocabulary.language.As=As -controlledvocabulary.language.Asaro'o=Asaro'o -controlledvocabulary.language.Ashe=Ashe -controlledvocabulary.language.Ashkun=Ashkun -controlledvocabulary.language.Asho_Chin=Asho Chin -controlledvocabulary.language.Ashtiani=Ashtiani -controlledvocabulary.language.Ash�ninka=Ash�ninka -controlledvocabulary.language.Ash�ninka_Pajonal=Ash�ninka Pajonal -controlledvocabulary.language.Ash�ninka_Peren�=Ash�ninka Peren� -controlledvocabulary.language.Asilulu=Asilulu -controlledvocabulary.language.Askopan=Askopan -controlledvocabulary.language.Asoa=Asoa -controlledvocabulary.language.Assamese=Assamese -controlledvocabulary.language.Assangori=Assangori -controlledvocabulary.language.Assiniboine=Assiniboine -controlledvocabulary.language.Assyrian_Neo-Aramaic=Assyrian Neo-Aramaic -controlledvocabulary.language.Asturian=Asturian -controlledvocabulary.language.Asu_(Nigeria)=Asu (Nigeria) -controlledvocabulary.language.Asu_(Tanzania)=Asu (Tanzania) -controlledvocabulary.language.Asue_Awyu=Asue Awyu -controlledvocabulary.language.Asumboa=Asumboa -controlledvocabulary.language.Asunci�n_Mixtepec_Zapotec=Asunci�n Mixtepec Zapotec -controlledvocabulary.language.Asuri=Asuri -controlledvocabulary.language.Ata=Ata -controlledvocabulary.language.Ata_Manobo=Ata Manobo -controlledvocabulary.language.Atakapa=Atakapa -controlledvocabulary.language.Atampaya=Atampaya -controlledvocabulary.language.Atatl�huca_Mixtec=Atatl�huca Mixtec -controlledvocabulary.language.Atauran=Atauran -controlledvocabulary.language.Atayal=Atayal -controlledvocabulary.language.Atemble=Atemble -controlledvocabulary.language.Athpariya=Athpariya -controlledvocabulary.language.Ati=Ati -controlledvocabulary.language.Atikamekw=Atikamekw -controlledvocabulary.language.Atohwaim=Atohwaim -controlledvocabulary.language.Atong_(Cameroon)=Atong (Cameroon) -controlledvocabulary.language.Atong_(India)=Atong (India) -controlledvocabulary.language.Atorada=Atorada -controlledvocabulary.language.Atsahuaca=Atsahuaca -controlledvocabulary.language.Atsam=Atsam -controlledvocabulary.language.Atsugewi=Atsugewi -controlledvocabulary.language.Attapady_Kurumba=Attapady Kurumba -controlledvocabulary.language.Atti�=Atti� -controlledvocabulary.language.Atzingo_Matlatzinca=Atzingo Matlatzinca -controlledvocabulary.language.Au=Au -controlledvocabulary.language.Aulua=Aulua -controlledvocabulary.language.Aur�=Aur� -controlledvocabulary.language.Aushi=Aushi -controlledvocabulary.language.Aushiri=Aushiri -controlledvocabulary.language.Auslan=Auslan -controlledvocabulary.language.Austral=Austral -controlledvocabulary.language.Australian_Aborigines_Sign_Language=Australian Aborigines Sign Language -controlledvocabulary.language.Austrian_Sign_Language=Austrian Sign Language -controlledvocabulary.language.Auwe=Auwe -controlledvocabulary.language.Auye=Auye -controlledvocabulary.language.Auyokawa=Auyokawa -controlledvocabulary.language.Avaric=Avaric -controlledvocabulary.language.Avatime=Avatime -controlledvocabulary.language.Avau=Avau -controlledvocabulary.language.Avestan=Avestan -controlledvocabulary.language.Avikam=Avikam -controlledvocabulary.language.Avokaya=Avokaya -controlledvocabulary.language.Av�-Canoeiro=Av�-Canoeiro -controlledvocabulary.language.Awa_(China)=Awa (China) -controlledvocabulary.language.Awa_(Papua_New_Guinea)=Awa (Papua New Guinea) -controlledvocabulary.language.Awa-Cuaiquer=Awa-Cuaiquer -controlledvocabulary.language.Awabakal=Awabakal -controlledvocabulary.language.Awad_Bing=Awad Bing -controlledvocabulary.language.Awadhi=Awadhi -controlledvocabulary.language.Awak=Awak -controlledvocabulary.language.Awar=Awar -controlledvocabulary.language.Awara=Awara -controlledvocabulary.language.Awbono=Awbono -controlledvocabulary.language.Aweer=Aweer -controlledvocabulary.language.Awera=Awera -controlledvocabulary.language.Awet�=Awet� -controlledvocabulary.language.Awing=Awing -controlledvocabulary.language.Awiyaana=Awiyaana -controlledvocabulary.language.Awjilah=Awjilah -controlledvocabulary.language.Awngi=Awngi -controlledvocabulary.language.Awngthim=Awngthim -controlledvocabulary.language.Awtuw=Awtuw -controlledvocabulary.language.Awu=Awu -controlledvocabulary.language.Awun=Awun -controlledvocabulary.language.Awutu=Awutu -controlledvocabulary.language.Awyi=Awyi -controlledvocabulary.language.Axamb=Axamb -controlledvocabulary.language.Axi_Yi=Axi Yi -controlledvocabulary.language.Ayabadhu=Ayabadhu -controlledvocabulary.language.Ayacucho_Quechua=Ayacucho Quechua -controlledvocabulary.language.Ayautla_Mazatec=Ayautla Mazatec -controlledvocabulary.language.Ayere=Ayere -controlledvocabulary.language.Ayerrerenge=Ayerrerenge -controlledvocabulary.language.Ayi_(Papua_New_Guinea)=Ayi (Papua New Guinea) -controlledvocabulary.language.Ayiwo=Ayiwo -controlledvocabulary.language.Ayizi=Ayizi -controlledvocabulary.language.Ayizo_Gbe=Ayizo Gbe -controlledvocabulary.language.Aymara=Aymara -controlledvocabulary.language.Ayoquesco_Zapotec=Ayoquesco Zapotec -controlledvocabulary.language.Ayoreo=Ayoreo -controlledvocabulary.language.Ayu=Ayu -controlledvocabulary.language.Ayutla_Mixtec=Ayutla Mixtec -controlledvocabulary.language.Azerbaijani=Azerbaijani -controlledvocabulary.language.Azha=Azha -controlledvocabulary.language.Azhe=Azhe -controlledvocabulary.language.Azoy�_Me'phaa=Azoy� Me'phaa -controlledvocabulary.language.Baan=Baan -controlledvocabulary.language.Baangi=Baangi -controlledvocabulary.language.Baatonum=Baatonum -controlledvocabulary.language.Baba=Baba -controlledvocabulary.language.Baba_Malay=Baba Malay -controlledvocabulary.language.Babango=Babango -controlledvocabulary.language.Babanki=Babanki -controlledvocabulary.language.Babatana=Babatana -controlledvocabulary.language.Babine=Babine -controlledvocabulary.language.Babuza=Babuza -controlledvocabulary.language.Bacama=Bacama -controlledvocabulary.language.Bacanese_Malay=Bacanese Malay -controlledvocabulary.language.Bactrian=Bactrian -controlledvocabulary.language.Bada_(Indonesia)=Bada (Indonesia) -controlledvocabulary.language.Bada_(Nigeria)=Bada (Nigeria) -controlledvocabulary.language.Badaga=Badaga -controlledvocabulary.language.Bade=Bade -controlledvocabulary.language.Badeshi=Badeshi -controlledvocabulary.language.Badimaya=Badimaya -controlledvocabulary.language.Badjiri=Badjiri -controlledvocabulary.language.Badui=Badui -controlledvocabulary.language.Badyara=Badyara -controlledvocabulary.language.Baeggu=Baeggu -controlledvocabulary.language.Baelelea=Baelelea -controlledvocabulary.language.Baetora=Baetora -controlledvocabulary.language.Bafanji=Bafanji -controlledvocabulary.language.Bafaw-Balong=Bafaw-Balong -controlledvocabulary.language.Bafia=Bafia -controlledvocabulary.language.Bafut=Bafut -controlledvocabulary.language.Baga_Kaloum=Baga Kaloum -controlledvocabulary.language.Baga_Koga=Baga Koga -controlledvocabulary.language.Baga_Manduri=Baga Manduri -controlledvocabulary.language.Baga_Pokur=Baga Pokur -controlledvocabulary.language.Baga_Sitemu=Baga Sitemu -controlledvocabulary.language.Baga_Soban�=Baga Soban� -controlledvocabulary.language.Bagheli=Bagheli -controlledvocabulary.language.Bagirmi=Bagirmi -controlledvocabulary.language.Bagirmi_Fulfulde=Bagirmi Fulfulde -controlledvocabulary.language.Bago-Kusuntu=Bago-Kusuntu -controlledvocabulary.language.Bagri=Bagri -controlledvocabulary.language.Bagupi=Bagupi -controlledvocabulary.language.Bagusa=Bagusa -controlledvocabulary.language.Bagvalal=Bagvalal -controlledvocabulary.language.Baha_Buyang=Baha Buyang -controlledvocabulary.language.Baham=Baham -controlledvocabulary.language.Bahamas_Creole_English=Bahamas Creole English -controlledvocabulary.language.Baharna_Arabic=Baharna Arabic -controlledvocabulary.language.Bahau=Bahau -controlledvocabulary.language.Bahinemo=Bahinemo -controlledvocabulary.language.Bahing=Bahing -controlledvocabulary.language.Bahnar=Bahnar -controlledvocabulary.language.Bahonsuai=Bahonsuai -controlledvocabulary.language.Bai_(South_Sudan)=Bai (South Sudan) -controlledvocabulary.language.Baibai=Baibai -controlledvocabulary.language.Baikeno=Baikeno -controlledvocabulary.language.Baima=Baima -controlledvocabulary.language.Baimak=Baimak -controlledvocabulary.language.Bainouk-Gunyaamolo=Bainouk-Gunyaamolo -controlledvocabulary.language.Bainouk-Gunyu�o=Bainouk-Gunyu�o -controlledvocabulary.language.Bainouk-Samik=Bainouk-Samik -controlledvocabulary.language.Baiso=Baiso -controlledvocabulary.language.Baissa_Fali=Baissa Fali -controlledvocabulary.language.Bajan=Bajan -controlledvocabulary.language.Bajelani=Bajelani -controlledvocabulary.language.Bajjika=Bajjika -controlledvocabulary.language.Baka_(Cameroon)=Baka (Cameroon) -controlledvocabulary.language.Baka_(South_Sudan)=Baka (South Sudan) -controlledvocabulary.language.Bakair�=Bakair� -controlledvocabulary.language.Bakaka=Bakaka -controlledvocabulary.language.Bakhtiari=Bakhtiari -controlledvocabulary.language.Baki=Baki -controlledvocabulary.language.Bakoko=Bakoko -controlledvocabulary.language.Bakole=Bakole -controlledvocabulary.language.Bakpinka=Bakpinka -controlledvocabulary.language.Bakumpai=Bakumpai -controlledvocabulary.language.Bakw�=Bakw� -controlledvocabulary.language.Balaesang=Balaesang -controlledvocabulary.language.Balaibalan=Balaibalan -controlledvocabulary.language.Balangao=Balangao -controlledvocabulary.language.Balangingi=Balangingi -controlledvocabulary.language.Balanta-Ganja=Balanta-Ganja -controlledvocabulary.language.Balanta-Kentohe=Balanta-Kentohe -controlledvocabulary.language.Balantak=Balantak -controlledvocabulary.language.Baldemu=Baldemu -controlledvocabulary.language.Bali_(Democratic_Republic_of_Congo)=Bali (Democratic Republic of Congo) -controlledvocabulary.language.Bali_(Nigeria)=Bali (Nigeria) -controlledvocabulary.language.Balinese=Balinese -controlledvocabulary.language.Balinese_Malay=Balinese Malay -controlledvocabulary.language.Balkan_Gagauz_Turkish=Balkan Gagauz Turkish -controlledvocabulary.language.Balkan_Romani=Balkan Romani -controlledvocabulary.language.Balo=Balo -controlledvocabulary.language.Baloi=Baloi -controlledvocabulary.language.Balti=Balti -controlledvocabulary.language.Baltic_Romani=Baltic Romani -controlledvocabulary.language.Baluan-Pam=Baluan-Pam -controlledvocabulary.language.Baluchi=Baluchi -controlledvocabulary.language.Bamako_Sign_Language=Bamako Sign Language -controlledvocabulary.language.Bamali=Bamali -controlledvocabulary.language.Bambalang=Bambalang -controlledvocabulary.language.Bambam=Bambam -controlledvocabulary.language.Bambara=Bambara -controlledvocabulary.language.Bambassi=Bambassi -controlledvocabulary.language.Bambili-Bambui=Bambili-Bambui -controlledvocabulary.language.Bamenyam=Bamenyam -controlledvocabulary.language.Bamu=Bamu -controlledvocabulary.language.Bamukumbit=Bamukumbit -controlledvocabulary.language.Bamun=Bamun -controlledvocabulary.language.Bamunka=Bamunka -controlledvocabulary.language.Bamwe=Bamwe -controlledvocabulary.language.Ban_Khor_Sign_Language=Ban Khor Sign Language -controlledvocabulary.language.Bana=Bana -controlledvocabulary.language.Banao_Itneg=Banao Itneg -controlledvocabulary.language.Banaro=Banaro -controlledvocabulary.language.Banda_(Indonesia)=Banda (Indonesia) -controlledvocabulary.language.Banda_Malay=Banda Malay -controlledvocabulary.language.Banda-Bambari=Banda-Bambari -controlledvocabulary.language.Banda-Banda=Banda-Banda -controlledvocabulary.language.Banda-Mbr�s=Banda-Mbr�s -controlledvocabulary.language.Banda-Nd�l�=Banda-Nd�l� -controlledvocabulary.language.Banda-Yangere=Banda-Yangere -controlledvocabulary.language.Bandi=Bandi -controlledvocabulary.language.Bandial=Bandial -controlledvocabulary.language.Bandjalang=Bandjalang -controlledvocabulary.language.Bangala=Bangala -controlledvocabulary.language.Bangandu=Bangandu -controlledvocabulary.language.Bangba=Bangba -controlledvocabulary.language.Banggai=Banggai -controlledvocabulary.language.Banggarla=Banggarla -controlledvocabulary.language.Bangi=Bangi -controlledvocabulary.language.Bangime=Bangime -controlledvocabulary.language.Bangka=Bangka -controlledvocabulary.language.Bangolan=Bangolan -controlledvocabulary.language.Bangubangu=Bangubangu -controlledvocabulary.language.Bangwinji=Bangwinji -controlledvocabulary.language.Baniva=Baniva -controlledvocabulary.language.Baniwa=Baniwa -controlledvocabulary.language.Banjar=Banjar -controlledvocabulary.language.Bankagooma=Bankagooma -controlledvocabulary.language.Bankal=Bankal -controlledvocabulary.language.Bankan_Tey_Dogon=Bankan Tey Dogon -controlledvocabulary.language.Bankon=Bankon -controlledvocabulary.language.Bannoni=Bannoni -controlledvocabulary.language.Bantawa=Bantawa -controlledvocabulary.language.Bantayanon=Bantayanon -controlledvocabulary.language.Bantik=Bantik -controlledvocabulary.language.Bantoanon=Bantoanon -controlledvocabulary.language.Banyjima=Banyjima -controlledvocabulary.language.Baoul�=Baoul� -controlledvocabulary.language.Bara_Malagasy=Bara Malagasy -controlledvocabulary.language.Baraamu=Baraamu -controlledvocabulary.language.Barababaraba=Barababaraba -controlledvocabulary.language.Barai=Barai -controlledvocabulary.language.Barakai=Barakai -controlledvocabulary.language.Baram_Kayan=Baram Kayan -controlledvocabulary.language.Barama=Barama -controlledvocabulary.language.Barambu=Barambu -controlledvocabulary.language.Baramu=Baramu -controlledvocabulary.language.Barapasi=Barapasi -controlledvocabulary.language.Baras=Baras -controlledvocabulary.language.Barasana-Eduria=Barasana-Eduria -controlledvocabulary.language.Barbaram=Barbaram -controlledvocabulary.language.Barbare�o=Barbare�o -controlledvocabulary.language.Barclayville_Grebo=Barclayville Grebo -controlledvocabulary.language.Bardi=Bardi -controlledvocabulary.language.Barein=Barein -controlledvocabulary.language.Bargam=Bargam -controlledvocabulary.language.Bari=Bari -controlledvocabulary.language.Bariai=Bariai -controlledvocabulary.language.Bariji=Bariji -controlledvocabulary.language.Barikanchi=Barikanchi -controlledvocabulary.language.Barikewa=Barikewa -controlledvocabulary.language.Barok=Barok -controlledvocabulary.language.Barombi=Barombi -controlledvocabulary.language.Barro_Negro_Tunebo=Barro Negro Tunebo -controlledvocabulary.language.Barrow_Point=Barrow Point -controlledvocabulary.language.Baruga=Baruga -controlledvocabulary.language.Baruya=Baruya -controlledvocabulary.language.Barwe=Barwe -controlledvocabulary.language.Barzani_Jewish_Neo-Aramaic=Barzani Jewish Neo-Aramaic -controlledvocabulary.language.Bar�=Bar� -controlledvocabulary.language.Bar�=Bar� -controlledvocabulary.language.Basa_(Cameroon)=Basa (Cameroon) -controlledvocabulary.language.Basa_(Nigeria)=Basa (Nigeria) -controlledvocabulary.language.Basa-Gumna=Basa-Gumna -controlledvocabulary.language.Basa-Gurmana=Basa-Gurmana -controlledvocabulary.language.Basap=Basap -controlledvocabulary.language.Basay=Basay -controlledvocabulary.language.Bashkardi=Bashkardi -controlledvocabulary.language.Bashkir=Bashkir -controlledvocabulary.language.Basketo=Basketo -controlledvocabulary.language.Basque=Basque -controlledvocabulary.language.Bassa=Bassa -controlledvocabulary.language.Bassa-Kontagora=Bassa-Kontagora -controlledvocabulary.language.Bassari=Bassari -controlledvocabulary.language.Bassossi=Bassossi -controlledvocabulary.language.Bata=Bata -controlledvocabulary.language.Batad_Ifugao=Batad Ifugao -controlledvocabulary.language.Batak=Batak -controlledvocabulary.language.Batak_Alas-Kluet=Batak Alas-Kluet -controlledvocabulary.language.Batak_Angkola=Batak Angkola -controlledvocabulary.language.Batak_Dairi=Batak Dairi -controlledvocabulary.language.Batak_Karo=Batak Karo -controlledvocabulary.language.Batak_Mandailing=Batak Mandailing -controlledvocabulary.language.Batak_Simalungun=Batak Simalungun -controlledvocabulary.language.Batak_Toba=Batak Toba -controlledvocabulary.language.Batanga=Batanga -controlledvocabulary.language.Batek=Batek -controlledvocabulary.language.Bateri=Bateri -controlledvocabulary.language.Bathari=Bathari -controlledvocabulary.language.Bati_(Cameroon)=Bati (Cameroon) -controlledvocabulary.language.Bati_(Indonesia)=Bati (Indonesia) -controlledvocabulary.language.Batjala=Batjala -controlledvocabulary.language.Bats=Bats -controlledvocabulary.language.Batu=Batu -controlledvocabulary.language.Batui=Batui -controlledvocabulary.language.Batuley=Batuley -controlledvocabulary.language.Bau=Bau -controlledvocabulary.language.Bau_Bidayuh=Bau Bidayuh -controlledvocabulary.language.Bauchi=Bauchi -controlledvocabulary.language.Bauni=Bauni -controlledvocabulary.language.Baure=Baure -controlledvocabulary.language.Bauria=Bauria -controlledvocabulary.language.Bauwaki=Bauwaki -controlledvocabulary.language.Bauzi=Bauzi -controlledvocabulary.language.Bavarian=Bavarian -controlledvocabulary.language.Bawm_Chin=Bawm Chin -controlledvocabulary.language.Bay_Miwok=Bay Miwok -controlledvocabulary.language.Bayali=Bayali -controlledvocabulary.language.Baybayanon=Baybayanon -controlledvocabulary.language.Baygo=Baygo -controlledvocabulary.language.Bayono=Bayono -controlledvocabulary.language.Bayot=Bayot -controlledvocabulary.language.Bayungu=Bayungu -controlledvocabulary.language.Bazigar=Bazigar -controlledvocabulary.language.Beami=Beami -controlledvocabulary.language.Beaver=Beaver -controlledvocabulary.language.Beba=Beba -controlledvocabulary.language.Bebele=Bebele -controlledvocabulary.language.Bebeli=Bebeli -controlledvocabulary.language.Bebil=Bebil -controlledvocabulary.language.Bedjond=Bedjond -controlledvocabulary.language.Bedoanas=Bedoanas -controlledvocabulary.language.Beeke=Beeke -controlledvocabulary.language.Beele=Beele -controlledvocabulary.language.Beembe=Beembe -controlledvocabulary.language.Beezen=Beezen -controlledvocabulary.language.Befang=Befang -controlledvocabulary.language.Beginci=Beginci -controlledvocabulary.language.Beja=Beja -controlledvocabulary.language.Bekati'=Bekati' -controlledvocabulary.language.Bekwarra=Bekwarra -controlledvocabulary.language.Bekwel=Bekwel -controlledvocabulary.language.Belait=Belait -controlledvocabulary.language.Belanda_Bor=Belanda Bor -controlledvocabulary.language.Belanda_Viri=Belanda Viri -controlledvocabulary.language.Belarusian=Belarusian -controlledvocabulary.language.Belhariya=Belhariya -controlledvocabulary.language.Beli_(Papua_New_Guinea)=Beli (Papua New Guinea) -controlledvocabulary.language.Beli_(South_Sudan)=Beli (South Sudan) -controlledvocabulary.language.Belize_Kriol_English=Belize Kriol English -controlledvocabulary.language.Bella_Coola=Bella Coola -controlledvocabulary.language.Bellari=Bellari -controlledvocabulary.language.Belning=Belning -controlledvocabulary.language.Bemba_(Zambia)=Bemba (Zambia) -controlledvocabulary.language.Bembe=Bembe -controlledvocabulary.language.Ben_Tey_Dogon=Ben Tey Dogon -controlledvocabulary.language.Bena_(Nigeria)=Bena (Nigeria) -controlledvocabulary.language.Bena_(Tanzania)=Bena (Tanzania) -controlledvocabulary.language.Benabena=Benabena -controlledvocabulary.language.Benamanga=Benamanga -controlledvocabulary.language.Bench=Bench -controlledvocabulary.language.Bende=Bende -controlledvocabulary.language.Bendi=Bendi -controlledvocabulary.language.Beng=Beng -controlledvocabulary.language.Benga=Benga -controlledvocabulary.language.Bengali,_Bangla=Bengali, Bangla -controlledvocabulary.language.Benggoi=Benggoi -controlledvocabulary.language.Bengkala_Sign_Language=Bengkala Sign Language -controlledvocabulary.language.Bentong=Bentong -controlledvocabulary.language.Benyadu'=Benyadu' -controlledvocabulary.language.Beothuk=Beothuk -controlledvocabulary.language.Bepour=Bepour -controlledvocabulary.language.Berakou=Berakou -controlledvocabulary.language.Berau_Malay=Berau Malay -controlledvocabulary.language.Berbice_Creole_Dutch=Berbice Creole Dutch -controlledvocabulary.language.Berik=Berik -controlledvocabulary.language.Berinomo=Berinomo -controlledvocabulary.language.Berom=Berom -controlledvocabulary.language.Berta=Berta -controlledvocabulary.language.Berti=Berti -controlledvocabulary.language.Besisi=Besisi -controlledvocabulary.language.Besme=Besme -controlledvocabulary.language.Besoa=Besoa -controlledvocabulary.language.Betaf=Betaf -controlledvocabulary.language.Betawi=Betawi -controlledvocabulary.language.Bete=Bete -controlledvocabulary.language.Bete-Bendi=Bete-Bendi -controlledvocabulary.language.Beti_(C�te_d'Ivoire)=Beti (C�te d'Ivoire) -controlledvocabulary.language.Betta_Kurumba=Betta Kurumba -controlledvocabulary.language.Bezhta=Bezhta -controlledvocabulary.language.Bhadrawahi=Bhadrawahi -controlledvocabulary.language.Bhalay=Bhalay -controlledvocabulary.language.Bharia=Bharia -controlledvocabulary.language.Bhatri=Bhatri -controlledvocabulary.language.Bhattiyali=Bhattiyali -controlledvocabulary.language.Bhaya=Bhaya -controlledvocabulary.language.Bhele=Bhele -controlledvocabulary.language.Bhilali=Bhilali -controlledvocabulary.language.Bhili=Bhili -controlledvocabulary.language.Bhojpuri=Bhojpuri -controlledvocabulary.language.Bhoti_Kinnauri=Bhoti Kinnauri -controlledvocabulary.language.Bhujel=Bhujel -controlledvocabulary.language.Bhunjia=Bhunjia -controlledvocabulary.language.Biafada=Biafada -controlledvocabulary.language.Biage=Biage -controlledvocabulary.language.Biak=Biak -controlledvocabulary.language.Biali=Biali -controlledvocabulary.language.Bian_Marind=Bian Marind -controlledvocabulary.language.Biangai=Biangai -controlledvocabulary.language.Biao=Biao -controlledvocabulary.language.Biao_Mon=Biao Mon -controlledvocabulary.language.Biao-Jiao_Mien=Biao-Jiao Mien -controlledvocabulary.language.Biatah_Bidayuh=Biatah Bidayuh -controlledvocabulary.language.Bibbulman=Bibbulman -controlledvocabulary.language.Bidhawal=Bidhawal -controlledvocabulary.language.Bidiyo=Bidiyo -controlledvocabulary.language.Bidjara=Bidjara -controlledvocabulary.language.Bidyogo=Bidyogo -controlledvocabulary.language.Biem=Biem -controlledvocabulary.language.Bierebo=Bierebo -controlledvocabulary.language.Bieria=Bieria -controlledvocabulary.language.Biete=Biete -controlledvocabulary.language.Big_Nambas=Big Nambas -controlledvocabulary.language.Biga=Biga -controlledvocabulary.language.Bigambal=Bigambal -controlledvocabulary.language.Bih=Bih -controlledvocabulary.language.Bihari=Bihari -controlledvocabulary.language.Bijim=Bijim -controlledvocabulary.language.Bijori=Bijori -controlledvocabulary.language.Bikol=Bikol -controlledvocabulary.language.Bikya=Bikya -controlledvocabulary.language.Bila=Bila -controlledvocabulary.language.Bilakura=Bilakura -controlledvocabulary.language.Bilaspuri=Bilaspuri -controlledvocabulary.language.Bilba=Bilba -controlledvocabulary.language.Bilbil=Bilbil -controlledvocabulary.language.Bile=Bile -controlledvocabulary.language.Bilin=Bilin -controlledvocabulary.language.Bilma_Kanuri=Bilma Kanuri -controlledvocabulary.language.Biloxi=Biloxi -controlledvocabulary.language.Bilua=Bilua -controlledvocabulary.language.Bilur=Bilur -controlledvocabulary.language.Bima=Bima -controlledvocabulary.language.Bimin=Bimin -controlledvocabulary.language.Bimoba=Bimoba -controlledvocabulary.language.Bina_(Nigeria)=Bina (Nigeria) -controlledvocabulary.language.Bina_(Papua_New_Guinea)=Bina (Papua New Guinea) -controlledvocabulary.language.Binahari=Binahari -controlledvocabulary.language.Binandere=Binandere -controlledvocabulary.language.Bindal=Bindal -controlledvocabulary.language.Bine=Bine -controlledvocabulary.language.Bini=Bini -controlledvocabulary.language.Binji=Binji -controlledvocabulary.language.Binongan_Itneg=Binongan Itneg -controlledvocabulary.language.Bintauna=Bintauna -controlledvocabulary.language.Bintulu=Bintulu -controlledvocabulary.language.Binukid=Binukid -controlledvocabulary.language.Binumarien=Binumarien -controlledvocabulary.language.Bipi=Bipi -controlledvocabulary.language.Bira=Bira -controlledvocabulary.language.Birale=Birale -controlledvocabulary.language.Birao=Birao -controlledvocabulary.language.Birgit=Birgit -controlledvocabulary.language.Birhor=Birhor -controlledvocabulary.language.Biri=Biri -controlledvocabulary.language.Biritai=Biritai -controlledvocabulary.language.Birked=Birked -controlledvocabulary.language.Birri=Birri -controlledvocabulary.language.Birrpayi=Birrpayi -controlledvocabulary.language.Birwa=Birwa -controlledvocabulary.language.Biseni=Biseni -controlledvocabulary.language.Bishnupriya=Bishnupriya -controlledvocabulary.language.Bishuo=Bishuo -controlledvocabulary.language.Bisis=Bisis -controlledvocabulary.language.Bislama=Bislama -controlledvocabulary.language.Bisorio=Bisorio -controlledvocabulary.language.Bissa=Bissa -controlledvocabulary.language.Bisu=Bisu -controlledvocabulary.language.Bit=Bit -controlledvocabulary.language.Bitare=Bitare -controlledvocabulary.language.Bitur=Bitur -controlledvocabulary.language.Biwat=Biwat -controlledvocabulary.language.Biyo=Biyo -controlledvocabulary.language.Biyom=Biyom -controlledvocabulary.language.Blablanga=Blablanga -controlledvocabulary.language.Blafe=Blafe -controlledvocabulary.language.Blagar=Blagar -controlledvocabulary.language.Blang=Blang -controlledvocabulary.language.Blissymbols=Blissymbols -controlledvocabulary.language.Bo_(Laos)=Bo (Laos) -controlledvocabulary.language.Bo_(Papua_New_Guinea)=Bo (Papua New Guinea) -controlledvocabulary.language.Bo-Rukul=Bo-Rukul -controlledvocabulary.language.Bo-Ung=Bo-Ung -controlledvocabulary.language.Boano_(Maluku)=Boano (Maluku) -controlledvocabulary.language.Boano_(Sulawesi)=Boano (Sulawesi) -controlledvocabulary.language.Bobongko=Bobongko -controlledvocabulary.language.Bobot=Bobot -controlledvocabulary.language.Bodo_(Central_African_Republic)=Bodo (Central African Republic) -controlledvocabulary.language.Bodo_(India)=Bodo (India) -controlledvocabulary.language.Bodo_Gadaba=Bodo Gadaba -controlledvocabulary.language.Bodo_Parja=Bodo Parja -controlledvocabulary.language.Bofi=Bofi -controlledvocabulary.language.Boga=Boga -controlledvocabulary.language.Bogaya=Bogaya -controlledvocabulary.language.Boghom=Boghom -controlledvocabulary.language.Boguru=Boguru -controlledvocabulary.language.Bohtan_Neo-Aramaic=Bohtan Neo-Aramaic -controlledvocabulary.language.Boikin=Boikin -controlledvocabulary.language.Bokha=Bokha -controlledvocabulary.language.Boko_(Benin)=Boko (Benin) -controlledvocabulary.language.Boko_(Democratic_Republic_of_Congo)=Boko (Democratic Republic of Congo) -controlledvocabulary.language.Bokobaru=Bokobaru -controlledvocabulary.language.Bokoto=Bokoto -controlledvocabulary.language.Bokyi=Bokyi -controlledvocabulary.language.Bola=Bola -controlledvocabulary.language.Bolango=Bolango -controlledvocabulary.language.Bole=Bole -controlledvocabulary.language.Bolgarian=Bolgarian -controlledvocabulary.language.Bolgo=Bolgo -controlledvocabulary.language.Bolia=Bolia -controlledvocabulary.language.Bolinao=Bolinao -controlledvocabulary.language.Bolivian_Sign_Language=Bolivian Sign Language -controlledvocabulary.language.Boloki=Boloki -controlledvocabulary.language.Bolon=Bolon -controlledvocabulary.language.Bolondo=Bolondo -controlledvocabulary.language.Bolongan=Bolongan -controlledvocabulary.language.Bolyu=Bolyu -controlledvocabulary.language.Bom-Kim=Bom-Kim -controlledvocabulary.language.Boma=Boma -controlledvocabulary.language.Bomboli=Bomboli -controlledvocabulary.language.Bomboma=Bomboma -controlledvocabulary.language.Bomitaba=Bomitaba -controlledvocabulary.language.Bomu=Bomu -controlledvocabulary.language.Bomwali=Bomwali -controlledvocabulary.language.Bon_Gula=Bon Gula -controlledvocabulary.language.Bonan=Bonan -controlledvocabulary.language.Bondei=Bondei -controlledvocabulary.language.Bondo=Bondo -controlledvocabulary.language.Bondoukou_Kulango=Bondoukou Kulango -controlledvocabulary.language.Bondum_Dom_Dogon=Bondum Dom Dogon -controlledvocabulary.language.Bonerate=Bonerate -controlledvocabulary.language.Bonerif=Bonerif -controlledvocabulary.language.Bonggi=Bonggi -controlledvocabulary.language.Bonggo=Bonggo -controlledvocabulary.language.Bongili=Bongili -controlledvocabulary.language.Bongo=Bongo -controlledvocabulary.language.Bongu=Bongu -controlledvocabulary.language.Bonjo=Bonjo -controlledvocabulary.language.Bonkeng=Bonkeng -controlledvocabulary.language.Bonkiman=Bonkiman -controlledvocabulary.language.Bontok=Bontok -controlledvocabulary.language.Bookan=Bookan -controlledvocabulary.language.Boon=Boon -controlledvocabulary.language.Boor=Boor -controlledvocabulary.language.Bora=Bora -controlledvocabulary.language.Borana-Arsi-Guji_Oromo=Borana-Arsi-Guji Oromo -controlledvocabulary.language.Border_Kuna=Border Kuna -controlledvocabulary.language.Borei=Borei -controlledvocabulary.language.Borgu_Fulfulde=Borgu Fulfulde -controlledvocabulary.language.Boro_(Ethiopia)=Boro (Ethiopia) -controlledvocabulary.language.Boro_(Ghana)=Boro (Ghana) -controlledvocabulary.language.Borong=Borong -controlledvocabulary.language.Boruca=Boruca -controlledvocabulary.language.Bor�ro=Bor�ro -controlledvocabulary.language.Boselewa=Boselewa -controlledvocabulary.language.Bosngun=Bosngun -controlledvocabulary.language.Bosnian=Bosnian -controlledvocabulary.language.Bote-Majhi=Bote-Majhi -controlledvocabulary.language.Botlikh=Botlikh -controlledvocabulary.language.Botolan_Sambal=Botolan Sambal -controlledvocabulary.language.Bouna_Kulango=Bouna Kulango -controlledvocabulary.language.Bouni=Bouni -controlledvocabulary.language.Bouyei=Bouyei -controlledvocabulary.language.Bozaba=Bozaba -controlledvocabulary.language.Bragat=Bragat -controlledvocabulary.language.Brahui=Brahui -controlledvocabulary.language.Braj=Braj -controlledvocabulary.language.Brao=Brao -controlledvocabulary.language.Brazilian_Sign_Language=Brazilian Sign Language -controlledvocabulary.language.Brem=Brem -controlledvocabulary.language.Breri=Breri -controlledvocabulary.language.Breton=Breton -controlledvocabulary.language.Bribri=Bribri -controlledvocabulary.language.Bribri_Sign_Language=Bribri Sign Language -controlledvocabulary.language.Brithenig=Brithenig -controlledvocabulary.language.British_Sign_Language=British Sign Language -controlledvocabulary.language.Brokkat=Brokkat -controlledvocabulary.language.Brokpake=Brokpake -controlledvocabulary.language.Brokskat=Brokskat -controlledvocabulary.language.Brooke's_Point_Palawano=Brooke's Point Palawano -controlledvocabulary.language.Broome_Pearling_Lugger_Pidgin=Broome Pearling Lugger Pidgin -controlledvocabulary.language.Brunca_Sign_Language=Brunca Sign Language -controlledvocabulary.language.Brunei=Brunei -controlledvocabulary.language.Brunei_Bisaya=Brunei Bisaya -controlledvocabulary.language.Bruny_Island_Tasmanian=Bruny Island Tasmanian -controlledvocabulary.language.Bu_(Bauchi_State)=Bu (Bauchi State) -controlledvocabulary.language.Bu_(Kaduna_State)=Bu (Kaduna State) -controlledvocabulary.language.Bu-Nao_Bunu=Bu-Nao Bunu -controlledvocabulary.language.Bua=Bua -controlledvocabulary.language.Bualkhaw_Chin=Bualkhaw Chin -controlledvocabulary.language.Buamu=Buamu -controlledvocabulary.language.Bube=Bube -controlledvocabulary.language.Bubi=Bubi -controlledvocabulary.language.Bubia=Bubia -controlledvocabulary.language.Budeh_Stieng=Budeh Stieng -controlledvocabulary.language.Budibud=Budibud -controlledvocabulary.language.Budong-Budong=Budong-Budong -controlledvocabulary.language.Budu=Budu -controlledvocabulary.language.Budukh=Budukh -controlledvocabulary.language.Buduma=Buduma -controlledvocabulary.language.Budza=Budza -controlledvocabulary.language.Bugan=Bugan -controlledvocabulary.language.Bugawac=Bugawac -controlledvocabulary.language.Bughotu=Bughotu -controlledvocabulary.language.Buginese=Buginese -controlledvocabulary.language.Buglere=Buglere -controlledvocabulary.language.Bugun=Bugun -controlledvocabulary.language.Buhi'non_Bikol=Buhi'non Bikol -controlledvocabulary.language.Buhid=Buhid -controlledvocabulary.language.Buhutu=Buhutu -controlledvocabulary.language.Bukar-Sadung_Bidayuh=Bukar-Sadung Bidayuh -controlledvocabulary.language.Bukat=Bukat -controlledvocabulary.language.Bukharic=Bukharic -controlledvocabulary.language.Bukit_Malay=Bukit Malay -controlledvocabulary.language.Bukitan=Bukitan -controlledvocabulary.language.Bukiyip=Bukiyip -controlledvocabulary.language.Buksa=Buksa -controlledvocabulary.language.Bukusu=Bukusu -controlledvocabulary.language.Bukwen=Bukwen -controlledvocabulary.language.Bulgarian=Bulgarian -controlledvocabulary.language.Bulgarian_Sign_Language=Bulgarian Sign Language -controlledvocabulary.language.Bulgebi=Bulgebi -controlledvocabulary.language.Buli=Buli -controlledvocabulary.language.Buli_(Ghana)=Buli (Ghana) -controlledvocabulary.language.Buli_(Indonesia)=Buli (Indonesia) -controlledvocabulary.language.Bullom_So=Bullom So -controlledvocabulary.language.Bulo_Stieng=Bulo Stieng -controlledvocabulary.language.Bulu_(Cameroon)=Bulu (Cameroon) -controlledvocabulary.language.Bulu_(Papua_New_Guinea)=Bulu (Papua New Guinea) -controlledvocabulary.language.Bum=Bum -controlledvocabulary.language.Bumaji=Bumaji -controlledvocabulary.language.Bumang=Bumang -controlledvocabulary.language.Bumbita_Arapesh=Bumbita Arapesh -controlledvocabulary.language.Bumthangkha=Bumthangkha -controlledvocabulary.language.Bun=Bun -controlledvocabulary.language.Buna=Buna -controlledvocabulary.language.Bunak=Bunak -controlledvocabulary.language.Bunama=Bunama -controlledvocabulary.language.Bundeli=Bundeli -controlledvocabulary.language.Bung=Bung -controlledvocabulary.language.Bungain=Bungain -controlledvocabulary.language.Bunganditj=Bunganditj -controlledvocabulary.language.Bungku=Bungku -controlledvocabulary.language.Bungu=Bungu -controlledvocabulary.language.Bunoge_Dogon=Bunoge Dogon -controlledvocabulary.language.Bunuba=Bunuba -controlledvocabulary.language.Bunun=Bunun -controlledvocabulary.language.Buol=Buol -controlledvocabulary.language.Bura-Pabir=Bura-Pabir -controlledvocabulary.language.Burak=Burak -controlledvocabulary.language.Buraka=Buraka -controlledvocabulary.language.Burarra=Burarra -controlledvocabulary.language.Burate=Burate -controlledvocabulary.language.Burduna=Burduna -controlledvocabulary.language.Bure=Bure -controlledvocabulary.language.Buriat=Buriat -controlledvocabulary.language.Burji=Burji -controlledvocabulary.language.Burmbar=Burmbar -controlledvocabulary.language.Burmese=Burmese -controlledvocabulary.language.Burmeso=Burmeso -controlledvocabulary.language.Buru_(Indonesia)=Buru (Indonesia) -controlledvocabulary.language.Buru_(Nigeria)=Buru (Nigeria) -controlledvocabulary.language.Burui=Burui -controlledvocabulary.language.Burumakok=Burumakok -controlledvocabulary.language.Burun=Burun -controlledvocabulary.language.Burundian_Sign_Language=Burundian Sign Language -controlledvocabulary.language.Burunge=Burunge -controlledvocabulary.language.Burushaski=Burushaski -controlledvocabulary.language.Burusu=Burusu -controlledvocabulary.language.Buruwai=Buruwai -controlledvocabulary.language.Busa=Busa -controlledvocabulary.language.Busam=Busam -controlledvocabulary.language.Busami=Busami -controlledvocabulary.language.Busang_Kayan=Busang Kayan -controlledvocabulary.language.Bushi=Bushi -controlledvocabulary.language.Bushoong=Bushoong -controlledvocabulary.language.Buso=Buso -controlledvocabulary.language.Busoa=Busoa -controlledvocabulary.language.Bussa=Bussa -controlledvocabulary.language.Busuu=Busuu -controlledvocabulary.language.Butbut_Kalinga=Butbut Kalinga -controlledvocabulary.language.Butmas-Tur=Butmas-Tur -controlledvocabulary.language.Butuanon=Butuanon -controlledvocabulary.language.Buwal=Buwal -controlledvocabulary.language.Buyu=Buyu -controlledvocabulary.language.Buyuan_Jinuo=Buyuan Jinuo -controlledvocabulary.language.Bwa=Bwa -controlledvocabulary.language.Bwaidoka=Bwaidoka -controlledvocabulary.language.Bwanabwana=Bwanabwana -controlledvocabulary.language.Bwatoo=Bwatoo -controlledvocabulary.language.Bwe_Karen=Bwe Karen -controlledvocabulary.language.Bwela=Bwela -controlledvocabulary.language.Bwile=Bwile -controlledvocabulary.language.Bwisi=Bwisi -controlledvocabulary.language.Byangsi=Byangsi -controlledvocabulary.language.Byep=Byep -controlledvocabulary.language.B�di_Kanum=B�di Kanum -controlledvocabulary.language.C'Lela=C'Lela -controlledvocabulary.language.Caac=Caac -controlledvocabulary.language.Cabiyar�=Cabiyar� -controlledvocabulary.language.Cab�car=Cab�car -controlledvocabulary.language.Cacaloxtepec_Mixtec=Cacaloxtepec Mixtec -controlledvocabulary.language.Cacaopera=Cacaopera -controlledvocabulary.language.Cacgia_Roglai=Cacgia Roglai -controlledvocabulary.language.Cacua=Cacua -controlledvocabulary.language.Caddo=Caddo -controlledvocabulary.language.Cafundo_Creole=Cafundo Creole -controlledvocabulary.language.Cahuarano=Cahuarano -controlledvocabulary.language.Cahuilla=Cahuilla -controlledvocabulary.language.Cajamarca_Quechua=Cajamarca Quechua -controlledvocabulary.language.Cajatambo_North_Lima_Quechua=Cajatambo North Lima Quechua -controlledvocabulary.language.Cajonos_Zapotec=Cajonos Zapotec -controlledvocabulary.language.Cajun_French=Cajun French -controlledvocabulary.language.Caka=Caka -controlledvocabulary.language.Cakchiquel-Quich�_Mixed_Language=Cakchiquel-Quich� Mixed Language -controlledvocabulary.language.Cakfem-Mushere=Cakfem-Mushere -controlledvocabulary.language.Calamian_Tagbanwa=Calamian Tagbanwa -controlledvocabulary.language.Calder�n_Highland_Quichua=Calder�n Highland Quichua -controlledvocabulary.language.Callawalla=Callawalla -controlledvocabulary.language.Caluyanun=Caluyanun -controlledvocabulary.language.Cal�=Cal� -controlledvocabulary.language.Cambodian_Sign_Language=Cambodian Sign Language -controlledvocabulary.language.Cameroon_Mambila=Cameroon Mambila -controlledvocabulary.language.Cameroon_Pidgin=Cameroon Pidgin -controlledvocabulary.language.Camling=Camling -controlledvocabulary.language.Campalagian=Campalagian -controlledvocabulary.language.Campidanese_Sardinian=Campidanese Sardinian -controlledvocabulary.language.Cams�=Cams� -controlledvocabulary.language.Camtho=Camtho -controlledvocabulary.language.Camunic=Camunic -controlledvocabulary.language.Candoshi-Shapra=Candoshi-Shapra -controlledvocabulary.language.Canela=Canela -controlledvocabulary.language.Canichana=Canichana -controlledvocabulary.language.Cao_Lan=Cao Lan -controlledvocabulary.language.Cao_Miao=Cao Miao -controlledvocabulary.language.Capanahua=Capanahua -controlledvocabulary.language.Capiznon=Capiznon -controlledvocabulary.language.Cappadocian_Greek=Cappadocian Greek -controlledvocabulary.language.Caquinte=Caquinte -controlledvocabulary.language.Car_Nicobarese=Car Nicobarese -controlledvocabulary.language.Cara=Cara -controlledvocabulary.language.Carabayo=Carabayo -controlledvocabulary.language.Caramanta=Caramanta -controlledvocabulary.language.Carapana=Carapana -controlledvocabulary.language.Carian=Carian -controlledvocabulary.language.Caribbean_Hindustani=Caribbean Hindustani -controlledvocabulary.language.Caribbean_Javanese=Caribbean Javanese -controlledvocabulary.language.Carijona=Carijona -controlledvocabulary.language.Carolina_Algonquian=Carolina Algonquian -controlledvocabulary.language.Carolinian=Carolinian -controlledvocabulary.language.Carpathian_Romani=Carpathian Romani -controlledvocabulary.language.Carrier=Carrier -controlledvocabulary.language.Cashibo-Cacataibo=Cashibo-Cacataibo -controlledvocabulary.language.Cashinahua=Cashinahua -controlledvocabulary.language.Casiguran_Dumagat_Agta=Casiguran Dumagat Agta -controlledvocabulary.language.Casuarina_Coast_Asmat=Casuarina Coast Asmat -controlledvocabulary.language.Catalan_Sign_Language=Catalan Sign Language -controlledvocabulary.language.Catalan,_Valencian=Catalan, Valencian -controlledvocabulary.language.Catawba=Catawba -controlledvocabulary.language.Cavine�a=Cavine�a -controlledvocabulary.language.Cayubaba=Cayubaba -controlledvocabulary.language.Cayuga=Cayuga -controlledvocabulary.language.Cayuse=Cayuse -controlledvocabulary.language.Ca�ar_Highland_Quichua=Ca�ar Highland Quichua -controlledvocabulary.language.Cahungwarya=Ca?hungwa?rya? -controlledvocabulary.language.Cebaara_Senoufo=Cebaara Senoufo -controlledvocabulary.language.Cebuano=Cebuano -controlledvocabulary.language.Celtiberian=Celtiberian -controlledvocabulary.language.Cemuh�=Cemuh� -controlledvocabulary.language.Cen=Cen -controlledvocabulary.language.Central_Asmat=Central Asmat -controlledvocabulary.language.Central_Atlas_Tamazight=Central Atlas Tamazight -controlledvocabulary.language.Central_Awyu=Central Awyu -controlledvocabulary.language.Central_Aymara=Central Aymara -controlledvocabulary.language.Central_Bai=Central Bai -controlledvocabulary.language.Central_Berawan=Central Berawan -controlledvocabulary.language.Central_Bikol=Central Bikol -controlledvocabulary.language.Central_Bontok=Central Bontok -controlledvocabulary.language.Central_Cagayan_Agta=Central Cagayan Agta -controlledvocabulary.language.Central_Grebo=Central Grebo -controlledvocabulary.language.Central_Hongshuihe_Zhuang=Central Hongshuihe Zhuang -controlledvocabulary.language.Central_Huasteca_Nahuatl=Central Huasteca Nahuatl -controlledvocabulary.language.Central_Huishui_Hmong=Central Huishui Hmong -controlledvocabulary.language.Central_Kanuri=Central Kanuri -controlledvocabulary.language.Central_Kurdish=Central Kurdish -controlledvocabulary.language.Central_Maewo=Central Maewo -controlledvocabulary.language.Central_Malay=Central Malay -controlledvocabulary.language.Central_Masela=Central Masela -controlledvocabulary.language.Central_Mashan_Hmong=Central Mashan Hmong -controlledvocabulary.language.Central_Mazahua=Central Mazahua -controlledvocabulary.language.Central_Melanau=Central Melanau -controlledvocabulary.language.Central_Mnong=Central Mnong -controlledvocabulary.language.Central_Nahuatl=Central Nahuatl -controlledvocabulary.language.Central_Nicobarese=Central Nicobarese -controlledvocabulary.language.Central_Ojibwa=Central Ojibwa -controlledvocabulary.language.Central_Okinawan=Central Okinawan -controlledvocabulary.language.Central_Palawano=Central Palawano -controlledvocabulary.language.Central_Pame=Central Pame -controlledvocabulary.language.Central_Pashto=Central Pashto -controlledvocabulary.language.Central_Pomo=Central Pomo -controlledvocabulary.language.Central_Puebla_Nahuatl=Central Puebla Nahuatl -controlledvocabulary.language.Central_Sama=Central Sama -controlledvocabulary.language.Central_Siberian_Yupik=Central Siberian Yupik -controlledvocabulary.language.Central_Sierra_Miwok=Central Sierra Miwok -controlledvocabulary.language.Central_Subanen=Central Subanen -controlledvocabulary.language.Central_Tagbanwa=Central Tagbanwa -controlledvocabulary.language.Central_Tarahumara=Central Tarahumara -controlledvocabulary.language.Central_Tunebo=Central Tunebo -controlledvocabulary.language.Central_Yupik=Central Yupik -controlledvocabulary.language.Central-Eastern_Niger_Fulfulde=Central-Eastern Niger Fulfulde -controlledvocabulary.language.Cent��m=Cent��m -controlledvocabulary.language.Cerma=Cerma -controlledvocabulary.language.Cha'ari=Cha'ari -controlledvocabulary.language.Chabu=Chabu -controlledvocabulary.language.Chachapoyas_Quechua=Chachapoyas Quechua -controlledvocabulary.language.Chachi=Chachi -controlledvocabulary.language.Chadian_Arabic=Chadian Arabic -controlledvocabulary.language.Chadian_Sign_Language=Chadian Sign Language -controlledvocabulary.language.Chadong=Chadong -controlledvocabulary.language.Chagatai=Chagatai -controlledvocabulary.language.Chaima=Chaima -controlledvocabulary.language.Chak=Chak -controlledvocabulary.language.Chakali=Chakali -controlledvocabulary.language.Chakavian=Chakavian -controlledvocabulary.language.Chakma=Chakma -controlledvocabulary.language.Chala=Chala -controlledvocabulary.language.Chaldean_Neo-Aramaic=Chaldean Neo-Aramaic -controlledvocabulary.language.Chalikha=Chalikha -controlledvocabulary.language.Chamacoco=Chamacoco -controlledvocabulary.language.Chamalal=Chamalal -controlledvocabulary.language.Chambeali=Chambeali -controlledvocabulary.language.Chambri=Chambri -controlledvocabulary.language.Chamicuro=Chamicuro -controlledvocabulary.language.Chamorro=Chamorro -controlledvocabulary.language.Chang_Naga=Chang Naga -controlledvocabulary.language.Changriwa=Changriwa -controlledvocabulary.language.Changthang=Changthang -controlledvocabulary.language.Chantyal=Chantyal -controlledvocabulary.language.Chan�=Chan� -controlledvocabulary.language.Chara=Chara -controlledvocabulary.language.Chaudangsi=Chaudangsi -controlledvocabulary.language.Chaura=Chaura -controlledvocabulary.language.Chavacano=Chavacano -controlledvocabulary.language.Chayahuita=Chayahuita -controlledvocabulary.language.Chayuco_Mixtec=Chayuco Mixtec -controlledvocabulary.language.Chazumba_Mixtec=Chazumba Mixtec -controlledvocabulary.language.Che=Che -controlledvocabulary.language.Chechen=Chechen -controlledvocabulary.language.Cheke_Holo=Cheke Holo -controlledvocabulary.language.Chemakum=Chemakum -controlledvocabulary.language.Chenapian=Chenapian -controlledvocabulary.language.Chenchu=Chenchu -controlledvocabulary.language.Chenoua=Chenoua -controlledvocabulary.language.Chepang=Chepang -controlledvocabulary.language.Chepya=Chepya -controlledvocabulary.language.Cherepon=Cherepon -controlledvocabulary.language.Cherokee=Cherokee -controlledvocabulary.language.Chesu=Chesu -controlledvocabulary.language.Chetco=Chetco -controlledvocabulary.language.Chewong=Chewong -controlledvocabulary.language.Cheyenne=Cheyenne -controlledvocabulary.language.Chhattisgarhi=Chhattisgarhi -controlledvocabulary.language.Chhintange=Chhintange -controlledvocabulary.language.Chhulung=Chhulung -controlledvocabulary.language.Chiangmai_Sign_Language=Chiangmai Sign Language -controlledvocabulary.language.Chiapanec=Chiapanec -controlledvocabulary.language.Chibcha=Chibcha -controlledvocabulary.language.Chicahuaxtla_Triqui=Chicahuaxtla Triqui -controlledvocabulary.language.Chichewa,_Chewa,_Nyanja=Chichewa, Chewa, Nyanja -controlledvocabulary.language.Chichicapan_Zapotec=Chichicapan Zapotec -controlledvocabulary.language.Chichimeca-Jonaz=Chichimeca-Jonaz -controlledvocabulary.language.Chickasaw=Chickasaw -controlledvocabulary.language.Chicomuceltec=Chicomuceltec -controlledvocabulary.language.Chiga=Chiga -controlledvocabulary.language.Chigmecatitl�n_Mixtec=Chigmecatitl�n Mixtec -controlledvocabulary.language.Chilcotin=Chilcotin -controlledvocabulary.language.Chilean_Sign_Language=Chilean Sign Language -controlledvocabulary.language.Chilisso=Chilisso -controlledvocabulary.language.Chiltepec_Chinantec=Chiltepec Chinantec -controlledvocabulary.language.Chimalapa_Zoque=Chimalapa Zoque -controlledvocabulary.language.Chimariko=Chimariko -controlledvocabulary.language.Chimborazo_Highland_Quichua=Chimborazo Highland Quichua -controlledvocabulary.language.Chimila=Chimila -controlledvocabulary.language.China_Buriat=China Buriat -controlledvocabulary.language.Chinali=Chinali -controlledvocabulary.language.Chinbon_Chin=Chinbon Chin -controlledvocabulary.language.Chincha_Quechua=Chincha Quechua -controlledvocabulary.language.Chinese=Chinese -controlledvocabulary.language.Chinese_Pidgin_English=Chinese Pidgin English -controlledvocabulary.language.Chinese_Sign_Language=Chinese Sign Language -controlledvocabulary.language.Chinook=Chinook -controlledvocabulary.language.Chinook_jargon=Chinook jargon -controlledvocabulary.language.Chipaya=Chipaya -controlledvocabulary.language.Chipewyan=Chipewyan -controlledvocabulary.language.Chippewa=Chippewa -controlledvocabulary.language.Chiquihuitl�n_Mazatec=Chiquihuitl�n Mazatec -controlledvocabulary.language.Chiquitano=Chiquitano -controlledvocabulary.language.Chiqui�n_Ancash_Quechua=Chiqui�n Ancash Quechua -controlledvocabulary.language.Chirip�=Chirip� -controlledvocabulary.language.Chiru=Chiru -controlledvocabulary.language.Chitimacha=Chitimacha -controlledvocabulary.language.Chitkuli_Kinnauri=Chitkuli Kinnauri -controlledvocabulary.language.Chittagonian=Chittagonian -controlledvocabulary.language.Chitwania_Tharu=Chitwania Tharu -controlledvocabulary.language.Choapan_Zapotec=Choapan Zapotec -controlledvocabulary.language.Chocangacakha=Chocangacakha -controlledvocabulary.language.Chochotec=Chochotec -controlledvocabulary.language.Choctaw=Choctaw -controlledvocabulary.language.Chodri=Chodri -controlledvocabulary.language.Chokri_Naga=Chokri Naga -controlledvocabulary.language.Chokwe=Chokwe -controlledvocabulary.language.Chol=Chol -controlledvocabulary.language.Chol�n=Chol�n -controlledvocabulary.language.Chong=Chong -controlledvocabulary.language.Choni=Choni -controlledvocabulary.language.Chonyi-Dzihana-Kauma=Chonyi-Dzihana-Kauma -controlledvocabulary.language.Chopi=Chopi -controlledvocabulary.language.Chorasmian=Chorasmian -controlledvocabulary.language.Chort�=Chort� -controlledvocabulary.language.Chothe_Naga=Chothe Naga -controlledvocabulary.language.Chrau=Chrau -controlledvocabulary.language.Chru=Chru -controlledvocabulary.language.Chuanqiandian_Cluster_Miao=Chuanqiandian Cluster Miao -controlledvocabulary.language.Chuave=Chuave -controlledvocabulary.language.Chug=Chug -controlledvocabulary.language.Chuj=Chuj -controlledvocabulary.language.Chuka=Chuka -controlledvocabulary.language.Chukot=Chukot -controlledvocabulary.language.Chukwa=Chukwa -controlledvocabulary.language.Chulym=Chulym -controlledvocabulary.language.Chumburung=Chumburung -controlledvocabulary.language.Chung=Chung -controlledvocabulary.language.Churahi=Churahi -controlledvocabulary.language.Chut=Chut -controlledvocabulary.language.Chuukese=Chuukese -controlledvocabulary.language.Chuvantsy=Chuvantsy -controlledvocabulary.language.Chuvash=Chuvash -controlledvocabulary.language.Chuwabu=Chuwabu -controlledvocabulary.language.Ch�cobo=Ch�cobo -controlledvocabulary.language.Ci_Gbe=Ci Gbe -controlledvocabulary.language.Cia-Cia=Cia-Cia -controlledvocabulary.language.Cibak=Cibak -controlledvocabulary.language.Cicipu=Cicipu -controlledvocabulary.language.Cimbrian=Cimbrian -controlledvocabulary.language.Cinda-Regi-Tiyal=Cinda-Regi-Tiyal -controlledvocabulary.language.Cineni=Cineni -controlledvocabulary.language.Cinta_Larga=Cinta Larga -controlledvocabulary.language.Cisalpine_Gaulish=Cisalpine Gaulish -controlledvocabulary.language.Cishingini=Cishingini -controlledvocabulary.language.Citak=Citak -controlledvocabulary.language.Ciwogai=Ciwogai -controlledvocabulary.language.Clallam=Clallam -controlledvocabulary.language.Classical_Armenian=Classical Armenian -controlledvocabulary.language.Classical_Mandaic=Classical Mandaic -controlledvocabulary.language.Classical_Mongolian=Classical Mongolian -controlledvocabulary.language.Classical_Nahuatl=Classical Nahuatl -controlledvocabulary.language.Classical_Newari=Classical Newari -controlledvocabulary.language.Classical_Quechua=Classical Quechua -controlledvocabulary.language.Classical_Sanskrit=Classical Sanskrit -controlledvocabulary.language.Classical_Syriac=Classical Syriac -controlledvocabulary.language.Classical_Tibetan=Classical Tibetan -controlledvocabulary.language.Coahuilteco=Coahuilteco -controlledvocabulary.language.Coast_Miwok=Coast Miwok -controlledvocabulary.language.Coastal_Konjo=Coastal Konjo -controlledvocabulary.language.Coatecas_Altas_Zapotec=Coatecas Altas Zapotec -controlledvocabulary.language.Coatepec_Nahuatl=Coatepec Nahuatl -controlledvocabulary.language.Coatl�n_Mixe=Coatl�n Mixe -controlledvocabulary.language.Coatl�n_Zapotec=Coatl�n Zapotec -controlledvocabulary.language.Coatzospan_Mixtec=Coatzospan Mixtec -controlledvocabulary.language.Cocama-Cocamilla=Cocama-Cocamilla -controlledvocabulary.language.Cochimi=Cochimi -controlledvocabulary.language.Cocopa=Cocopa -controlledvocabulary.language.Cocos_Islands_Malay=Cocos Islands Malay -controlledvocabulary.language.Coeur_d'Alene=Coeur d'Alene -controlledvocabulary.language.Cof�n=Cof�n -controlledvocabulary.language.Cogui=Cogui -controlledvocabulary.language.Col=Col -controlledvocabulary.language.Colombian_Sign_Language=Colombian Sign Language -controlledvocabulary.language.Colonia_Tovar_German=Colonia Tovar German -controlledvocabulary.language.Colorado=Colorado -controlledvocabulary.language.Columbia-Wenatchi=Columbia-Wenatchi -controlledvocabulary.language.Comaltepec_Chinantec=Comaltepec Chinantec -controlledvocabulary.language.Comanche=Comanche -controlledvocabulary.language.Comecrudo=Comecrudo -controlledvocabulary.language.Como_Karim=Como Karim -controlledvocabulary.language.Comox=Comox -controlledvocabulary.language.Con=Con -controlledvocabulary.language.Congo_Swahili=Congo Swahili -controlledvocabulary.language.Coos=Coos -controlledvocabulary.language.Copainal�_Zoque=Copainal� Zoque -controlledvocabulary.language.Copala_Triqui=Copala Triqui -controlledvocabulary.language.Coptic=Coptic -controlledvocabulary.language.Coquille=Coquille -controlledvocabulary.language.Cori=Cori -controlledvocabulary.language.Cornish=Cornish -controlledvocabulary.language.Corongo_Ancash_Quechua=Corongo Ancash Quechua -controlledvocabulary.language.Corsican=Corsican -controlledvocabulary.language.Costa_Rican_Sign_Language=Costa Rican Sign Language -controlledvocabulary.language.Cotabato_Manobo=Cotabato Manobo -controlledvocabulary.language.Cotoname=Cotoname -controlledvocabulary.language.Cowlitz=Cowlitz -controlledvocabulary.language.Coyotepec_Popoloca=Coyotepec Popoloca -controlledvocabulary.language.Coyutla_Totonac=Coyutla Totonac -controlledvocabulary.language.Cree=Cree -controlledvocabulary.language.Creek=Creek -controlledvocabulary.language.Crimean_Tatar=Crimean Tatar -controlledvocabulary.language.Croatia_Sign_Language=Croatia Sign Language -controlledvocabulary.language.Croatian=Croatian -controlledvocabulary.language.Cross_River_Mbembe=Cross River Mbembe -controlledvocabulary.language.Crow=Crow -controlledvocabulary.language.Cruze�o=Cruze�o -controlledvocabulary.language.Cua=Cua -controlledvocabulary.language.Cuba_Sign_Language=Cuba Sign Language -controlledvocabulary.language.Cubeo=Cubeo -controlledvocabulary.language.Cuiba=Cuiba -controlledvocabulary.language.Cuitlatec=Cuitlatec -controlledvocabulary.language.Culina=Culina -controlledvocabulary.language.Cumanagoto=Cumanagoto -controlledvocabulary.language.Cumbric=Cumbric -controlledvocabulary.language.Cun=Cun -controlledvocabulary.language.Cuneiform_Luwian=Cuneiform Luwian -controlledvocabulary.language.Cupe�o=Cupe�o -controlledvocabulary.language.Curonian=Curonian -controlledvocabulary.language.Curripaco=Curripaco -controlledvocabulary.language.Cusco_Quechua=Cusco Quechua -controlledvocabulary.language.Cutchi-Swahili=Cutchi-Swahili -controlledvocabulary.language.Cuvok=Cuvok -controlledvocabulary.language.Cuyamecalco_Mixtec=Cuyamecalco Mixtec -controlledvocabulary.language.Cuyonon=Cuyonon -controlledvocabulary.language.Cwi_Bwamu=Cwi Bwamu -controlledvocabulary.language.Cypriot_Arabic=Cypriot Arabic -controlledvocabulary.language.Czech=Czech -controlledvocabulary.language.Czech_Sign_Language=Czech Sign Language -controlledvocabulary.language.C��ng=C��ng -controlledvocabulary.language.Da'a_Kaili=Da'a Kaili -controlledvocabulary.language.Daai_Chin=Daai Chin -controlledvocabulary.language.Daakaka=Daakaka -controlledvocabulary.language.Daantanai'=Daantanai' -controlledvocabulary.language.Daasanach=Daasanach -controlledvocabulary.language.Daatsiin=Daats?i?in -controlledvocabulary.language.Daba=Daba -controlledvocabulary.language.Dabarre=Dabarre -controlledvocabulary.language.Dabe=Dabe -controlledvocabulary.language.Dacian=Dacian -controlledvocabulary.language.Dadi_Dadi=Dadi Dadi -controlledvocabulary.language.Dadibi=Dadibi -controlledvocabulary.language.Dadiya=Dadiya -controlledvocabulary.language.Daga=Daga -controlledvocabulary.language.Dagaari_Dioula=Dagaari Dioula -controlledvocabulary.language.Dagba=Dagba -controlledvocabulary.language.Dagbani=Dagbani -controlledvocabulary.language.Dagik=Dagik -controlledvocabulary.language.Dagoman=Dagoman -controlledvocabulary.language.Dahalik=Dahalik -controlledvocabulary.language.Dahalo=Dahalo -controlledvocabulary.language.Daho-Doo=Daho-Doo -controlledvocabulary.language.Dai=Dai -controlledvocabulary.language.Dai_Zhuang=Dai Zhuang -controlledvocabulary.language.Dair=Dair -controlledvocabulary.language.Dakka=Dakka -controlledvocabulary.language.Dakota=Dakota -controlledvocabulary.language.Dakpakha=Dakpakha -controlledvocabulary.language.Dalabon=Dalabon -controlledvocabulary.language.Dalmatian=Dalmatian -controlledvocabulary.language.Daloa_B�t�=Daloa B�t� -controlledvocabulary.language.Dama=Dama -controlledvocabulary.language.Damakawa=Damakawa -controlledvocabulary.language.Damal=Damal -controlledvocabulary.language.Dambi=Dambi -controlledvocabulary.language.Dameli=Dameli -controlledvocabulary.language.Dampelas=Dampelas -controlledvocabulary.language.Dan=Dan -controlledvocabulary.language.Danaru=Danaru -controlledvocabulary.language.Danau=Danau -controlledvocabulary.language.Dandami_Maria=Dandami Maria -controlledvocabulary.language.Dangal�at=Dangal�at -controlledvocabulary.language.Dangaura_Tharu=Dangaura Tharu -controlledvocabulary.language.Danish=Danish -controlledvocabulary.language.Danish_Sign_Language=Danish Sign Language -controlledvocabulary.language.Dano=Dano -controlledvocabulary.language.Danu=Danu -controlledvocabulary.language.Dao=Dao -controlledvocabulary.language.Daonda=Daonda -controlledvocabulary.language.Dar_Daju_Daju=Dar Daju Daju -controlledvocabulary.language.Dar_Fur_Daju=Dar Fur Daju -controlledvocabulary.language.Dar_Sila_Daju=Dar Sila Daju -controlledvocabulary.language.Darai=Darai -controlledvocabulary.language.Dargwa=Dargwa -controlledvocabulary.language.Dari=Dari -controlledvocabulary.language.Darkinyung=Darkinyung -controlledvocabulary.language.Darlong=Darlong -controlledvocabulary.language.Darmiya=Darmiya -controlledvocabulary.language.Daro-Matu_Melanau=Daro-Matu Melanau -controlledvocabulary.language.Dass=Dass -controlledvocabulary.language.Datooga=Datooga -controlledvocabulary.language.Daungwurrung=Daungwurrung -controlledvocabulary.language.Daur=Daur -controlledvocabulary.language.Davawenyo=Davawenyo -controlledvocabulary.language.Dawawa=Dawawa -controlledvocabulary.language.Dawera-Daweloor=Dawera-Daweloor -controlledvocabulary.language.Dawik_Kui=Dawik Kui -controlledvocabulary.language.Dawro=Dawro -controlledvocabulary.language.Day=Day -controlledvocabulary.language.Dayi=Dayi -controlledvocabulary.language.Daza=Daza -controlledvocabulary.language.Dazaga=Dazaga -controlledvocabulary.language.Deccan=Deccan -controlledvocabulary.language.Dedua=Dedua -controlledvocabulary.language.Defaka=Defaka -controlledvocabulary.language.Defi_Gbe=Defi Gbe -controlledvocabulary.language.Deg=Deg -controlledvocabulary.language.Degema=Degema -controlledvocabulary.language.Degenan=Degenan -controlledvocabulary.language.Degexit'an=Degexit'an -controlledvocabulary.language.Dehu=Dehu -controlledvocabulary.language.Dehwari=Dehwari -controlledvocabulary.language.Dek=Dek -controlledvocabulary.language.Dela-Oenale=Dela-Oenale -controlledvocabulary.language.Delaware=Delaware -controlledvocabulary.language.Delo=Delo -controlledvocabulary.language.Dem=Dem -controlledvocabulary.language.Dema=Dema -controlledvocabulary.language.Demisa=Demisa -controlledvocabulary.language.Demta=Demta -controlledvocabulary.language.Dendi_(Benin)=Dendi (Benin) -controlledvocabulary.language.Dendi_(Central_African_Republic)=Dendi (Central African Republic) -controlledvocabulary.language.Dengese=Dengese -controlledvocabulary.language.Dengka=Dengka -controlledvocabulary.language.Deno=Deno -controlledvocabulary.language.Denya=Denya -controlledvocabulary.language.Den�=Den� -controlledvocabulary.language.Deori=Deori -controlledvocabulary.language.Dera_(Indonesia)=Dera (Indonesia) -controlledvocabulary.language.Dera_(Nigeria)=Dera (Nigeria) -controlledvocabulary.language.Desano=Desano -controlledvocabulary.language.Desiya=Desiya -controlledvocabulary.language.Dewas_Rai=Dewas Rai -controlledvocabulary.language.Dewoin=Dewoin -controlledvocabulary.language.Dezfuli=Dezfuli -controlledvocabulary.language.Dghwede=Dghwede -controlledvocabulary.language.Dhaiso=Dhaiso -controlledvocabulary.language.Dhalandji=Dhalandji -controlledvocabulary.language.Dhangu-Djangu=Dhangu-Djangu -controlledvocabulary.language.Dhanki=Dhanki -controlledvocabulary.language.Dhanwar_(Nepal)=Dhanwar (Nepal) -controlledvocabulary.language.Dhao=Dhao -controlledvocabulary.language.Dharawal=Dharawal -controlledvocabulary.language.Dhargari=Dhargari -controlledvocabulary.language.Dharuk=Dharuk -controlledvocabulary.language.Dharumbal=Dharumbal -controlledvocabulary.language.Dhatki=Dhatki -controlledvocabulary.language.Dhimal=Dhimal -controlledvocabulary.language.Dhodia=Dhodia -controlledvocabulary.language.Dhofari_Arabic=Dhofari Arabic -controlledvocabulary.language.Dhudhuroa=Dhudhuroa -controlledvocabulary.language.Dhundari=Dhundari -controlledvocabulary.language.Dhungaloo=Dhungaloo -controlledvocabulary.language.Dhurga=Dhurga -controlledvocabulary.language.Dhuwal=Dhuwal -controlledvocabulary.language.Dhuwaya=Dhuwaya -controlledvocabulary.language.Dia=Dia -controlledvocabulary.language.Dibabawon_Manobo=Dibabawon Manobo -controlledvocabulary.language.Dibiyaso=Dibiyaso -controlledvocabulary.language.Dibo=Dibo -controlledvocabulary.language.Dibole=Dibole -controlledvocabulary.language.Dicamay_Agta=Dicamay Agta -controlledvocabulary.language.Didinga=Didinga -controlledvocabulary.language.Dido=Dido -controlledvocabulary.language.Dieri=Dieri -controlledvocabulary.language.Digaro-Mishmi=Digaro-Mishmi -controlledvocabulary.language.Digo=Digo -controlledvocabulary.language.Dii=Dii -controlledvocabulary.language.Dijim-Bwilim=Dijim-Bwilim -controlledvocabulary.language.Dilling=Dilling -controlledvocabulary.language.Dima=Dima -controlledvocabulary.language.Dimasa=Dimasa -controlledvocabulary.language.Dimbong=Dimbong -controlledvocabulary.language.Dime=Dime -controlledvocabulary.language.Dimli_(individual_language)=Dimli (individual language) -controlledvocabulary.language.Ding=Ding -controlledvocabulary.language.Dinka=Dinka -controlledvocabulary.language.Dir-Nyamzak-Mbarimi=Dir-Nyamzak-Mbarimi -controlledvocabulary.language.Dirasha=Dirasha -controlledvocabulary.language.Diri=Diri -controlledvocabulary.language.Diriku=Diriku -controlledvocabulary.language.Dirim=Dirim -controlledvocabulary.language.Disa=Disa -controlledvocabulary.language.Ditammari=Ditammari -controlledvocabulary.language.Ditidaht=Ditidaht -controlledvocabulary.language.Diuwe=Diuwe -controlledvocabulary.language.Diuxi-Tilantongo_Mixtec=Diuxi-Tilantongo Mixtec -controlledvocabulary.language.Dixon_Reef=Dixon Reef -controlledvocabulary.language.Dizin=Dizin -controlledvocabulary.language.Djabugay=Djabugay -controlledvocabulary.language.Djabwurrung=Djabwurrung -controlledvocabulary.language.Djadjawurrung=Djadjawurrung -controlledvocabulary.language.Djambarrpuyngu=Djambarrpuyngu -controlledvocabulary.language.Djamindjung=Djamindjung -controlledvocabulary.language.Djangun=Djangun -controlledvocabulary.language.Djawi=Djawi -controlledvocabulary.language.Djeebbana=Djeebbana -controlledvocabulary.language.Djimini_Senoufo=Djimini Senoufo -controlledvocabulary.language.Djinang=Djinang -controlledvocabulary.language.Djinba=Djinba -controlledvocabulary.language.Djiwarli=Djiwarli -controlledvocabulary.language.Dobel=Dobel -controlledvocabulary.language.Dobu=Dobu -controlledvocabulary.language.Doe=Doe -controlledvocabulary.language.Doga=Doga -controlledvocabulary.language.Doghoro=Doghoro -controlledvocabulary.language.Dogoso=Dogoso -controlledvocabulary.language.Dogos�=Dogos� -controlledvocabulary.language.Dogri_(individual_language)=Dogri (individual language) -controlledvocabulary.language.Dogri_(macrolanguage)=Dogri (macrolanguage) -controlledvocabulary.language.Dogul_Dom_Dogon=Dogul Dom Dogon -controlledvocabulary.language.Doka=Doka -controlledvocabulary.language.Doko-Uyanga=Doko-Uyanga -controlledvocabulary.language.Dokshi=Dokshi -controlledvocabulary.language.Dolgan=Dolgan -controlledvocabulary.language.Dolpo=Dolpo -controlledvocabulary.language.Dom=Dom -controlledvocabulary.language.Domaaki=Domaaki -controlledvocabulary.language.Domari=Domari -controlledvocabulary.language.Dombe=Dombe -controlledvocabulary.language.Dominican_Sign_Language=Dominican Sign Language -controlledvocabulary.language.Dompo=Dompo -controlledvocabulary.language.Domu=Domu -controlledvocabulary.language.Domung=Domung -controlledvocabulary.language.Dondo=Dondo -controlledvocabulary.language.Dong=Dong -controlledvocabulary.language.Dongo=Dongo -controlledvocabulary.language.Dongotono=Dongotono -controlledvocabulary.language.Dongshanba_Lalo=Dongshanba Lalo -controlledvocabulary.language.Dongxiang=Dongxiang -controlledvocabulary.language.Donno_So_Dogon=Donno So Dogon -controlledvocabulary.language.Doondo=Doondo -controlledvocabulary.language.Dori'o=Dori'o -controlledvocabulary.language.Doromu-Koki=Doromu-Koki -controlledvocabulary.language.Dorze=Dorze -controlledvocabulary.language.Doso=Doso -controlledvocabulary.language.Dotyali=Dotyali -controlledvocabulary.language.Doutai=Doutai -controlledvocabulary.language.Doyayo=Doyayo -controlledvocabulary.language.Drents=Drents -controlledvocabulary.language.Drung=Drung -controlledvocabulary.language.Duala=Duala -controlledvocabulary.language.Duano=Duano -controlledvocabulary.language.Duau=Duau -controlledvocabulary.language.Dubli=Dubli -controlledvocabulary.language.Dubu=Dubu -controlledvocabulary.language.Dugun=Dugun -controlledvocabulary.language.Duguri=Duguri -controlledvocabulary.language.Dugwor=Dugwor -controlledvocabulary.language.Duhwa=Duhwa -controlledvocabulary.language.Duke=Duke -controlledvocabulary.language.Dulbu=Dulbu -controlledvocabulary.language.Duli-Gey=Duli-Gey -controlledvocabulary.language.Duma=Duma -controlledvocabulary.language.Dumbea=Dumbea -controlledvocabulary.language.Dumi=Dumi -controlledvocabulary.language.Dumpas=Dumpas -controlledvocabulary.language.Dumun=Dumun -controlledvocabulary.language.Duna=Duna -controlledvocabulary.language.Dungan=Dungan -controlledvocabulary.language.Dungmali=Dungmali -controlledvocabulary.language.Dungra_Bhil=Dungra Bhil -controlledvocabulary.language.Dungu=Dungu -controlledvocabulary.language.Dupaninan_Agta=Dupaninan Agta -controlledvocabulary.language.Dura=Dura -controlledvocabulary.language.Duri=Duri -controlledvocabulary.language.Duriankere=Duriankere -controlledvocabulary.language.Durop=Durop -controlledvocabulary.language.Duruma=Duruma -controlledvocabulary.language.Duruwa=Duruwa -controlledvocabulary.language.Dusner=Dusner -controlledvocabulary.language.Dusun_Deyah=Dusun Deyah -controlledvocabulary.language.Dusun_Malang=Dusun Malang -controlledvocabulary.language.Dusun_Witu=Dusun Witu -controlledvocabulary.language.Dutch=Dutch -controlledvocabulary.language.Dutch_Sign_Language=Dutch Sign Language -controlledvocabulary.language.Dutton_World_Speedwords=Dutton World Speedwords -controlledvocabulary.language.Duungooma=Duungooma -controlledvocabulary.language.Duupa=Duupa -controlledvocabulary.language.Duvle=Duvle -controlledvocabulary.language.Duwai=Duwai -controlledvocabulary.language.Duwet=Duwet -controlledvocabulary.language.Duya=Du?ya -controlledvocabulary.language.Dwang=Dwang -controlledvocabulary.language.Dyaberdyaber=Dyaberdyaber -controlledvocabulary.language.Dyan=Dyan -controlledvocabulary.language.Dyangadi=Dyangadi -controlledvocabulary.language.Dyarim=Dyarim -controlledvocabulary.language.Dyirbal=Dyirbal -controlledvocabulary.language.Dyugun=Dyugun -controlledvocabulary.language.Dyula=Dyula -controlledvocabulary.language.Dza=Dza -controlledvocabulary.language.Dzalakha=Dzalakha -controlledvocabulary.language.Dzando=Dzando -controlledvocabulary.language.Dzao_Min=Dzao Min -controlledvocabulary.language.Dzongkha=Dzongkha -controlledvocabulary.language.Dz��ngoo=Dz��ngoo -controlledvocabulary.language.D�w=D�w -controlledvocabulary.language.E=E -controlledvocabulary.language.E'ma_Buyang=E'ma Buyang -controlledvocabulary.language.E'�apa_Woromaipu=E'�apa Woromaipu -controlledvocabulary.language.Early_Tripuri=Early Tripuri -controlledvocabulary.language.East_Ambae=East Ambae -controlledvocabulary.language.East_Berawan=East Berawan -controlledvocabulary.language.East_Damar=East Damar -controlledvocabulary.language.East_Futuna=East Futuna -controlledvocabulary.language.East_Kewa=East Kewa -controlledvocabulary.language.East_Limba=East Limba -controlledvocabulary.language.East_Makian=East Makian -controlledvocabulary.language.East_Masela=East Masela -controlledvocabulary.language.East_Nyala=East Nyala -controlledvocabulary.language.East_Tarangan=East Tarangan -controlledvocabulary.language.East_Yugur=East Yugur -controlledvocabulary.language.Eastern_Abnaki=Eastern Abnaki -controlledvocabulary.language.Eastern_Acipa=Eastern Acipa -controlledvocabulary.language.Eastern_Apur�mac_Quechua=Eastern Apur�mac Quechua -controlledvocabulary.language.Eastern_Arrernte=Eastern Arrernte -controlledvocabulary.language.Eastern_Balochi=Eastern Balochi -controlledvocabulary.language.Eastern_Bolivian_Guaran�=Eastern Bolivian Guaran� -controlledvocabulary.language.Eastern_Bontok=Eastern Bontok -controlledvocabulary.language.Eastern_Bru=Eastern Bru -controlledvocabulary.language.Eastern_Canadian_Inuktitut=Eastern Canadian Inuktitut -controlledvocabulary.language.Eastern_Cham=Eastern Cham -controlledvocabulary.language.Eastern_Durango_Nahuatl=Eastern Durango Nahuatl -controlledvocabulary.language.Eastern_Egyptian_Bedawi_Arabic=Eastern Egyptian Bedawi Arabic -controlledvocabulary.language.Eastern_Frisian=Eastern Frisian -controlledvocabulary.language.Eastern_Gorkha_Tamang=Eastern Gorkha Tamang -controlledvocabulary.language.Eastern_Highland_Chatino=Eastern Highland Chatino -controlledvocabulary.language.Eastern_Highland_Otomi=Eastern Highland Otomi -controlledvocabulary.language.Eastern_Hongshuihe_Zhuang=Eastern Hongshuihe Zhuang -controlledvocabulary.language.Eastern_Huasteca_Nahuatl=Eastern Huasteca Nahuatl -controlledvocabulary.language.Eastern_Huishui_Hmong=Eastern Huishui Hmong -controlledvocabulary.language.Eastern_Karaboro=Eastern Karaboro -controlledvocabulary.language.Eastern_Katu=Eastern Katu -controlledvocabulary.language.Eastern_Kayah=Eastern Kayah -controlledvocabulary.language.Eastern_Keres=Eastern Keres -controlledvocabulary.language.Eastern_Khumi_Chin=Eastern Khumi Chin -controlledvocabulary.language.Eastern_Krahn=Eastern Krahn -controlledvocabulary.language.Eastern_Lalu=Eastern Lalu -controlledvocabulary.language.Eastern_Lawa=Eastern Lawa -controlledvocabulary.language.Eastern_Magar=Eastern Magar -controlledvocabulary.language.Eastern_Maninkakan=Eastern Maninkakan -controlledvocabulary.language.Eastern_Mari=Eastern Mari -controlledvocabulary.language.Eastern_Maroon_Creole=Eastern Maroon Creole -controlledvocabulary.language.Eastern_Meohang=Eastern Meohang -controlledvocabulary.language.Eastern_Minyag=Eastern Minyag -controlledvocabulary.language.Eastern_Mnong=Eastern Mnong -controlledvocabulary.language.Eastern_Muria=Eastern Muria -controlledvocabulary.language.Eastern_Ngad'a=Eastern Ngad'a -controlledvocabulary.language.Eastern_Nisu=Eastern Nisu -controlledvocabulary.language.Eastern_Ojibwa=Eastern Ojibwa -controlledvocabulary.language.Eastern_Oromo=Eastern Oromo -controlledvocabulary.language.Eastern_Parbate_Kham=Eastern Parbate Kham -controlledvocabulary.language.Eastern_Penan=Eastern Penan -controlledvocabulary.language.Eastern_Pomo=Eastern Pomo -controlledvocabulary.language.Eastern_Qiandong_Miao=Eastern Qiandong Miao -controlledvocabulary.language.Eastern_Subanen=Eastern Subanen -controlledvocabulary.language.Eastern_Tamang=Eastern Tamang -controlledvocabulary.language.Eastern_Tawbuid=Eastern Tawbuid -controlledvocabulary.language.Eastern_Xiangxi_Miao=Eastern Xiangxi Miao -controlledvocabulary.language.Eastern_Xwla_Gbe=Eastern Xwla Gbe -controlledvocabulary.language.Eastern_Yiddish=Eastern Yiddish -controlledvocabulary.language.Ebira=Ebira -controlledvocabulary.language.Eblan=Eblan -controlledvocabulary.language.Ebri�=Ebri� -controlledvocabulary.language.Ebughu=Ebughu -controlledvocabulary.language.Ecuadorian_Sign_Language=Ecuadorian Sign Language -controlledvocabulary.language.Ede_Cabe=Ede Cabe -controlledvocabulary.language.Ede_Ica=Ede Ica -controlledvocabulary.language.Ede_Idaca=Ede Idaca -controlledvocabulary.language.Ede_Ije=Ede Ije -controlledvocabulary.language.Edera_Awyu=Edera Awyu -controlledvocabulary.language.Edolo=Edolo -controlledvocabulary.language.Edomite=Edomite -controlledvocabulary.language.Edopi=Edopi -controlledvocabulary.language.Efai=Efai -controlledvocabulary.language.Efe=Efe -controlledvocabulary.language.Efik=Efik -controlledvocabulary.language.Efutop=Efutop -controlledvocabulary.language.Ega=Ega -controlledvocabulary.language.Eggon=Eggon -controlledvocabulary.language.Egypt_Sign_Language=Egypt Sign Language -controlledvocabulary.language.Egyptian_(Ancient)=Egyptian (Ancient) -controlledvocabulary.language.Egyptian_Arabic=Egyptian Arabic -controlledvocabulary.language.Ehueun=Ehueun -controlledvocabulary.language.Eipomek=Eipomek -controlledvocabulary.language.Eitiep=Eitiep -controlledvocabulary.language.Ejagham=Ejagham -controlledvocabulary.language.Ejamat=Ejamat -controlledvocabulary.language.Ekai_Chin=Ekai Chin -controlledvocabulary.language.Ekajuk=Ekajuk -controlledvocabulary.language.Ekari=Ekari -controlledvocabulary.language.Eki=Eki -controlledvocabulary.language.Ekit=Ekit -controlledvocabulary.language.Ekpeye=Ekpeye -controlledvocabulary.language.El_Alto_Zapotec=El Alto Zapotec -controlledvocabulary.language.El_Hugeirat=El Hugeirat -controlledvocabulary.language.El_Molo=El Molo -controlledvocabulary.language.El_Nayar_Cora=El Nayar Cora -controlledvocabulary.language.Elamite=Elamite -controlledvocabulary.language.Eleme=Eleme -controlledvocabulary.language.Elepi=Elepi -controlledvocabulary.language.Elfdalian=Elfdalian -controlledvocabulary.language.Elip=Elip -controlledvocabulary.language.Elkei=Elkei -controlledvocabulary.language.Elotepec_Zapotec=Elotepec Zapotec -controlledvocabulary.language.Eloyi=Eloyi -controlledvocabulary.language.Elseng=Elseng -controlledvocabulary.language.Elu=Elu -controlledvocabulary.language.Elymian=Elymian -controlledvocabulary.language.Emae=Emae -controlledvocabulary.language.Emai-Iuleha-Ora=Emai-Iuleha-Ora -controlledvocabulary.language.Eman=Eman -controlledvocabulary.language.Embaloh=Embaloh -controlledvocabulary.language.Ember�-Baud�=Ember�-Baud� -controlledvocabulary.language.Ember�-Cat�o=Ember�-Cat�o -controlledvocabulary.language.Ember�-Cham�=Ember�-Cham� -controlledvocabulary.language.Ember�-Tad�=Ember�-Tad� -controlledvocabulary.language.Embu=Embu -controlledvocabulary.language.Emerillon=Emerillon -controlledvocabulary.language.Emilian=Emilian -controlledvocabulary.language.Emplawas=Emplawas -controlledvocabulary.language.Emumu=Emumu -controlledvocabulary.language.En=En -controlledvocabulary.language.Enawen�-Naw�=Enawen�-Naw� -controlledvocabulary.language.Ende=Ende -controlledvocabulary.language.Enga=Enga -controlledvocabulary.language.Engdewu=Engdewu -controlledvocabulary.language.Engenni=Engenni -controlledvocabulary.language.Enggano=Enggano -controlledvocabulary.language.English=English -controlledvocabulary.language.Enlhet=Enlhet -controlledvocabulary.language.Enrekang=Enrekang -controlledvocabulary.language.Enu=Enu -controlledvocabulary.language.Enwan_(Akwa_Ibom_State)=Enwan (Akwa Ibom State) -controlledvocabulary.language.Enwan_(Edo_State)=Enwan (Edo State) -controlledvocabulary.language.Enxet=Enxet -controlledvocabulary.language.Enya=Enya -controlledvocabulary.language.Epena=Epena -controlledvocabulary.language.Epi-Olmec=Epi-Olmec -controlledvocabulary.language.Epie=Epie -controlledvocabulary.language.Epigraphic_Mayan=Epigraphic Mayan -controlledvocabulary.language.Eravallan=Eravallan -controlledvocabulary.language.Erave=Erave -controlledvocabulary.language.Ere=Ere -controlledvocabulary.language.Eritai=Eritai -controlledvocabulary.language.Erokwanas=Erokwanas -controlledvocabulary.language.Erre=Erre -controlledvocabulary.language.Erromintxela=Erromintxela -controlledvocabulary.language.Ersu=Ersu -controlledvocabulary.language.Eruwa=Eruwa -controlledvocabulary.language.Erzya=Erzya -controlledvocabulary.language.Esan=Esan -controlledvocabulary.language.Ese=Ese -controlledvocabulary.language.Ese_Ejja=Ese Ejja -controlledvocabulary.language.Eshtehardi=Eshtehardi -controlledvocabulary.language.Esimbi=Esimbi -controlledvocabulary.language.Eskayan=Eskayan -controlledvocabulary.language.Esperanto=Esperanto -controlledvocabulary.language.Esselen=Esselen -controlledvocabulary.language.Estado_de_M�xico_Otomi=Estado de M�xico Otomi -controlledvocabulary.language.Estonian=Estonian -controlledvocabulary.language.Estonian_Sign_Language=Estonian Sign Language -controlledvocabulary.language.Esuma=Esuma -controlledvocabulary.language.Etchemin=Etchemin -controlledvocabulary.language.Etebi=Etebi -controlledvocabulary.language.Eten=Eten -controlledvocabulary.language.Eteocretan=Eteocretan -controlledvocabulary.language.Eteocypriot=Eteocypriot -controlledvocabulary.language.Ethiopian_Sign_Language=Ethiopian Sign Language -controlledvocabulary.language.Etkywan=Etkywan -controlledvocabulary.language.Eton_(Cameroon)=Eton (Cameroon) -controlledvocabulary.language.Eton_(Vanuatu)=Eton (Vanuatu) -controlledvocabulary.language.Etruscan=Etruscan -controlledvocabulary.language.Etulo=Etulo -controlledvocabulary.language.Eudeve=Eudeve -controlledvocabulary.language.Evant=Evant -controlledvocabulary.language.Even=Even -controlledvocabulary.language.Evenki=Evenki -controlledvocabulary.language.Eviya=Eviya -controlledvocabulary.language.Ewage-Notu=Ewage-Notu -controlledvocabulary.language.Ewe=Ewe -controlledvocabulary.language.Ewondo=Ewondo -controlledvocabulary.language.Extremaduran=Extremaduran -controlledvocabulary.language.Eyak=Eyak -controlledvocabulary.language.Ezaa=Ezaa -controlledvocabulary.language.Fa_d'Ambu=Fa d'Ambu -controlledvocabulary.language.Fagani=Fagani -controlledvocabulary.language.Faifi=Faifi -controlledvocabulary.language.Faire_Atta=Faire Atta -controlledvocabulary.language.Faita=Faita -controlledvocabulary.language.Faiwol=Faiwol -controlledvocabulary.language.Fala=Fala -controlledvocabulary.language.Falam_Chin=Falam Chin -controlledvocabulary.language.Fali=Fali -controlledvocabulary.language.Faliscan=Faliscan -controlledvocabulary.language.Fam=Fam -controlledvocabulary.language.Fanagalo=Fanagalo -controlledvocabulary.language.Fanamaket=Fanamaket -controlledvocabulary.language.Fanbak=Fanbak -controlledvocabulary.language.Fang_(Cameroon)=Fang (Cameroon) -controlledvocabulary.language.Fang_(Equatorial_Guinea)=Fang (Equatorial Guinea) -controlledvocabulary.language.Fania=Fania -controlledvocabulary.language.Fanti=Fanti -controlledvocabulary.language.Far_Western_Muria=Far Western Muria -controlledvocabulary.language.Farefare=Farefare -controlledvocabulary.language.Faroese=Faroese -controlledvocabulary.language.Fas=Fas -controlledvocabulary.language.Fasu=Fasu -controlledvocabulary.language.Fataleka=Fataleka -controlledvocabulary.language.Fataluku=Fataluku -controlledvocabulary.language.Fayu=Fayu -controlledvocabulary.language.Fe'fe'=Fe'fe' -controlledvocabulary.language.Fembe=Fembe -controlledvocabulary.language.Fernando_Po_Creole_English=Fernando Po Creole English -controlledvocabulary.language.Feroge=Feroge -controlledvocabulary.language.Fiji_Hindi=Fiji Hindi -controlledvocabulary.language.Fijian=Fijian -controlledvocabulary.language.Filipino=Filipino -controlledvocabulary.language.Filomena_Mata-Coahuitl�n_Totonac=Filomena Mata-Coahuitl�n Totonac -controlledvocabulary.language.Finland-Swedish_Sign_Language=Finland-Swedish Sign Language -controlledvocabulary.language.Finnish=Finnish -controlledvocabulary.language.Finnish_Sign_Language=Finnish Sign Language -controlledvocabulary.language.Finongan=Finongan -controlledvocabulary.language.Fipa=Fipa -controlledvocabulary.language.Firan=Firan -controlledvocabulary.language.Fiwaga=Fiwaga -controlledvocabulary.language.Flaaitaal=Flaaitaal -controlledvocabulary.language.Flinders_Island=Flinders Island -controlledvocabulary.language.Foau=Foau -controlledvocabulary.language.Foi=Foi -controlledvocabulary.language.Foia_Foia=Foia Foia -controlledvocabulary.language.Folopa=Folopa -controlledvocabulary.language.Foma=Foma -controlledvocabulary.language.Fon=Fon -controlledvocabulary.language.Fongoro=Fongoro -controlledvocabulary.language.Foodo=Foodo -controlledvocabulary.language.Forak=Forak -controlledvocabulary.language.Fordata=Fordata -controlledvocabulary.language.Fore=Fore -controlledvocabulary.language.Forest_Enets=Forest Enets -controlledvocabulary.language.Fortsenal=Fortsenal -controlledvocabulary.language.Francisco_Le�n_Zoque=Francisco Le�n Zoque -controlledvocabulary.language.Frankish=Frankish -controlledvocabulary.language.French=French -controlledvocabulary.language.French_Sign_Language=French Sign Language -controlledvocabulary.language.Friulian=Friulian -controlledvocabulary.language.Fula,_Fulah=Fula, Fulah -controlledvocabulary.language.Fuliiru=Fuliiru -controlledvocabulary.language.Fulni�=Fulni� -controlledvocabulary.language.Fum=Fum -controlledvocabulary.language.Fungwa=Fungwa -controlledvocabulary.language.Fur=Fur -controlledvocabulary.language.Furu=Furu -controlledvocabulary.language.Futuna-Aniwa=Futuna-Aniwa -controlledvocabulary.language.Fuyug=Fuyug -controlledvocabulary.language.Fwe=Fwe -controlledvocabulary.language.Fw�i=Fw�i -controlledvocabulary.language.Fyam=Fyam -controlledvocabulary.language.Fyer=Fyer -controlledvocabulary.language.Ga=Ga -controlledvocabulary.language.Ga'anda=Ga'anda -controlledvocabulary.language.Ga'dang=Ga'dang -controlledvocabulary.language.Gaa=Gaa -controlledvocabulary.language.Gaam=Gaam -controlledvocabulary.language.Gabi-Gabi=Gabi-Gabi -controlledvocabulary.language.Gabri=Gabri -controlledvocabulary.language.Gabrielino-Fernande�o=Gabrielino-Fernande�o -controlledvocabulary.language.Gadang=Gadang -controlledvocabulary.language.Gaddang=Gaddang -controlledvocabulary.language.Gaddi=Gaddi -controlledvocabulary.language.Gade=Gade -controlledvocabulary.language.Gade_Lohar=Gade Lohar -controlledvocabulary.language.Gadjerawang=Gadjerawang -controlledvocabulary.language.Gadsup=Gadsup -controlledvocabulary.language.Gaelic,_Scottish_Gaelic=Gaelic, Scottish Gaelic -controlledvocabulary.language.Gafat=Gafat -controlledvocabulary.language.Gagadu=Gagadu -controlledvocabulary.language.Gagauz=Gagauz -controlledvocabulary.language.Gagnoa_B�t�=Gagnoa B�t� -controlledvocabulary.language.Gagu=Gagu -controlledvocabulary.language.Gahri=Gahri -controlledvocabulary.language.Gaikundi=Gaikundi -controlledvocabulary.language.Gail=Gail -controlledvocabulary.language.Gaina=Gaina -controlledvocabulary.language.Gal=Gal -controlledvocabulary.language.Galambu=Galambu -controlledvocabulary.language.Galatian=Galatian -controlledvocabulary.language.Galela=Galela -controlledvocabulary.language.Galeya=Galeya -controlledvocabulary.language.Galibi_Carib=Galibi Carib -controlledvocabulary.language.Galice=Galice -controlledvocabulary.language.Galician=Galician -controlledvocabulary.language.Galindan=Galindan -controlledvocabulary.language.Gallurese_Sardinian=Gallurese Sardinian -controlledvocabulary.language.Galo=Galo -controlledvocabulary.language.Galolen=Galolen -controlledvocabulary.language.Gamale_Kham=Gamale Kham -controlledvocabulary.language.Gambera=Gambera -controlledvocabulary.language.Gambian_Wolof=Gambian Wolof -controlledvocabulary.language.Gamilaraay=Gamilaraay -controlledvocabulary.language.Gamit=Gamit -controlledvocabulary.language.Gamkonora=Gamkonora -controlledvocabulary.language.Gamo=Gamo -controlledvocabulary.language.Gamo-Ningi=Gamo-Ningi -controlledvocabulary.language.Gan_Chinese=Gan Chinese -controlledvocabulary.language.Gana=Gana -controlledvocabulary.language.Ganang=Ganang -controlledvocabulary.language.Ganda=Ganda -controlledvocabulary.language.Gane=Gane -controlledvocabulary.language.Ganggalida=Ganggalida -controlledvocabulary.language.Ganglau=Ganglau -controlledvocabulary.language.Gangte=Gangte -controlledvocabulary.language.Gangulu=Gangulu -controlledvocabulary.language.Gants=Gants -controlledvocabulary.language.Ganza=Ganza -controlledvocabulary.language.Ganzi=Ganzi -controlledvocabulary.language.Gao=Gao -controlledvocabulary.language.Gapapaiwa=Gapapaiwa -controlledvocabulary.language.Garhwali=Garhwali -controlledvocabulary.language.Garifuna=Garifuna -controlledvocabulary.language.Garig-Ilgar=Garig-Ilgar -controlledvocabulary.language.Garingbal=Garingbal -controlledvocabulary.language.Garlali=Garlali -controlledvocabulary.language.Garo=Garo -controlledvocabulary.language.Garre=Garre -controlledvocabulary.language.Garrwa=Garrwa -controlledvocabulary.language.Garus=Garus -controlledvocabulary.language.Garza=Garza -controlledvocabulary.language.Gata'=Gata' -controlledvocabulary.language.Gavak=Gavak -controlledvocabulary.language.Gavar=Gavar -controlledvocabulary.language.Gavi�o_Do_Jiparan�=Gavi�o Do Jiparan� -controlledvocabulary.language.Gawar-Bati=Gawar-Bati -controlledvocabulary.language.Gawri=Gawri -controlledvocabulary.language.Gawwada=Gawwada -controlledvocabulary.language.Gayil=Gayil -controlledvocabulary.language.Gayo=Gayo -controlledvocabulary.language.Gazi=Gazi -controlledvocabulary.language.Gaogbo=Ga?ogbo -controlledvocabulary.language.Gbagyi=Gbagyi -controlledvocabulary.language.Gbanu=Gbanu -controlledvocabulary.language.Gbanziri=Gbanziri -controlledvocabulary.language.Gbari=Gbari -controlledvocabulary.language.Gbaya_(Central_African_Republic)=Gbaya (Central African Republic) -controlledvocabulary.language.Gbaya_(Sudan)=Gbaya (Sudan) -controlledvocabulary.language.Gbaya-Bossangoa=Gbaya-Bossangoa -controlledvocabulary.language.Gbaya-Bozoum=Gbaya-Bozoum -controlledvocabulary.language.Gbaya-Mbodomo=Gbaya-Mbodomo -controlledvocabulary.language.Gbayi=Gbayi -controlledvocabulary.language.Gbesi_Gbe=Gbesi Gbe -controlledvocabulary.language.Gbii=Gbii -controlledvocabulary.language.Gbin=Gbin -controlledvocabulary.language.Gbiri-Niragu=Gbiri-Niragu -controlledvocabulary.language.Gboloo_Grebo=Gboloo Grebo -controlledvocabulary.language.Ge=Ge -controlledvocabulary.language.Geba_Karen=Geba Karen -controlledvocabulary.language.Gebe=Gebe -controlledvocabulary.language.Gedaged=Gedaged -controlledvocabulary.language.Gedeo=Gedeo -controlledvocabulary.language.Geez=Geez -controlledvocabulary.language.Geji=Geji -controlledvocabulary.language.Geko_Karen=Geko Karen -controlledvocabulary.language.Gela=Gela -controlledvocabulary.language.Geme=Geme -controlledvocabulary.language.Gen=Gen -controlledvocabulary.language.Gende=Gende -controlledvocabulary.language.Gengle=Gengle -controlledvocabulary.language.Georgian=Georgian -controlledvocabulary.language.Gepo=Gepo -controlledvocabulary.language.Gera=Gera -controlledvocabulary.language.Gerai=Gerai -controlledvocabulary.language.German=German -controlledvocabulary.language.German_Sign_Language=German Sign Language -controlledvocabulary.language.Geruma=Geruma -controlledvocabulary.language.Geser-Gorom=Geser-Gorom -controlledvocabulary.language.Ghadam�s=Ghadam�s -controlledvocabulary.language.Ghanaian_Pidgin_English=Ghanaian Pidgin English -controlledvocabulary.language.Ghanaian_Sign_Language=Ghanaian Sign Language -controlledvocabulary.language.Ghandruk_Sign_Language=Ghandruk Sign Language -controlledvocabulary.language.Ghanongga=Ghanongga -controlledvocabulary.language.Ghari=Ghari -controlledvocabulary.language.Ghayavi=Ghayavi -controlledvocabulary.language.Gheg_Albanian=Gheg Albanian -controlledvocabulary.language.Ghera=Ghera -controlledvocabulary.language.Ghodoberi=Ghodoberi -controlledvocabulary.language.Ghomara=Ghomara -controlledvocabulary.language.Ghom�l�'=Ghom�l�' -controlledvocabulary.language.Ghotuo=Ghotuo -controlledvocabulary.language.Ghulfan=Ghulfan -controlledvocabulary.language.Giangan=Giangan -controlledvocabulary.language.Gibanawa=Gibanawa -controlledvocabulary.language.Gidar=Gidar -controlledvocabulary.language.Giiwo=Giiwo -controlledvocabulary.language.Gikyode=Gikyode -controlledvocabulary.language.Gilaki=Gilaki -controlledvocabulary.language.Gilbertese=Gilbertese -controlledvocabulary.language.Gilima=Gilima -controlledvocabulary.language.Gilyak=Gilyak -controlledvocabulary.language.Gimi_(Eastern_Highlands)=Gimi (Eastern Highlands) -controlledvocabulary.language.Gimi_(West_New_Britain)=Gimi (West New Britain) -controlledvocabulary.language.Gimme=Gimme -controlledvocabulary.language.Gimnime=Gimnime -controlledvocabulary.language.Ginuman=Ginuman -controlledvocabulary.language.Ginyanga=Ginyanga -controlledvocabulary.language.Girawa=Girawa -controlledvocabulary.language.Girirra=Girirra -controlledvocabulary.language.Giryama=Giryama -controlledvocabulary.language.Githabul=Githabul -controlledvocabulary.language.Gitonga=Gitonga -controlledvocabulary.language.Gitua=Gitua -controlledvocabulary.language.Gitxsan=Gitxsan -controlledvocabulary.language.Giyug=Giyug -controlledvocabulary.language.Gizrra=Gizrra -controlledvocabulary.language.Glaro-Twabo=Glaro-Twabo -controlledvocabulary.language.Glavda=Glavda -controlledvocabulary.language.Glio-Oubi=Glio-Oubi -controlledvocabulary.language.Gnau=Gnau -controlledvocabulary.language.Goan_Konkani=Goan Konkani -controlledvocabulary.language.Goaria=Goaria -controlledvocabulary.language.Gobasi=Gobasi -controlledvocabulary.language.Gobu=Gobu -controlledvocabulary.language.Godi�=Godi� -controlledvocabulary.language.Godwari=Godwari -controlledvocabulary.language.Goemai=Goemai -controlledvocabulary.language.Gofa=Gofa -controlledvocabulary.language.Gogo=Gogo -controlledvocabulary.language.Gogodala=Gogodala -controlledvocabulary.language.Gokana=Gokana -controlledvocabulary.language.Gola=Gola -controlledvocabulary.language.Golin=Golin -controlledvocabulary.language.Golpa=Golpa -controlledvocabulary.language.Gondi=Gondi -controlledvocabulary.language.Gone_Dau=Gone Dau -controlledvocabulary.language.Gongduk=Gongduk -controlledvocabulary.language.Gonja=Gonja -controlledvocabulary.language.Goo=Goo -controlledvocabulary.language.Gooniyandi=Gooniyandi -controlledvocabulary.language.Gor=Gor -controlledvocabulary.language.Gorakor=Gorakor -controlledvocabulary.language.Gorap=Gorap -controlledvocabulary.language.Goreng=Goreng -controlledvocabulary.language.Gorontalo=Gorontalo -controlledvocabulary.language.Gorovu=Gorovu -controlledvocabulary.language.Gorowa=Gorowa -controlledvocabulary.language.Gothic=Gothic -controlledvocabulary.language.Goundo=Goundo -controlledvocabulary.language.Gourmanch�ma=Gourmanch�ma -controlledvocabulary.language.Gowlan=Gowlan -controlledvocabulary.language.Gowli=Gowli -controlledvocabulary.language.Gowro=Gowro -controlledvocabulary.language.Gozarkhani=Gozarkhani -controlledvocabulary.language.Grangali=Grangali -controlledvocabulary.language.Grass_Koiari=Grass Koiari -controlledvocabulary.language.Grebo=Grebo -controlledvocabulary.language.Greek_(modern)=Greek (modern) -controlledvocabulary.language.Greek_Sign_Language=Greek Sign Language -controlledvocabulary.language.Green_Gelao=Green Gelao -controlledvocabulary.language.Greenlandic,_Kalaallisut=Greenlandic, Kalaallisut -controlledvocabulary.language.Grenadian_Creole_English=Grenadian Creole English -controlledvocabulary.language.Gresi=Gresi -controlledvocabulary.language.Groma=Groma -controlledvocabulary.language.Gronings=Gronings -controlledvocabulary.language.Gros_Ventre=Gros Ventre -controlledvocabulary.language.Gua=Gua -controlledvocabulary.language.Guadeloupean_Creole_French=Guadeloupean Creole French -controlledvocabulary.language.Guahibo=Guahibo -controlledvocabulary.language.Guajaj�ra=Guajaj�ra -controlledvocabulary.language.Guaj�=Guaj� -controlledvocabulary.language.Guambiano=Guambiano -controlledvocabulary.language.Guana_(Brazil)=Guana (Brazil) -controlledvocabulary.language.Guana_(Paraguay)=Guana (Paraguay) -controlledvocabulary.language.Guanano=Guanano -controlledvocabulary.language.Guanche=Guanche -controlledvocabulary.language.Guanyinqiao=Guanyinqiao -controlledvocabulary.language.Guaran�=Guaran� -controlledvocabulary.language.Guarayu=Guarayu -controlledvocabulary.language.Guarequena=Guarequena -controlledvocabulary.language.Guatemalan_Sign_Language=Guatemalan Sign Language -controlledvocabulary.language.Guat�=Guat� -controlledvocabulary.language.Guayabero=Guayabero -controlledvocabulary.language.Gudang=Gudang -controlledvocabulary.language.Gudanji=Gudanji -controlledvocabulary.language.Gude=Gude -controlledvocabulary.language.Gudu=Gudu -controlledvocabulary.language.Guduf-Gava=Guduf-Gava -controlledvocabulary.language.Guerrero_Amuzgo=Guerrero Amuzgo -controlledvocabulary.language.Guerrero_Nahuatl=Guerrero Nahuatl -controlledvocabulary.language.Guevea_De_Humboldt_Zapotec=Guevea De Humboldt Zapotec -controlledvocabulary.language.Gugadj=Gugadj -controlledvocabulary.language.Gugu_Badhun=Gugu Badhun -controlledvocabulary.language.Gugu_Warra=Gugu Warra -controlledvocabulary.language.Gugubera=Gugubera -controlledvocabulary.language.Guhu-Samane=Guhu-Samane -controlledvocabulary.language.Guianese_Creole_French=Guianese Creole French -controlledvocabulary.language.Guibei_Zhuang=Guibei Zhuang -controlledvocabulary.language.Guiberoua_B�te=Guiberoua B�te -controlledvocabulary.language.Guibian_Zhuang=Guibian Zhuang -controlledvocabulary.language.Guinea_Kpelle=Guinea Kpelle -controlledvocabulary.language.Guinea-Bissau_Sign_Language=Guinea-Bissau Sign Language -controlledvocabulary.language.Guinean_Sign_Language=Guinean Sign Language -controlledvocabulary.language.Guiqiong=Guiqiong -controlledvocabulary.language.Gujarati=Gujarati -controlledvocabulary.language.Gujari=Gujari -controlledvocabulary.language.Gula_(Central_African_Republic)=Gula (Central African Republic) -controlledvocabulary.language.Gula_(Chad)=Gula (Chad) -controlledvocabulary.language.Gula_Iro=Gula Iro -controlledvocabulary.language.Gula'alaa=Gula'alaa -controlledvocabulary.language.Gulay=Gulay -controlledvocabulary.language.Gule=Gule -controlledvocabulary.language.Gulf_Arabic=Gulf Arabic -controlledvocabulary.language.Gumalu=Gumalu -controlledvocabulary.language.Gumatj=Gumatj -controlledvocabulary.language.Gumawana=Gumawana -controlledvocabulary.language.Gumuz=Gumuz -controlledvocabulary.language.Gun=Gun -controlledvocabulary.language.Gundi=Gundi -controlledvocabulary.language.Gunditjmara=Gunditjmara -controlledvocabulary.language.Gundungurra=Gundungurra -controlledvocabulary.language.Gungabula=Gungabula -controlledvocabulary.language.Gungu=Gungu -controlledvocabulary.language.Guntai=Guntai -controlledvocabulary.language.Gunwinggu=Gunwinggu -controlledvocabulary.language.Gunya=Gunya -controlledvocabulary.language.Gupa-Abawa=Gupa-Abawa -controlledvocabulary.language.Gupapuyngu=Gupapuyngu -controlledvocabulary.language.Guramalum=Guramalum -controlledvocabulary.language.Gurani=Gurani -controlledvocabulary.language.Gurdjar=Gurdjar -controlledvocabulary.language.Gureng_Gureng=Gureng Gureng -controlledvocabulary.language.Gurgula=Gurgula -controlledvocabulary.language.Guriaso=Guriaso -controlledvocabulary.language.Gurindji=Gurindji -controlledvocabulary.language.Gurindji_Kriol=Gurindji Kriol -controlledvocabulary.language.Gurmana=Gurmana -controlledvocabulary.language.Guro=Guro -controlledvocabulary.language.Gurr-goni=Gurr-goni -controlledvocabulary.language.Gurung=Gurung -controlledvocabulary.language.Guruntum-Mbaaru=Guruntum-Mbaaru -controlledvocabulary.language.Gusii=Gusii -controlledvocabulary.language.Gusilay=Gusilay -controlledvocabulary.language.Guugu_Yimidhirr=Guugu Yimidhirr -controlledvocabulary.language.Guwa=Guwa -controlledvocabulary.language.Guwamu=Guwamu -controlledvocabulary.language.Guya=Guya -controlledvocabulary.language.Guyanese_Creole_English=Guyanese Creole English -controlledvocabulary.language.Guyani=Guyani -controlledvocabulary.language.Gvoko=Gvoko -controlledvocabulary.language.Gwa=Gwa -controlledvocabulary.language.Gwahatike=Gwahatike -controlledvocabulary.language.Gwak=Gwak -controlledvocabulary.language.Gwamhi-Wuri=Gwamhi-Wuri -controlledvocabulary.language.Gwandara=Gwandara -controlledvocabulary.language.Gweda=Gweda -controlledvocabulary.language.Gweno=Gweno -controlledvocabulary.language.Gwere=Gwere -controlledvocabulary.language.Gwichin=Gwich?in -controlledvocabulary.language.Gyalsumdo=Gyalsumdo -controlledvocabulary.language.Gyele=Gyele -controlledvocabulary.language.Gyem=Gyem -controlledvocabulary.language.G�il�_Zapotec=G�il� Zapotec -controlledvocabulary.language.Gndhr=G?ndh?r? -controlledvocabulary.language.Ha=Ha -controlledvocabulary.language.Habu=Habu -controlledvocabulary.language.Hadiyya=Hadiyya -controlledvocabulary.language.Hadothi=Hadothi -controlledvocabulary.language.Hadrami=Hadrami -controlledvocabulary.language.Hadrami_Arabic=Hadrami Arabic -controlledvocabulary.language.Hadza=Hadza -controlledvocabulary.language.Haeke=Haeke -controlledvocabulary.language.Hahon=Hahon -controlledvocabulary.language.Haida=Haida -controlledvocabulary.language.Haigwai=Haigwai -controlledvocabulary.language.Haiphong_Sign_Language=Haiphong Sign Language -controlledvocabulary.language.Haisla=Haisla -controlledvocabulary.language.Haitian_Creole,_Haitian=Haitian Creole, Haitian -controlledvocabulary.language.Haitian_Vodoun_Culture_Language=Haitian Vodoun Culture Language -controlledvocabulary.language.Haiom=Hai?om -controlledvocabulary.language.Haji=Haji -controlledvocabulary.language.Hajong=Hajong -controlledvocabulary.language.Hakha_Chin=Hakha Chin -controlledvocabulary.language.Hakka_Chinese=Hakka Chinese -controlledvocabulary.language.Hak�=Hak� -controlledvocabulary.language.Halang=Halang -controlledvocabulary.language.Halang_Doan=Halang Doan -controlledvocabulary.language.Halbi=Halbi -controlledvocabulary.language.Halh_Mongolian=Halh Mongolian -controlledvocabulary.language.Halia=Halia -controlledvocabulary.language.Halkomelem=Halkomelem -controlledvocabulary.language.Hamap=Hamap -controlledvocabulary.language.Hamba=Hamba -controlledvocabulary.language.Hamer-Banna=Hamer-Banna -controlledvocabulary.language.Hamtai=Hamtai -controlledvocabulary.language.Han=Han -controlledvocabulary.language.Hanga=Hanga -controlledvocabulary.language.Hanga_Hundi=Hanga Hundi -controlledvocabulary.language.Hangaza=Hangaza -controlledvocabulary.language.Hani=Hani -controlledvocabulary.language.Hano=Hano -controlledvocabulary.language.Hanoi_Sign_Language=Hanoi Sign Language -controlledvocabulary.language.Hanunoo=Hanunoo -controlledvocabulary.language.Harami=Harami -controlledvocabulary.language.Harari=Harari -controlledvocabulary.language.Harijan_Kinnauri=Harijan Kinnauri -controlledvocabulary.language.Haroi=Haroi -controlledvocabulary.language.Harsusi=Harsusi -controlledvocabulary.language.Haruai=Haruai -controlledvocabulary.language.Haruku=Haruku -controlledvocabulary.language.Haryanvi=Haryanvi -controlledvocabulary.language.Harzani=Harzani -controlledvocabulary.language.Hasha=Hasha -controlledvocabulary.language.Hassaniyya=Hassaniyya -controlledvocabulary.language.Hatam=Hatam -controlledvocabulary.language.Hattic=Hattic -controlledvocabulary.language.Hausa=Hausa -controlledvocabulary.language.Hausa_Sign_Language=Hausa Sign Language -controlledvocabulary.language.Havasupai-Walapai-Yavapai=Havasupai-Walapai-Yavapai -controlledvocabulary.language.Haveke=Haveke -controlledvocabulary.language.Havu=Havu -controlledvocabulary.language.Hawai'i_Creole_English=Hawai'i Creole English -controlledvocabulary.language.Hawai'i_Sign_Language_(HSL)=Hawai'i Sign Language (HSL) -controlledvocabulary.language.Hawaiian=Hawaiian -controlledvocabulary.language.Haya=Haya -controlledvocabulary.language.Hazaragi=Hazaragi -controlledvocabulary.language.Hdi=Hdi -controlledvocabulary.language.Hebrew_(modern)=Hebrew (modern) -controlledvocabulary.language.Hehe=Hehe -controlledvocabulary.language.Heiban=Heiban -controlledvocabulary.language.Heiltsuk=Heiltsuk -controlledvocabulary.language.Helong=Helong -controlledvocabulary.language.Hema=Hema -controlledvocabulary.language.Hemba=Hemba -controlledvocabulary.language.Herd�=Herd� -controlledvocabulary.language.Herero=Herero -controlledvocabulary.language.Hermit=Hermit -controlledvocabulary.language.Hernican=Hernican -controlledvocabulary.language.Hewa=Hewa -controlledvocabulary.language.Heyo=Heyo -controlledvocabulary.language.Hiberno-Scottish_Gaelic=Hiberno-Scottish Gaelic -controlledvocabulary.language.Hibito=Hibito -controlledvocabulary.language.Hidatsa=Hidatsa -controlledvocabulary.language.Hieroglyphic_Luwian=Hieroglyphic Luwian -controlledvocabulary.language.Higaonon=Higaonon -controlledvocabulary.language.Highland_Konjo=Highland Konjo -controlledvocabulary.language.Highland_Oaxaca_Chontal=Highland Oaxaca Chontal -controlledvocabulary.language.Highland_Popoluca=Highland Popoluca -controlledvocabulary.language.Highland_Puebla_Nahuatl=Highland Puebla Nahuatl -controlledvocabulary.language.Highland_Totonac=Highland Totonac -controlledvocabulary.language.Hijazi_Arabic=Hijazi Arabic -controlledvocabulary.language.Hijuk=Hijuk -controlledvocabulary.language.Hiligaynon=Hiligaynon -controlledvocabulary.language.Himarim�=Himarim� -controlledvocabulary.language.Hindi=Hindi -controlledvocabulary.language.Hinduri=Hinduri -controlledvocabulary.language.Hinukh=Hinukh -controlledvocabulary.language.Hiri_Motu=Hiri Motu -controlledvocabulary.language.Hittite=Hittite -controlledvocabulary.language.Hitu=Hitu -controlledvocabulary.language.Hiw=Hiw -controlledvocabulary.language.Hixkary�na=Hixkary�na -controlledvocabulary.language.Hlai=Hlai -controlledvocabulary.language.Hlepho_Phowa=Hlepho Phowa -controlledvocabulary.language.Hlersu=Hlersu -controlledvocabulary.language.Hmar=Hmar -controlledvocabulary.language.Hmong=Hmong -controlledvocabulary.language.Hmong_Daw=Hmong Daw -controlledvocabulary.language.Hmong_Don=Hmong Don -controlledvocabulary.language.Hmong_D�=Hmong D� -controlledvocabulary.language.Hmong_Njua=Hmong Njua -controlledvocabulary.language.Hmong_Shua=Hmong Shua -controlledvocabulary.language.Hmwaveke=Hmwaveke -controlledvocabulary.language.Ho=Ho -controlledvocabulary.language.Ho_Chi_Minh_City_Sign_Language=Ho Chi Minh City Sign Language -controlledvocabulary.language.Ho-Chunk=Ho-Chunk -controlledvocabulary.language.Hoava=Hoava -controlledvocabulary.language.Hoby�t=Hoby�t -controlledvocabulary.language.Hoia_Hoia=Hoia Hoia -controlledvocabulary.language.Holikachuk=Holikachuk -controlledvocabulary.language.Holiya=Holiya -controlledvocabulary.language.Holma=Holma -controlledvocabulary.language.Holoholo=Holoholo -controlledvocabulary.language.Holu=Holu -controlledvocabulary.language.Homa=Homa -controlledvocabulary.language.Honduras_Sign_Language=Honduras Sign Language -controlledvocabulary.language.Hong_Kong_Sign_Language=Hong Kong Sign Language -controlledvocabulary.language.Honi=Honi -controlledvocabulary.language.Hopi=Hopi -controlledvocabulary.language.Horned_Miao=Horned Miao -controlledvocabulary.language.Horo=Horo -controlledvocabulary.language.Horom=Horom -controlledvocabulary.language.Horpa=Horpa -controlledvocabulary.language.Hote=Hote -controlledvocabulary.language.Hoti=Hoti -controlledvocabulary.language.Hovongan=Hovongan -controlledvocabulary.language.Hoyahoya=Hoyahoya -controlledvocabulary.language.Hozo=Hozo -controlledvocabulary.language.Hpon=Hpon -controlledvocabulary.language.Hrangkhol=Hrangkhol -controlledvocabulary.language.Hre=Hre -controlledvocabulary.language.Hruso=Hruso -controlledvocabulary.language.Hu=Hu -controlledvocabulary.language.Huachipaeri=Huachipaeri -controlledvocabulary.language.Huallaga_Hu�nuco_Quechua=Huallaga Hu�nuco Quechua -controlledvocabulary.language.Huamal�es-Dos_de_Mayo_Hu�nuco_Quechua=Huamal�es-Dos de Mayo Hu�nuco Quechua -controlledvocabulary.language.Huambisa=Huambisa -controlledvocabulary.language.Huarijio=Huarijio -controlledvocabulary.language.Huastec=Huastec -controlledvocabulary.language.Huaulu=Huaulu -controlledvocabulary.language.Huautla_Mazatec=Huautla Mazatec -controlledvocabulary.language.Huaxcaleca_Nahuatl=Huaxcaleca Nahuatl -controlledvocabulary.language.Huaylas_Ancash_Quechua=Huaylas Ancash Quechua -controlledvocabulary.language.Huaylla_Wanca_Quechua=Huaylla Wanca Quechua -controlledvocabulary.language.Huba=Huba -controlledvocabulary.language.Huehuetla_Tepehua=Huehuetla Tepehua -controlledvocabulary.language.Huichol=Huichol -controlledvocabulary.language.Huilliche=Huilliche -controlledvocabulary.language.Huitepec_Mixtec=Huitepec Mixtec -controlledvocabulary.language.Huizhou_Chinese=Huizhou Chinese -controlledvocabulary.language.Hukumina=Hukumina -controlledvocabulary.language.Hula=Hula -controlledvocabulary.language.Hulaul�=Hulaul� -controlledvocabulary.language.Huli=Huli -controlledvocabulary.language.Hulung=Hulung -controlledvocabulary.language.Humburi_Senni_Songhay=Humburi Senni Songhay -controlledvocabulary.language.Humene=Humene -controlledvocabulary.language.Humla=Humla -controlledvocabulary.language.Hunde=Hunde -controlledvocabulary.language.Hung=Hung -controlledvocabulary.language.Hungana=Hungana -controlledvocabulary.language.Hungarian=Hungarian -controlledvocabulary.language.Hungarian_Sign_Language=Hungarian Sign Language -controlledvocabulary.language.Hungu=Hungu -controlledvocabulary.language.Hunjara-Kaina_Ke=Hunjara-Kaina Ke -controlledvocabulary.language.Hunnic=Hunnic -controlledvocabulary.language.Hunsrik=Hunsrik -controlledvocabulary.language.Hunzib=Hunzib -controlledvocabulary.language.Hupa=Hupa -controlledvocabulary.language.Hupd�=Hupd� -controlledvocabulary.language.Hupla=Hupla -controlledvocabulary.language.Hurrian=Hurrian -controlledvocabulary.language.Hutterite_German=Hutterite German -controlledvocabulary.language.Hwana=Hwana -controlledvocabulary.language.Hya=Hya -controlledvocabulary.language.Hyam=Hyam -controlledvocabulary.language.Hyolmo=Hyolmo -controlledvocabulary.language.H�rtevin=H�rtevin -controlledvocabulary.language.H�ne=H�ne -controlledvocabulary.language.I-Wak=I-Wak -controlledvocabulary.language.Iaai=Iaai -controlledvocabulary.language.Iamalele=Iamalele -controlledvocabulary.language.Iatmul=Iatmul -controlledvocabulary.language.Iau=Iau -controlledvocabulary.language.Ibali_Teke=Ibali Teke -controlledvocabulary.language.Ibaloi=Ibaloi -controlledvocabulary.language.Iban=Iban -controlledvocabulary.language.Ibanag=Ibanag -controlledvocabulary.language.Ibani=Ibani -controlledvocabulary.language.Ibatan=Ibatan -controlledvocabulary.language.Iberian=Iberian -controlledvocabulary.language.Ibibio=Ibibio -controlledvocabulary.language.Ibino=Ibino -controlledvocabulary.language.Ibu=Ibu -controlledvocabulary.language.Ibuoro=Ibuoro -controlledvocabulary.language.Icelandic=Icelandic -controlledvocabulary.language.Icelandic_Sign_Language=Icelandic Sign Language -controlledvocabulary.language.Iceve-Maci=Iceve-Maci -controlledvocabulary.language.Ida'an=Ida'an -controlledvocabulary.language.Idakho-Isukha-Tiriki=Idakho-Isukha-Tiriki -controlledvocabulary.language.Idat�=Idat� -controlledvocabulary.language.Idere=Idere -controlledvocabulary.language.Idesa=Idesa -controlledvocabulary.language.Idi=Idi -controlledvocabulary.language.Ido=Ido -controlledvocabulary.language.Idoma=Idoma -controlledvocabulary.language.Idon=Idon -controlledvocabulary.language.Idu-Mishmi=Idu-Mishmi -controlledvocabulary.language.Iduna=Iduna -controlledvocabulary.language.Ifo=Ifo -controlledvocabulary.language.If�=If� -controlledvocabulary.language.Igala=Igala -controlledvocabulary.language.Igana=Igana -controlledvocabulary.language.Igbo=Igbo -controlledvocabulary.language.Igede=Igede -controlledvocabulary.language.Ignaciano=Ignaciano -controlledvocabulary.language.Igo=Igo -controlledvocabulary.language.Iguta=Iguta -controlledvocabulary.language.Igwe=Igwe -controlledvocabulary.language.Iha=Iha -controlledvocabulary.language.Iha_Based_Pidgin=Iha Based Pidgin -controlledvocabulary.language.Ihievbe=Ihievbe -controlledvocabulary.language.Ik=Ik -controlledvocabulary.language.Ika=Ika -controlledvocabulary.language.Ikaranggal=Ikaranggal -controlledvocabulary.language.Ikhin-Arokho=Ikhin-Arokho -controlledvocabulary.language.Ikizu=Ikizu -controlledvocabulary.language.Iko=Iko -controlledvocabulary.language.Ikobi=Ikobi -controlledvocabulary.language.Ikoma-Nata-Isenye=Ikoma-Nata-Isenye -controlledvocabulary.language.Ikpeng=Ikpeng -controlledvocabulary.language.Ikpeshi=Ikpeshi -controlledvocabulary.language.Ikposo=Ikposo -controlledvocabulary.language.Iku-Gora-Ankwa=Iku-Gora-Ankwa -controlledvocabulary.language.Ikulu=Ikulu -controlledvocabulary.language.Ikwere=Ikwere -controlledvocabulary.language.Ikwo=Ikwo -controlledvocabulary.language.Ila=Ila -controlledvocabulary.language.Ile_Ape=Ile Ape -controlledvocabulary.language.Ili_Turki=Ili Turki -controlledvocabulary.language.Ili'uun=Ili'uun -controlledvocabulary.language.Ilianen_Manobo=Ilianen Manobo -controlledvocabulary.language.Illyrian=Illyrian -controlledvocabulary.language.Iloko=Iloko -controlledvocabulary.language.Ilongot=Ilongot -controlledvocabulary.language.Ilue=Ilue -controlledvocabulary.language.Ilwana=Ilwana -controlledvocabulary.language.Imbabura_Highland_Quichua=Imbabura Highland Quichua -controlledvocabulary.language.Imbongu=Imbongu -controlledvocabulary.language.Imonda=Imonda -controlledvocabulary.language.Imotong=Imotong -controlledvocabulary.language.Imroing=Imroing -controlledvocabulary.language.Inabaknon=Inabaknon -controlledvocabulary.language.Inapang=Inapang -controlledvocabulary.language.Inari_Sami=Inari Sami -controlledvocabulary.language.Indian_Sign_Language=Indian Sign Language -controlledvocabulary.language.Indo-Portuguese=Indo-Portuguese -controlledvocabulary.language.Indonesian=Indonesian -controlledvocabulary.language.Indonesian_Bajau=Indonesian Bajau -controlledvocabulary.language.Indonesian_Sign_Language=Indonesian Sign Language -controlledvocabulary.language.Indri=Indri -controlledvocabulary.language.Indus_Kohistani=Indus Kohistani -controlledvocabulary.language.Indus_Valley_Language=Indus Valley Language -controlledvocabulary.language.Inebu_One=Inebu One -controlledvocabulary.language.Inese�o=Inese�o -controlledvocabulary.language.Inga=Inga -controlledvocabulary.language.Ingrian=Ingrian -controlledvocabulary.language.Ingush=Ingush -controlledvocabulary.language.Inlaod_Itneg=Inlaod Itneg -controlledvocabulary.language.Innu=Innu -controlledvocabulary.language.Inoke-Yate=Inoke-Yate -controlledvocabulary.language.Inonhan=Inonhan -controlledvocabulary.language.Inor=Inor -controlledvocabulary.language.Inpui_Naga=Inpui Naga -controlledvocabulary.language.Interglossa=Interglossa -controlledvocabulary.language.Interlingua=Interlingua -controlledvocabulary.language.Interlingue=Interlingue -controlledvocabulary.language.International_Sign=International Sign -controlledvocabulary.language.Interslavic=Interslavic -controlledvocabulary.language.Intha=Intha -controlledvocabulary.language.Inuinnaqtun=Inuinnaqtun -controlledvocabulary.language.Inuit_Sign_Language=Inuit Sign Language -controlledvocabulary.language.Inuktitut=Inuktitut -controlledvocabulary.language.Inupiaq=Inupiaq -controlledvocabulary.language.Iowa-Oto=Iowa-Oto -controlledvocabulary.language.Ipalapa_Amuzgo=Ipalapa Amuzgo -controlledvocabulary.language.Ipiko=Ipiko -controlledvocabulary.language.Ipili=Ipili -controlledvocabulary.language.Ipulo=Ipulo -controlledvocabulary.language.Iquito=Iquito -controlledvocabulary.language.Ir=Ir -controlledvocabulary.language.Iranian_Persian=Iranian Persian -controlledvocabulary.language.Iranian_Sign_Language=Iranian Sign Language -controlledvocabulary.language.Iranun_(Malaysia)=Iranun (Malaysia) -controlledvocabulary.language.Iranun_(Philippines)=Iranun (Philippines) -controlledvocabulary.language.Iraqw=Iraqw -controlledvocabulary.language.Irarutu=Irarutu -controlledvocabulary.language.Iraya=Iraya -controlledvocabulary.language.Iresim=Iresim -controlledvocabulary.language.Irish=Irish -controlledvocabulary.language.Irish_Sign_Language=Irish Sign Language -controlledvocabulary.language.Irula=Irula -controlledvocabulary.language.Ir�ntxe=Ir�ntxe -controlledvocabulary.language.Isabi=Isabi -controlledvocabulary.language.Isanzu=Isanzu -controlledvocabulary.language.Isarog_Agta=Isarog Agta -controlledvocabulary.language.Isconahua=Isconahua -controlledvocabulary.language.Isebe=Isebe -controlledvocabulary.language.Isekiri=Isekiri -controlledvocabulary.language.Ishkashimi=Ishkashimi -controlledvocabulary.language.Isinai=Isinai -controlledvocabulary.language.Isirawa=Isirawa -controlledvocabulary.language.Island_Carib=Island Carib -controlledvocabulary.language.Islander_Creole_English=Islander Creole English -controlledvocabulary.language.Isnag=Isnag -controlledvocabulary.language.Isoko=Isoko -controlledvocabulary.language.Israeli_Sign_Language=Israeli Sign Language -controlledvocabulary.language.Isthmus_Mixe=Isthmus Mixe -controlledvocabulary.language.Isthmus_Zapotec=Isthmus Zapotec -controlledvocabulary.language.Isthmus-Cosoleacaque_Nahuatl=Isthmus-Cosoleacaque Nahuatl -controlledvocabulary.language.Isthmus-Mecayapan_Nahuatl=Isthmus-Mecayapan Nahuatl -controlledvocabulary.language.Isthmus-Pajapan_Nahuatl=Isthmus-Pajapan Nahuatl -controlledvocabulary.language.Istriot=Istriot -controlledvocabulary.language.Istro_Romanian=Istro Romanian -controlledvocabulary.language.Isu_(Fako_Division)=Isu (Fako Division) -controlledvocabulary.language.Isu_(Menchum_Division)=Isu (Menchum Division) -controlledvocabulary.language.Italian=Italian -controlledvocabulary.language.Italian_Sign_Language=Italian Sign Language -controlledvocabulary.language.Itawit=Itawit -controlledvocabulary.language.Itelmen=Itelmen -controlledvocabulary.language.Itene=Itene -controlledvocabulary.language.Iteri=Iteri -controlledvocabulary.language.Itik=Itik -controlledvocabulary.language.Ito=Ito -controlledvocabulary.language.Itonama=Itonama -controlledvocabulary.language.Itu_Mbon_Uzo=Itu Mbon Uzo -controlledvocabulary.language.Itundujia_Mixtec=Itundujia Mixtec -controlledvocabulary.language.Itz�=Itz� -controlledvocabulary.language.Iu_Mien=Iu Mien -controlledvocabulary.language.Ivatan=Ivatan -controlledvocabulary.language.Ivbie_North-Okpela-Arhe=Ivbie North-Okpela-Arhe -controlledvocabulary.language.Iwaidja=Iwaidja -controlledvocabulary.language.Iwal=Iwal -controlledvocabulary.language.Iwam=Iwam -controlledvocabulary.language.Iwur=Iwur -controlledvocabulary.language.Ixcatec=Ixcatec -controlledvocabulary.language.Ixcatl�n_Mazatec=Ixcatl�n Mazatec -controlledvocabulary.language.Ixil=Ixil -controlledvocabulary.language.Ixtayutla_Mixtec=Ixtayutla Mixtec -controlledvocabulary.language.Ixtenco_Otomi=Ixtenco Otomi -controlledvocabulary.language.Iyayu=Iyayu -controlledvocabulary.language.Iyive=Iyive -controlledvocabulary.language.Iyo=Iyo -controlledvocabulary.language.Iyo'wujwa_Chorote=Iyo'wujwa Chorote -controlledvocabulary.language.Iyojwa'ja_Chorote=Iyojwa'ja Chorote -controlledvocabulary.language.Izere=Izere -controlledvocabulary.language.Izii=Izii -controlledvocabulary.language.Izon=Izon -controlledvocabulary.language.Izora=Izora -controlledvocabulary.language.I�apari=I�apari -controlledvocabulary.language.Jabut�=Jabut� -controlledvocabulary.language.Jad=Jad -controlledvocabulary.language.Jadgali=Jadgali -controlledvocabulary.language.Jah_Hut=Jah Hut -controlledvocabulary.language.Jahanka=Jahanka -controlledvocabulary.language.Jair_Awyu=Jair Awyu -controlledvocabulary.language.Jaitmatang=Jaitmatang -controlledvocabulary.language.Jakati=Jakati -controlledvocabulary.language.Jakattoe=Jakattoe -controlledvocabulary.language.Jakun=Jakun -controlledvocabulary.language.Jalapa_De_D�az_Mazatec=Jalapa De D�az Mazatec -controlledvocabulary.language.Jalkunan=Jalkunan -controlledvocabulary.language.Jamaican_Country_Sign_Language=Jamaican Country Sign Language -controlledvocabulary.language.Jamaican_Creole_English=Jamaican Creole English -controlledvocabulary.language.Jamaican_Sign_Language=Jamaican Sign Language -controlledvocabulary.language.Jamamad�=Jamamad� -controlledvocabulary.language.Jambi_Malay=Jambi Malay -controlledvocabulary.language.Jamiltepec_Mixtec=Jamiltepec Mixtec -controlledvocabulary.language.Jamsay_Dogon=Jamsay Dogon -controlledvocabulary.language.Jandai=Jandai -controlledvocabulary.language.Jandavra=Jandavra -controlledvocabulary.language.Jangkang=Jangkang -controlledvocabulary.language.Jangshung=Jangshung -controlledvocabulary.language.Janji=Janji -controlledvocabulary.language.Japanese=Japanese -controlledvocabulary.language.Japanese_Sign_Language=Japanese Sign Language -controlledvocabulary.language.Japrer�a=Japrer�a -controlledvocabulary.language.Jaqaru=Jaqaru -controlledvocabulary.language.Jara=Jara -controlledvocabulary.language.Jarai=Jarai -controlledvocabulary.language.Jarawa_(India)=Jarawa (India) -controlledvocabulary.language.Jaru=Jaru -controlledvocabulary.language.Jauja_Wanca_Quechua=Jauja Wanca Quechua -controlledvocabulary.language.Jaunsari=Jaunsari -controlledvocabulary.language.Javanese=Javanese -controlledvocabulary.language.Javindo=Javindo -controlledvocabulary.language.Jawe=Jawe -controlledvocabulary.language.Jawoyn=Jawoyn -controlledvocabulary.language.Jaya=Jaya -controlledvocabulary.language.Jebero=Jebero -controlledvocabulary.language.Jeh=Jeh -controlledvocabulary.language.Jehai=Jehai -controlledvocabulary.language.Jejara_Naga=Jejara Naga -controlledvocabulary.language.Jejueo=Jejueo -controlledvocabulary.language.Jemez=Jemez -controlledvocabulary.language.Jenaama_Bozo=Jenaama Bozo -controlledvocabulary.language.Jennu_Kurumba=Jennu Kurumba -controlledvocabulary.language.Jere=Jere -controlledvocabulary.language.Jeri_Kuo=Jeri Kuo -controlledvocabulary.language.Jerung=Jerung -controlledvocabulary.language.Jewish_Babylonian_Aramaic_(ca._200-1200_CE)=Jewish Babylonian Aramaic (ca. 200-1200 CE) -controlledvocabulary.language.Jewish_Palestinian_Aramaic=Jewish Palestinian Aramaic -controlledvocabulary.language.Jhankot_Sign_Language=Jhankot Sign Language -controlledvocabulary.language.Jiamao=Jiamao -controlledvocabulary.language.Jiarong=Jiarong -controlledvocabulary.language.Jiba=Jiba -controlledvocabulary.language.Jibu=Jibu -controlledvocabulary.language.Jicarilla_Apache=Jicarilla Apache -controlledvocabulary.language.Jiiddu=Jiiddu -controlledvocabulary.language.Jilbe=Jilbe -controlledvocabulary.language.Jilim=Jilim -controlledvocabulary.language.Jimi_(Cameroon)=Jimi (Cameroon) -controlledvocabulary.language.Jimi_(Nigeria)=Jimi (Nigeria) -controlledvocabulary.language.Jina=Jina -controlledvocabulary.language.Jingulu=Jingulu -controlledvocabulary.language.Jinyu_Chinese=Jinyu Chinese -controlledvocabulary.language.Jiongnai_Bunu=Jiongnai Bunu -controlledvocabulary.language.Jirel=Jirel -controlledvocabulary.language.Jiru=Jiru -controlledvocabulary.language.Jita=Jita -controlledvocabulary.language.Jju=Jju -controlledvocabulary.language.Joba=Joba -controlledvocabulary.language.Jofotek-Bromnya=Jofotek-Bromnya -controlledvocabulary.language.Jogi=Jogi -controlledvocabulary.language.Jola-Fonyi=Jola-Fonyi -controlledvocabulary.language.Jola-Kasa=Jola-Kasa -controlledvocabulary.language.Jonkor_Bourmataguil=Jonkor Bourmataguil -controlledvocabulary.language.Jordanian_Sign_Language=Jordanian Sign Language -controlledvocabulary.language.Jor�=Jor� -controlledvocabulary.language.Jowulu=Jowulu -controlledvocabulary.language.Ju=Ju -controlledvocabulary.language.Juang=Juang -controlledvocabulary.language.Judeo-Arabic=Judeo-Arabic -controlledvocabulary.language.Judeo-Berber=Judeo-Berber -controlledvocabulary.language.Judeo-Georgian=Judeo-Georgian -controlledvocabulary.language.Judeo-Iraqi_Arabic=Judeo-Iraqi Arabic -controlledvocabulary.language.Judeo-Italian=Judeo-Italian -controlledvocabulary.language.Judeo-Moroccan_Arabic=Judeo-Moroccan Arabic -controlledvocabulary.language.Judeo-Persian=Judeo-Persian -controlledvocabulary.language.Judeo-Tat=Judeo-Tat -controlledvocabulary.language.Judeo-Tripolitanian_Arabic=Judeo-Tripolitanian Arabic -controlledvocabulary.language.Judeo-Yemeni_Arabic=Judeo-Yemeni Arabic -controlledvocabulary.language.Jukun_Takum=Jukun Takum -controlledvocabulary.language.Jumjum=Jumjum -controlledvocabulary.language.Jumla_Sign_Language=Jumla Sign Language -controlledvocabulary.language.Jumli=Jumli -controlledvocabulary.language.Jungle_Inga=Jungle Inga -controlledvocabulary.language.Juquila_Mixe=Juquila Mixe -controlledvocabulary.language.Jur_Modo=Jur Modo -controlledvocabulary.language.Juray=Juray -controlledvocabulary.language.Jurchen=Jurchen -controlledvocabulary.language.Jur�na=Jur�na -controlledvocabulary.language.Jutish=Jutish -controlledvocabulary.language.Juwal=Juwal -controlledvocabulary.language.Juxtlahuaca_Mixtec=Juxtlahuaca Mixtec -controlledvocabulary.language.Juhoan=Ju??hoan -controlledvocabulary.language.Jwira-Pepesa=Jwira-Pepesa -controlledvocabulary.language.J�rriais=J�rriais -controlledvocabulary.language.J�ma=J�ma -controlledvocabulary.language.K'iche'=K'iche' -controlledvocabulary.language.Kaamba=Kaamba -controlledvocabulary.language.Kaan=Kaan -controlledvocabulary.language.Kaang_Chin=Kaang Chin -controlledvocabulary.language.Kaansa=Kaansa -controlledvocabulary.language.Kaba=Kaba -controlledvocabulary.language.Kabalai=Kabalai -controlledvocabulary.language.Kabardian=Kabardian -controlledvocabulary.language.Kabatei=Kabatei -controlledvocabulary.language.Kabiy�=Kabiy� -controlledvocabulary.language.Kabola=Kabola -controlledvocabulary.language.Kabore_One=Kabore One -controlledvocabulary.language.Kabras=Kabras -controlledvocabulary.language.Kaburi=Kaburi -controlledvocabulary.language.Kabutra=Kabutra -controlledvocabulary.language.Kabuverdianu=Kabuverdianu -controlledvocabulary.language.Kabwa=Kabwa -controlledvocabulary.language.Kabwari=Kabwari -controlledvocabulary.language.Kabyle=Kabyle -controlledvocabulary.language.Kachama-Ganjule=Kachama-Ganjule -controlledvocabulary.language.Kachari=Kachari -controlledvocabulary.language.Kachhi=Kachhi -controlledvocabulary.language.Kachi_Koli=Kachi Koli -controlledvocabulary.language.Kachin=Kachin -controlledvocabulary.language.Kachok=Kachok -controlledvocabulary.language.Kacipo-Bale_Suri=Kacipo-Bale Suri -controlledvocabulary.language.Kadai=Kadai -controlledvocabulary.language.Kadar=Kadar -controlledvocabulary.language.Kadaru=Kadaru -controlledvocabulary.language.Kadazan_Dusun=Kadazan Dusun -controlledvocabulary.language.Kadiw�u=Kadiw�u -controlledvocabulary.language.Kadu=Kadu -controlledvocabulary.language.Kadung=Kadung -controlledvocabulary.language.Kaduo=Kaduo -controlledvocabulary.language.Kaeku=Kaeku -controlledvocabulary.language.Kaera=Kaera -controlledvocabulary.language.Kafa=Kafa -controlledvocabulary.language.Kafoa=Kafoa -controlledvocabulary.language.Kagan_Kalagan=Kagan Kalagan -controlledvocabulary.language.Kagate=Kagate -controlledvocabulary.language.Kagayanen=Kagayanen -controlledvocabulary.language.Kagoma=Kagoma -controlledvocabulary.language.Kagoro=Kagoro -controlledvocabulary.language.Kagulu=Kagulu -controlledvocabulary.language.Kahe=Kahe -controlledvocabulary.language.Kahua=Kahua -controlledvocabulary.language.Kaian=Kaian -controlledvocabulary.language.Kaibobo=Kaibobo -controlledvocabulary.language.Kaidipang=Kaidipang -controlledvocabulary.language.Kaiep=Kaiep -controlledvocabulary.language.Kaikadi=Kaikadi -controlledvocabulary.language.Kaikavian_Literary_Language=Kaikavian Literary Language -controlledvocabulary.language.Kaike=Kaike -controlledvocabulary.language.Kaimbulawa=Kaimbulawa -controlledvocabulary.language.Kaimb�=Kaimb� -controlledvocabulary.language.Kaingang=Kaingang -controlledvocabulary.language.Kairak=Kairak -controlledvocabulary.language.Kairiru=Kairiru -controlledvocabulary.language.Kairui-Midiki=Kairui-Midiki -controlledvocabulary.language.Kais=Kais -controlledvocabulary.language.Kaitag=Kaitag -controlledvocabulary.language.Kaivi=Kaivi -controlledvocabulary.language.Kaiw�=Kaiw� -controlledvocabulary.language.Kaiy=Kaiy -controlledvocabulary.language.Kajakse=Kajakse -controlledvocabulary.language.Kajali=Kajali -controlledvocabulary.language.Kajaman=Kajaman -controlledvocabulary.language.Kakabai=Kakabai -controlledvocabulary.language.Kakabe=Kakabe -controlledvocabulary.language.Kakanda=Kakanda -controlledvocabulary.language.Kaki_Ae=Kaki Ae -controlledvocabulary.language.Kako=Kako -controlledvocabulary.language.Kakwa=Kakwa -controlledvocabulary.language.Kala_Lagaw_Ya=Kala Lagaw Ya -controlledvocabulary.language.Kalaamaya=Kalaamaya -controlledvocabulary.language.Kalabakan=Kalabakan -controlledvocabulary.language.Kalabari=Kalabari -controlledvocabulary.language.Kalabra=Kalabra -controlledvocabulary.language.Kalagan=Kalagan -controlledvocabulary.language.Kalaktang_Monpa=Kalaktang Monpa -controlledvocabulary.language.Kalam=Kalam -controlledvocabulary.language.Kalams�=Kalams� -controlledvocabulary.language.Kalanadi=Kalanadi -controlledvocabulary.language.Kalanga=Kalanga -controlledvocabulary.language.Kalanguya=Kalanguya -controlledvocabulary.language.Kalao=Kalao -controlledvocabulary.language.Kalapuya=Kalapuya -controlledvocabulary.language.Kalarko=Kalarko -controlledvocabulary.language.Kalasha=Kalasha -controlledvocabulary.language.Kalenjin=Kalenjin -controlledvocabulary.language.Kalispel-Pend_d'Oreille=Kalispel-Pend d'Oreille -controlledvocabulary.language.Kalkoti=Kalkoti -controlledvocabulary.language.Kalkutung=Kalkutung -controlledvocabulary.language.Kalmyk=Kalmyk -controlledvocabulary.language.Kalo_Finnish_Romani=Kalo Finnish Romani -controlledvocabulary.language.Kalou=Kalou -controlledvocabulary.language.Kaluli=Kaluli -controlledvocabulary.language.Kalumpang=Kalumpang -controlledvocabulary.language.Kam=Kam -controlledvocabulary.language.Kamakan=Kamakan -controlledvocabulary.language.Kamang=Kamang -controlledvocabulary.language.Kamano=Kamano -controlledvocabulary.language.Kamantan=Kamantan -controlledvocabulary.language.Kamar=Kamar -controlledvocabulary.language.Kamara=Kamara -controlledvocabulary.language.Kamarian=Kamarian -controlledvocabulary.language.Kamaru=Kamaru -controlledvocabulary.language.Kamas=Kamas -controlledvocabulary.language.Kamasa=Kamasa -controlledvocabulary.language.Kamasau=Kamasau -controlledvocabulary.language.Kamayo=Kamayo -controlledvocabulary.language.Kamayur�=Kamayur� -controlledvocabulary.language.Kamba_(Kenya)=Kamba (Kenya) -controlledvocabulary.language.Kambaata=Kambaata -controlledvocabulary.language.Kambaira=Kambaira -controlledvocabulary.language.Kambera=Kambera -controlledvocabulary.language.Kamberau=Kamberau -controlledvocabulary.language.Kambiw�=Kambiw� -controlledvocabulary.language.Kami_(Nigeria)=Kami (Nigeria) -controlledvocabulary.language.Kami_(Tanzania)=Kami (Tanzania) -controlledvocabulary.language.Kamo=Kamo -controlledvocabulary.language.Kamoro=Kamoro -controlledvocabulary.language.Kamu=Kamu -controlledvocabulary.language.Kamula=Kamula -controlledvocabulary.language.Kamviri=Kamviri -controlledvocabulary.language.Kamwe=Kamwe -controlledvocabulary.language.Kanakanabu=Kanakanabu -controlledvocabulary.language.Kanamar�=Kanamar� -controlledvocabulary.language.Kanan=Kanan -controlledvocabulary.language.Kanashi=Kanashi -controlledvocabulary.language.Kanasi=Kanasi -controlledvocabulary.language.Kanauji=Kanauji -controlledvocabulary.language.Kandas=Kandas -controlledvocabulary.language.Kandawo=Kandawo -controlledvocabulary.language.Kande=Kande -controlledvocabulary.language.Kanembu=Kanembu -controlledvocabulary.language.Kang=Kang -controlledvocabulary.language.Kanga=Kanga -controlledvocabulary.language.Kangean=Kangean -controlledvocabulary.language.Kanggape=Kanggape -controlledvocabulary.language.Kangjia=Kangjia -controlledvocabulary.language.Kango_(Bas-U�l�_District)=Kango (Bas-U�l� District) -controlledvocabulary.language.Kango_(Tshopo_District)=Kango (Tshopo District) -controlledvocabulary.language.Kangri=Kangri -controlledvocabulary.language.Kaniet=Kaniet -controlledvocabulary.language.Kanikkaran=Kanikkaran -controlledvocabulary.language.Kaningdon-Nindem=Kaningdon-Nindem -controlledvocabulary.language.Kaningi=Kaningi -controlledvocabulary.language.Kaningra=Kaningra -controlledvocabulary.language.Kaninuwa=Kaninuwa -controlledvocabulary.language.Kanite=Kanite -controlledvocabulary.language.Kanjari=Kanjari -controlledvocabulary.language.Kanju=Kanju -controlledvocabulary.language.Kankanaey=Kankanaey -controlledvocabulary.language.Kannada=Kannada -controlledvocabulary.language.Kannada_Kurumba=Kannada Kurumba -controlledvocabulary.language.Kanowit-Tanjong_Melanau=Kanowit-Tanjong Melanau -controlledvocabulary.language.Kano�=Kano� -controlledvocabulary.language.Kansa=Kansa -controlledvocabulary.language.Kantosi=Kantosi -controlledvocabulary.language.Kanu=Kanu -controlledvocabulary.language.Kanufi=Kanufi -controlledvocabulary.language.Kanuri=Kanuri -controlledvocabulary.language.Kanyok=Kanyok -controlledvocabulary.language.Kao=Kao -controlledvocabulary.language.Kaonde=Kaonde -controlledvocabulary.language.Kap=Kap -controlledvocabulary.language.Kapin=Kapin -controlledvocabulary.language.Kapinaw�=Kapinaw� -controlledvocabulary.language.Kapingamarangi=Kapingamarangi -controlledvocabulary.language.Kapori=Kapori -controlledvocabulary.language.Kapriman=Kapriman -controlledvocabulary.language.Kaptiau=Kaptiau -controlledvocabulary.language.Kapya=Kapya -controlledvocabulary.language.Kaqchikel=Kaqchikel -controlledvocabulary.language.Kara_(Central_African_Republic)=Kara (Central African Republic) -controlledvocabulary.language.Kara_(Korea)=Kara (Korea) -controlledvocabulary.language.Kara_(Papua_New_Guinea)=Kara (Papua New Guinea) -controlledvocabulary.language.Kara_(Tanzania)=Kara (Tanzania) -controlledvocabulary.language.Kara-Kalpak=Kara-Kalpak -controlledvocabulary.language.Karachay-Balkar=Karachay-Balkar -controlledvocabulary.language.Karagas=Karagas -controlledvocabulary.language.Karaim=Karaim -controlledvocabulary.language.Karajarri=Karajarri -controlledvocabulary.language.Karaj�=Karaj� -controlledvocabulary.language.Karakhanid=Karakhanid -controlledvocabulary.language.Karami=Karami -controlledvocabulary.language.Karamojong=Karamojong -controlledvocabulary.language.Karang=Karang -controlledvocabulary.language.Karanga=Karanga -controlledvocabulary.language.Karankawa=Karankawa -controlledvocabulary.language.Karao=Karao -controlledvocabulary.language.Karas=Karas -controlledvocabulary.language.Karata=Karata -controlledvocabulary.language.Karawa=Karawa -controlledvocabulary.language.Karbi=Karbi -controlledvocabulary.language.Kare_(Central_African_Republic)=Kare (Central African Republic) -controlledvocabulary.language.Kare_(Papua_New_Guinea)=Kare (Papua New Guinea) -controlledvocabulary.language.Karekare=Karekare -controlledvocabulary.language.Karelian=Karelian -controlledvocabulary.language.Karenggapa=Karenggapa -controlledvocabulary.language.Karey=Karey -controlledvocabulary.language.Kari=Kari -controlledvocabulary.language.Karingani=Karingani -controlledvocabulary.language.Karipuna=Karipuna -controlledvocabulary.language.Karip�na_Creole_French=Karip�na Creole French -controlledvocabulary.language.Karir�-Xoc�=Karir�-Xoc� -controlledvocabulary.language.Kariti�na=Kariti�na -controlledvocabulary.language.Kariya=Kariya -controlledvocabulary.language.Kariyarra=Kariyarra -controlledvocabulary.language.Karkar-Yuri=Karkar-Yuri -controlledvocabulary.language.Karkin=Karkin -controlledvocabulary.language.Karko=Karko -controlledvocabulary.language.Karnai=Karnai -controlledvocabulary.language.Karo_(Brazil)=Karo (Brazil) -controlledvocabulary.language.Karo_(Ethiopia)=Karo (Ethiopia) -controlledvocabulary.language.Karok=Karok -controlledvocabulary.language.Karon=Karon -controlledvocabulary.language.Karon_Dori=Karon Dori -controlledvocabulary.language.Karore=Karore -controlledvocabulary.language.Karuwali=Karuwali -controlledvocabulary.language.Kasanga=Kasanga -controlledvocabulary.language.Kasem=Kasem -controlledvocabulary.language.Kashaya=Kashaya -controlledvocabulary.language.Kashmiri=Kashmiri -controlledvocabulary.language.Kashubian=Kashubian -controlledvocabulary.language.Kasiguranin=Kasiguranin -controlledvocabulary.language.Kaska=Kaska -controlledvocabulary.language.Kaskean=Kaskean -controlledvocabulary.language.Kasua=Kasua -controlledvocabulary.language.Katabaga=Katabaga -controlledvocabulary.language.Katawixi=Katawixi -controlledvocabulary.language.Katbol=Katbol -controlledvocabulary.language.Katcha-Kadugli-Miri=Katcha-Kadugli-Miri -controlledvocabulary.language.Kathoriya_Tharu=Kathoriya Tharu -controlledvocabulary.language.Kathu=Kathu -controlledvocabulary.language.Kati=Kati -controlledvocabulary.language.Katkari=Katkari -controlledvocabulary.language.Katla=Katla -controlledvocabulary.language.Kato=Kato -controlledvocabulary.language.Katso=Katso -controlledvocabulary.language.Katua=Katua -controlledvocabulary.language.Katuk�na=Katuk�na -controlledvocabulary.language.Kaulong=Kaulong -controlledvocabulary.language.Kaur=Kaur -controlledvocabulary.language.Kaure=Kaure -controlledvocabulary.language.Kaurna=Kaurna -controlledvocabulary.language.Kauwera=Kauwera -controlledvocabulary.language.Kavalan=Kavalan -controlledvocabulary.language.Kavet=Kavet -controlledvocabulary.language.Kawacha=Kawacha -controlledvocabulary.language.Kawaiisu=Kawaiisu -controlledvocabulary.language.Kawe=Kawe -controlledvocabulary.language.Kawi=Kawi -controlledvocabulary.language.Kaxarar�=Kaxarar� -controlledvocabulary.language.Kaxui�na=Kaxui�na -controlledvocabulary.language.Kayab�=Kayab� -controlledvocabulary.language.Kayagar=Kayagar -controlledvocabulary.language.Kayan=Kayan -controlledvocabulary.language.Kayan_Mahakam=Kayan Mahakam -controlledvocabulary.language.Kayan_River_Kayan=Kayan River Kayan -controlledvocabulary.language.Kayap�=Kayap� -controlledvocabulary.language.Kayardild=Kayardild -controlledvocabulary.language.Kayaw=Kayaw -controlledvocabulary.language.Kayeli=Kayeli -controlledvocabulary.language.Kayong=Kayong -controlledvocabulary.language.Kayort=Kayort -controlledvocabulary.language.Kaytetye=Kaytetye -controlledvocabulary.language.Kayupulau=Kayupulau -controlledvocabulary.language.Kazakh=Kazakh -controlledvocabulary.language.Kazukuru=Kazukuru -controlledvocabulary.language.Ke'o=Ke'o -controlledvocabulary.language.Keak=Keak -controlledvocabulary.language.Keapara=Keapara -controlledvocabulary.language.Kedah_Malay=Kedah Malay -controlledvocabulary.language.Kedang=Kedang -controlledvocabulary.language.Keder=Keder -controlledvocabulary.language.Keerray-Woorroong=Keerray-Woorroong -controlledvocabulary.language.Kehu=Kehu -controlledvocabulary.language.Kei=Kei -controlledvocabulary.language.Keiga=Keiga -controlledvocabulary.language.Kein=Kein -controlledvocabulary.language.Keiyo=Keiyo -controlledvocabulary.language.Kekch�=Kekch� -controlledvocabulary.language.Kela_(Democratic_Republic_of_Congo)=Kela (Democratic Republic of Congo) -controlledvocabulary.language.Kela_(Papua_New_Guinea)=Kela (Papua New Guinea) -controlledvocabulary.language.Kelabit=Kelabit -controlledvocabulary.language.Kele_(Democratic_Republic_of_Congo)=Kele (Democratic Republic of Congo) -controlledvocabulary.language.Kele_(Papua_New_Guinea)=Kele (Papua New Guinea) -controlledvocabulary.language.Keley-I_Kallahan=Keley-I Kallahan -controlledvocabulary.language.Keliko=Keliko -controlledvocabulary.language.Kelo=Kelo -controlledvocabulary.language.Kelon=Kelon -controlledvocabulary.language.Kemak=Kemak -controlledvocabulary.language.Kembayan=Kembayan -controlledvocabulary.language.Kemberano=Kemberano -controlledvocabulary.language.Kembra=Kembra -controlledvocabulary.language.Kemedzung=Kemedzung -controlledvocabulary.language.Kemi_Sami=Kemi Sami -controlledvocabulary.language.Kemiehua=Kemiehua -controlledvocabulary.language.Kemtuik=Kemtuik -controlledvocabulary.language.Kenaboi=Kenaboi -controlledvocabulary.language.Kenati=Kenati -controlledvocabulary.language.Kendayan=Kendayan -controlledvocabulary.language.Kendeje=Kendeje -controlledvocabulary.language.Kendem=Kendem -controlledvocabulary.language.Kenga=Kenga -controlledvocabulary.language.Keningau_Murut=Keningau Murut -controlledvocabulary.language.Keninjal=Keninjal -controlledvocabulary.language.Kensiu=Kensiu -controlledvocabulary.language.Kenswei_Nsei=Kenswei Nsei -controlledvocabulary.language.Kenyan_Sign_Language=Kenyan Sign Language -controlledvocabulary.language.Kenyang=Kenyang -controlledvocabulary.language.Kenyi=Kenyi -controlledvocabulary.language.Kenzi=Kenzi -controlledvocabulary.language.Keoru-Ahia=Keoru-Ahia -controlledvocabulary.language.Kepkiriw�t=Kepkiriw�t -controlledvocabulary.language.Kepo'=Kepo' -controlledvocabulary.language.Kera=Kera -controlledvocabulary.language.Kerak=Kerak -controlledvocabulary.language.Kereho=Kereho -controlledvocabulary.language.Kerek=Kerek -controlledvocabulary.language.Kerewe=Kerewe -controlledvocabulary.language.Kerewo=Kerewo -controlledvocabulary.language.Kerinci=Kerinci -controlledvocabulary.language.Kesawai=Kesawai -controlledvocabulary.language.Ket=Ket -controlledvocabulary.language.Ketangalan=Ketangalan -controlledvocabulary.language.Kete=Kete -controlledvocabulary.language.Ketengban=Ketengban -controlledvocabulary.language.Ketum=Ketum -controlledvocabulary.language.Keyagana=Keyagana -controlledvocabulary.language.Kgalagadi=Kgalagadi -controlledvocabulary.language.Khah=Khah -controlledvocabulary.language.Khakas=Khakas -controlledvocabulary.language.Khalaj=Khalaj -controlledvocabulary.language.Khaling=Khaling -controlledvocabulary.language.Khamba=Khamba -controlledvocabulary.language.Khamnigan_Mongol=Khamnigan Mongol -controlledvocabulary.language.Khams_Tibetan=Khams Tibetan -controlledvocabulary.language.Khamti=Khamti -controlledvocabulary.language.Khamyang=Khamyang -controlledvocabulary.language.Khana=Khana -controlledvocabulary.language.Khandesi=Khandesi -controlledvocabulary.language.Khanty=Khanty -controlledvocabulary.language.Khao=Khao -controlledvocabulary.language.Kharam_Naga=Kharam Naga -controlledvocabulary.language.Kharia=Kharia -controlledvocabulary.language.Kharia_Thar=Kharia Thar -controlledvocabulary.language.Khasi=Khasi -controlledvocabulary.language.Khayo=Khayo -controlledvocabulary.language.Khazar=Khazar -controlledvocabulary.language.Khe=Khe -controlledvocabulary.language.Khehek=Khehek -controlledvocabulary.language.Khengkha=Khengkha -controlledvocabulary.language.Khetrani=Khetrani -controlledvocabulary.language.Khezha_Naga=Khezha Naga -controlledvocabulary.language.Khiamniungan_Naga=Khiamniungan Naga -controlledvocabulary.language.Khinalugh=Khinalugh -controlledvocabulary.language.Khirwar=Khirwar -controlledvocabulary.language.Khisa=Khisa -controlledvocabulary.language.Khlula=Khlula -controlledvocabulary.language.Khmer=Khmer -controlledvocabulary.language.Khmu=Khmu -controlledvocabulary.language.Kho'ini=Kho'ini -controlledvocabulary.language.Khoekhoe=Khoekhoe -controlledvocabulary.language.Khoibu_Naga=Khoibu Naga -controlledvocabulary.language.Kholok=Kholok -controlledvocabulary.language.Khorasani_Turkish=Khorasani Turkish -controlledvocabulary.language.Khorezmian=Khorezmian -controlledvocabulary.language.Khotanese=Khotanese -controlledvocabulary.language.Khowar=Khowar -controlledvocabulary.language.Khua=Khua -controlledvocabulary.language.Khuen=Khuen -controlledvocabulary.language.Khumi_Chin=Khumi Chin -controlledvocabulary.language.Khunsari=Khunsari -controlledvocabulary.language.Khvarshi=Khvarshi -controlledvocabulary.language.Kh�ng=Kh�ng -controlledvocabulary.language.Kh�n=Kh�n -controlledvocabulary.language.Kibala=Kibala -controlledvocabulary.language.Kibet=Kibet -controlledvocabulary.language.Kibiri=Kibiri -controlledvocabulary.language.Kickapoo=Kickapoo -controlledvocabulary.language.Kija=Kija -controlledvocabulary.language.Kikai=Kikai -controlledvocabulary.language.Kikuyu,_Gikuyu=Kikuyu, Gikuyu -controlledvocabulary.language.Kildin_Sami=Kildin Sami -controlledvocabulary.language.Kilivila=Kilivila -controlledvocabulary.language.Kiliwa=Kiliwa -controlledvocabulary.language.Kilmeri=Kilmeri -controlledvocabulary.language.Kim=Kim -controlledvocabulary.language.Kim_Mun=Kim Mun -controlledvocabulary.language.Kimaama=Kimaama -controlledvocabulary.language.Kimaragang=Kimaragang -controlledvocabulary.language.Kimbu=Kimbu -controlledvocabulary.language.Kimbundu=Kimbundu -controlledvocabulary.language.Kimki=Kimki -controlledvocabulary.language.Kimr�=Kimr� -controlledvocabulary.language.Kinabalian=Kinabalian -controlledvocabulary.language.Kinalakna=Kinalakna -controlledvocabulary.language.Kinamiging_Manobo=Kinamiging Manobo -controlledvocabulary.language.Kinaray-A=Kinaray-A -controlledvocabulary.language.Kinga=Kinga -controlledvocabulary.language.Kinnauri=Kinnauri -controlledvocabulary.language.Kintaq=Kintaq -controlledvocabulary.language.Kinuku=Kinuku -controlledvocabulary.language.Kinyarwanda=Kinyarwanda -controlledvocabulary.language.Kioko=Kioko -controlledvocabulary.language.Kiong=Kiong -controlledvocabulary.language.Kiorr=Kiorr -controlledvocabulary.language.Kiowa=Kiowa -controlledvocabulary.language.Kiowa_Apache=Kiowa Apache -controlledvocabulary.language.Kipsigis=Kipsigis -controlledvocabulary.language.Kiput=Kiput -controlledvocabulary.language.Kir-Balar=Kir-Balar -controlledvocabulary.language.Kire=Kire -controlledvocabulary.language.Kirghiz=Kirghiz -controlledvocabulary.language.Kirike=Kirike -controlledvocabulary.language.Kirikiri=Kirikiri -controlledvocabulary.language.Kirmanjki_(individual_language)=Kirmanjki (individual language) -controlledvocabulary.language.Kirundi=Kirundi -controlledvocabulary.language.Kirya-Konzl=Kirya-Konz?l -controlledvocabulary.language.Kis=Kis -controlledvocabulary.language.Kisa=Kisa -controlledvocabulary.language.Kisan=Kisan -controlledvocabulary.language.Kisankasa=Kisankasa -controlledvocabulary.language.Kisar=Kisar -controlledvocabulary.language.Kisi=Kisi -controlledvocabulary.language.Kistane=Kistane -controlledvocabulary.language.Kita_Maninkakan=Kita Maninkakan -controlledvocabulary.language.Kitan=Kitan -controlledvocabulary.language.Kitsai=Kitsai -controlledvocabulary.language.Kituba_(Congo)=Kituba (Congo) -controlledvocabulary.language.Kituba_(Democratic_Republic_of_Congo)=Kituba (Democratic Republic of Congo) -controlledvocabulary.language.Kiunum=Kiunum -controlledvocabulary.language.Kizamani=Kizamani -controlledvocabulary.language.Kla-Dan=Kla-Dan -controlledvocabulary.language.Klamath-Modoc=Klamath-Modoc -controlledvocabulary.language.Klao=Klao -controlledvocabulary.language.Klias_River_Kadazan=Klias River Kadazan -controlledvocabulary.language.Klingon=Klingon -controlledvocabulary.language.Knaanic=Knaanic -controlledvocabulary.language.Ko=Ko -controlledvocabulary.language.Koalib=Koalib -controlledvocabulary.language.Koasati=Koasati -controlledvocabulary.language.Koba=Koba -controlledvocabulary.language.Kobiana=Kobiana -controlledvocabulary.language.Kobo=Kobo -controlledvocabulary.language.Kobol=Kobol -controlledvocabulary.language.Kobon=Kobon -controlledvocabulary.language.Koch=Koch -controlledvocabulary.language.Kochila_Tharu=Kochila Tharu -controlledvocabulary.language.Koda=Koda -controlledvocabulary.language.Kodaku=Kodaku -controlledvocabulary.language.Kodava=Kodava -controlledvocabulary.language.Kodeoha=Kodeoha -controlledvocabulary.language.Kodi=Kodi -controlledvocabulary.language.Kodia=Kodia -controlledvocabulary.language.Koenoem=Koenoem -controlledvocabulary.language.Kofa=Kofa -controlledvocabulary.language.Kofei=Kofei -controlledvocabulary.language.Kofyar=Kofyar -controlledvocabulary.language.Koguryo=Koguryo -controlledvocabulary.language.Kohin=Kohin -controlledvocabulary.language.Kohistani_Shina=Kohistani Shina -controlledvocabulary.language.Koho=Koho -controlledvocabulary.language.Kohumono=Kohumono -controlledvocabulary.language.Koi=Koi -controlledvocabulary.language.Koireng=Koireng -controlledvocabulary.language.Koitabu=Koitabu -controlledvocabulary.language.Koiwat=Koiwat -controlledvocabulary.language.Kok_Borok=Kok Borok -controlledvocabulary.language.Kok-Nar=Kok-Nar -controlledvocabulary.language.Kokata=Kokata -controlledvocabulary.language.Koke=Koke -controlledvocabulary.language.Koki_Naga=Koki Naga -controlledvocabulary.language.Koko_Babangk=Koko Babangk -controlledvocabulary.language.Kokoda=Kokoda -controlledvocabulary.language.Kokola=Kokola -controlledvocabulary.language.Kokota=Kokota -controlledvocabulary.language.Kol_(Bangladesh)=Kol (Bangladesh) -controlledvocabulary.language.Kol_(Cameroon)=Kol (Cameroon) -controlledvocabulary.language.Kol_(Papua_New_Guinea)=Kol (Papua New Guinea) -controlledvocabulary.language.Kola=Kola -controlledvocabulary.language.Kolbila=Kolbila -controlledvocabulary.language.Kolibugan_Subanon=Kolibugan Subanon -controlledvocabulary.language.Koluwawa=Koluwawa -controlledvocabulary.language.Kom_(Cameroon)=Kom (Cameroon) -controlledvocabulary.language.Kom_(India)=Kom (India) -controlledvocabulary.language.Koma=Koma -controlledvocabulary.language.Komba=Komba -controlledvocabulary.language.Kombai=Kombai -controlledvocabulary.language.Kombio=Kombio -controlledvocabulary.language.Komering=Komering -controlledvocabulary.language.Komi=Komi -controlledvocabulary.language.Komi-Permyak=Komi-Permyak -controlledvocabulary.language.Komi-Zyrian=Komi-Zyrian -controlledvocabulary.language.Kominimung=Kominimung -controlledvocabulary.language.Komo_(Democratic_Republic_of_Congo)=Komo (Democratic Republic of Congo) -controlledvocabulary.language.Komo_(Sudan)=Komo (Sudan) -controlledvocabulary.language.Komodo=Komodo -controlledvocabulary.language.Kompane=Kompane -controlledvocabulary.language.Komyandaret=Komyandaret -controlledvocabulary.language.Kon_Keu=Kon Keu -controlledvocabulary.language.Konai=Konai -controlledvocabulary.language.Konda=Konda -controlledvocabulary.language.Konda-Dora=Konda-Dora -controlledvocabulary.language.Koneraw=Koneraw -controlledvocabulary.language.Kongo=Kongo -controlledvocabulary.language.Konkani_(individual_language)=Konkani (individual language) -controlledvocabulary.language.Konkani_(macrolanguage)=Konkani (macrolanguage) -controlledvocabulary.language.Konkomba=Konkomba -controlledvocabulary.language.Konni=Konni -controlledvocabulary.language.Kono_(Guinea)=Kono (Guinea) -controlledvocabulary.language.Kono_(Nigeria)=Kono (Nigeria) -controlledvocabulary.language.Kono_(Sierra_Leone)=Kono (Sierra Leone) -controlledvocabulary.language.Konomala=Konomala -controlledvocabulary.language.Konongo=Konongo -controlledvocabulary.language.Konso=Konso -controlledvocabulary.language.Konyak_Naga=Konyak Naga -controlledvocabulary.language.Konyanka_Maninka=Konyanka Maninka -controlledvocabulary.language.Konzo=Konzo -controlledvocabulary.language.Koongo=Koongo -controlledvocabulary.language.Koonzime=Koonzime -controlledvocabulary.language.Koorete=Koorete -controlledvocabulary.language.Kopar=Kopar -controlledvocabulary.language.Kopkaka=Kopkaka -controlledvocabulary.language.Korafe-Yegha=Korafe-Yegha -controlledvocabulary.language.Korak=Korak -controlledvocabulary.language.Korana=Korana -controlledvocabulary.language.Korandje=Korandje -controlledvocabulary.language.Korean=Korean -controlledvocabulary.language.Korean_Sign_Language=Korean Sign Language -controlledvocabulary.language.Koreguaje=Koreguaje -controlledvocabulary.language.Koresh-e_Rostam=Koresh-e Rostam -controlledvocabulary.language.Korku=Korku -controlledvocabulary.language.Korlai_Creole_Portuguese=Korlai Creole Portuguese -controlledvocabulary.language.Koro_(C�te_d'Ivoire)=Koro (C�te d'Ivoire) -controlledvocabulary.language.Koro_(India)=Koro (India) -controlledvocabulary.language.Koro_(Papua_New_Guinea)=Koro (Papua New Guinea) -controlledvocabulary.language.Koro_(Vanuatu)=Koro (Vanuatu) -controlledvocabulary.language.Koro_Nulu=Koro Nulu -controlledvocabulary.language.Koro_Wachi=Koro Wachi -controlledvocabulary.language.Koro_Zuba=Koro Zuba -controlledvocabulary.language.Koromf�=Koromf� -controlledvocabulary.language.Koromira=Koromira -controlledvocabulary.language.Koronadal_Blaan=Koronadal Blaan -controlledvocabulary.language.Koroni=Koroni -controlledvocabulary.language.Korop�=Korop� -controlledvocabulary.language.Koroshi=Koroshi -controlledvocabulary.language.Korowai=Korowai -controlledvocabulary.language.Korra_Koraga=Korra Koraga -controlledvocabulary.language.Korubo=Korubo -controlledvocabulary.language.Korupun-Sela=Korupun-Sela -controlledvocabulary.language.Korwa=Korwa -controlledvocabulary.language.Koryak=Koryak -controlledvocabulary.language.Kosadle=Kosadle -controlledvocabulary.language.Kosarek_Yale=Kosarek Yale -controlledvocabulary.language.Kosena=Kosena -controlledvocabulary.language.Koshin=Koshin -controlledvocabulary.language.Kosraean=Kosraean -controlledvocabulary.language.Kota_(Gabon)=Kota (Gabon) -controlledvocabulary.language.Kota_(India)=Kota (India) -controlledvocabulary.language.Kota_Bangun_Kutai_Malay=Kota Bangun Kutai Malay -controlledvocabulary.language.Kota_Marudu_Talantang=Kota Marudu Talantang -controlledvocabulary.language.Kotafon_Gbe=Kotafon Gbe -controlledvocabulary.language.Kotava=Kotava -controlledvocabulary.language.Koti=Koti -controlledvocabulary.language.Kott=Kott -controlledvocabulary.language.Kou=Kou -controlledvocabulary.language.Kouya=Kouya -controlledvocabulary.language.Kovai=Kovai -controlledvocabulary.language.Kove=Kove -controlledvocabulary.language.Kowaki=Kowaki -controlledvocabulary.language.Kowiai=Kowiai -controlledvocabulary.language.Koy_Sanjaq_Surat=Koy Sanjaq Surat -controlledvocabulary.language.Koya=Koya -controlledvocabulary.language.Koyaga=Koyaga -controlledvocabulary.language.Koyo=Koyo -controlledvocabulary.language.Koyra_Chiini_Songhay=Koyra Chiini Songhay -controlledvocabulary.language.Koyraboro_Senni_Songhai=Koyraboro Senni Songhai -controlledvocabulary.language.Koyukon=Koyukon -controlledvocabulary.language.Kpagua=Kpagua -controlledvocabulary.language.Kpala=Kpala -controlledvocabulary.language.Kpan=Kpan -controlledvocabulary.language.Kpasam=Kpasam -controlledvocabulary.language.Kpati=Kpati -controlledvocabulary.language.Kpatili=Kpatili -controlledvocabulary.language.Kpeego=Kpeego -controlledvocabulary.language.Kpelle=Kpelle -controlledvocabulary.language.Kpessi=Kpessi -controlledvocabulary.language.Kplang=Kplang -controlledvocabulary.language.Krache=Krache -controlledvocabulary.language.Krah�=Krah� -controlledvocabulary.language.Kraol=Kraol -controlledvocabulary.language.Krenak=Krenak -controlledvocabulary.language.Krevinian=Krevinian -controlledvocabulary.language.Kreye=Kreye -controlledvocabulary.language.Kriang=Kriang -controlledvocabulary.language.Krikati-Timbira=Krikati-Timbira -controlledvocabulary.language.Krio=Krio -controlledvocabulary.language.Kriol=Kriol -controlledvocabulary.language.Krisa=Krisa -controlledvocabulary.language.Krobu=Krobu -controlledvocabulary.language.Krongo=Krongo -controlledvocabulary.language.Krung=Krung -controlledvocabulary.language.Krymchak=Krymchak -controlledvocabulary.language.Kryts=Kryts -controlledvocabulary.language.Kua=Kua -controlledvocabulary.language.Kua-nsi=Kua-nsi -controlledvocabulary.language.Kuamasi=Kuamasi -controlledvocabulary.language.Kuan=Kuan -controlledvocabulary.language.Kuanhua=Kuanhua -controlledvocabulary.language.Kuanua=Kuanua -controlledvocabulary.language.Kuanyama,_Kwanyama=Kuanyama, Kwanyama -controlledvocabulary.language.Kubachi=Kubachi -controlledvocabulary.language.Kube=Kube -controlledvocabulary.language.Kubi=Kubi -controlledvocabulary.language.Kubo=Kubo -controlledvocabulary.language.Kubu=Kubu -controlledvocabulary.language.Kucong=Kucong -controlledvocabulary.language.Kudiya=Kudiya -controlledvocabulary.language.Kudmali=Kudmali -controlledvocabulary.language.Kudu-Camo=Kudu-Camo -controlledvocabulary.language.Kufr_Qassem_Sign_Language_(KQSL)=Kufr Qassem Sign Language (KQSL) -controlledvocabulary.language.Kugama=Kugama -controlledvocabulary.language.Kugbo=Kugbo -controlledvocabulary.language.Kugu-Muminh=Kugu-Muminh -controlledvocabulary.language.Kui_(India)=Kui (India) -controlledvocabulary.language.Kui_(Indonesia)=Kui (Indonesia) -controlledvocabulary.language.Kuijau=Kuijau -controlledvocabulary.language.Kuik�ro-Kalap�lo=Kuik�ro-Kalap�lo -controlledvocabulary.language.Kujarge=Kujarge -controlledvocabulary.language.Kuk=Kuk -controlledvocabulary.language.Kukatja=Kukatja -controlledvocabulary.language.Kuke=Kuke -controlledvocabulary.language.Kukele=Kukele -controlledvocabulary.language.Kukna=Kukna -controlledvocabulary.language.Kuku=Kuku -controlledvocabulary.language.Kuku-Mangk=Kuku-Mangk -controlledvocabulary.language.Kuku-Mu'inh=Kuku-Mu'inh -controlledvocabulary.language.Kuku-Ugbanh=Kuku-Ugbanh -controlledvocabulary.language.Kuku-Uwanh=Kuku-Uwanh -controlledvocabulary.language.Kuku-Yalanji=Kuku-Yalanji -controlledvocabulary.language.Kula=Kula -controlledvocabulary.language.Kulere=Kulere -controlledvocabulary.language.Kulfa=Kulfa -controlledvocabulary.language.Kulina_Pano=Kulina Pano -controlledvocabulary.language.Kulisusu=Kulisusu -controlledvocabulary.language.Kullu_Pahari=Kullu Pahari -controlledvocabulary.language.Kulon=Kulon -controlledvocabulary.language.Kulung_(Nepal)=Kulung (Nepal) -controlledvocabulary.language.Kulung_(Nigeria)=Kulung (Nigeria) -controlledvocabulary.language.Kumalu=Kumalu -controlledvocabulary.language.Kumam=Kumam -controlledvocabulary.language.Kuman_(Papua_New_Guinea)=Kuman (Papua New Guinea) -controlledvocabulary.language.Kuman_(Russia)=Kuman (Russia) -controlledvocabulary.language.Kumaoni=Kumaoni -controlledvocabulary.language.Kumarbhag_Paharia=Kumarbhag Paharia -controlledvocabulary.language.Kumba=Kumba -controlledvocabulary.language.Kumbainggar=Kumbainggar -controlledvocabulary.language.Kumbaran=Kumbaran -controlledvocabulary.language.Kumbewaha=Kumbewaha -controlledvocabulary.language.Kumhali=Kumhali -controlledvocabulary.language.Kumiai=Kumiai -controlledvocabulary.language.Kumukio=Kumukio -controlledvocabulary.language.Kumyk=Kumyk -controlledvocabulary.language.Kumzari=Kumzari -controlledvocabulary.language.Kunama=Kunama -controlledvocabulary.language.Kunbarlang=Kunbarlang -controlledvocabulary.language.Kunda=Kunda -controlledvocabulary.language.Kundal_Shahi=Kundal Shahi -controlledvocabulary.language.Kunduvadi=Kunduvadi -controlledvocabulary.language.Kung=Kung -controlledvocabulary.language.Kung-Ekoka=Kung-Ekoka -controlledvocabulary.language.Kungarakany=Kungarakany -controlledvocabulary.language.Kungardutyi=Kungardutyi -controlledvocabulary.language.Kunggari=Kunggari -controlledvocabulary.language.Kungkari=Kungkari -controlledvocabulary.language.Kuni=Kuni -controlledvocabulary.language.Kuni-Boazi=Kuni-Boazi -controlledvocabulary.language.Kunigami=Kunigami -controlledvocabulary.language.Kunimaipa=Kunimaipa -controlledvocabulary.language.Kunja=Kunja -controlledvocabulary.language.Kunjen=Kunjen -controlledvocabulary.language.Kunyi=Kunyi -controlledvocabulary.language.Kunza=Kunza -controlledvocabulary.language.Kuo=Kuo -controlledvocabulary.language.Kuot=Kuot -controlledvocabulary.language.Kupa=Kupa -controlledvocabulary.language.Kupang_Malay=Kupang Malay -controlledvocabulary.language.Kupia=Kupia -controlledvocabulary.language.Kupsabiny=Kupsabiny -controlledvocabulary.language.Kur=Kur -controlledvocabulary.language.Kura_Ede_Nago=Kura Ede Nago -controlledvocabulary.language.Kurama=Kurama -controlledvocabulary.language.Kuranko=Kuranko -controlledvocabulary.language.Kurdish=Kurdish -controlledvocabulary.language.Kuri=Kuri -controlledvocabulary.language.Kuria=Kuria -controlledvocabulary.language.Kurichiya=Kurichiya -controlledvocabulary.language.Kurmukar=Kurmukar -controlledvocabulary.language.Kurnai=Kurnai -controlledvocabulary.language.Kurrama=Kurrama -controlledvocabulary.language.Kurti=Kurti -controlledvocabulary.language.Kurtokha=Kurtokha -controlledvocabulary.language.Kurudu=Kurudu -controlledvocabulary.language.Kurukh=Kurukh -controlledvocabulary.language.Kuru�ya=Kuru�ya -controlledvocabulary.language.Kusaal=Kusaal -controlledvocabulary.language.Kusaghe=Kusaghe -controlledvocabulary.language.Kushi=Kushi -controlledvocabulary.language.Kusu=Kusu -controlledvocabulary.language.Kusunda=Kusunda -controlledvocabulary.language.Kutenai=Kutenai -controlledvocabulary.language.Kutep=Kutep -controlledvocabulary.language.Kuthant=Kuthant -controlledvocabulary.language.Kutong=Kutong -controlledvocabulary.language.Kutto=Kutto -controlledvocabulary.language.Kutu=Kutu -controlledvocabulary.language.Kuturmi=Kuturmi -controlledvocabulary.language.Kuuk_Thaayorre=Kuuk Thaayorre -controlledvocabulary.language.Kuuk-Yak=Kuuk-Yak -controlledvocabulary.language.Kuuku-Ya'u=Kuuku-Ya'u -controlledvocabulary.language.Kuvale=Kuvale -controlledvocabulary.language.Kuvi=Kuvi -controlledvocabulary.language.Kuwaa=Kuwaa -controlledvocabulary.language.Kuwaataay=Kuwaataay -controlledvocabulary.language.Kuwema=Kuwema -controlledvocabulary.language.Kuy=Kuy -controlledvocabulary.language.Kven_Finnish=Kven Finnish -controlledvocabulary.language.Kw'adza=Kw'adza -controlledvocabulary.language.Kwa=Kwa -controlledvocabulary.language.Kwa'=Kwa' -controlledvocabulary.language.Kwaami=Kwaami -controlledvocabulary.language.Kwadi=Kwadi -controlledvocabulary.language.Kwaio=Kwaio -controlledvocabulary.language.Kwaja=Kwaja -controlledvocabulary.language.Kwakiutl=Kwakiutl -controlledvocabulary.language.Kwakum=Kwakum -controlledvocabulary.language.Kwalhioqua-Tlatskanai=Kwalhioqua-Tlatskanai -controlledvocabulary.language.Kwama=Kwama -controlledvocabulary.language.Kwambi=Kwambi -controlledvocabulary.language.Kwamera=Kwamera -controlledvocabulary.language.Kwami=Kwami -controlledvocabulary.language.Kwamtim_One=Kwamtim One -controlledvocabulary.language.Kwandu=Kwandu -controlledvocabulary.language.Kwang=Kwang -controlledvocabulary.language.Kwanga=Kwanga -controlledvocabulary.language.Kwangali=Kwangali -controlledvocabulary.language.Kwanja=Kwanja -controlledvocabulary.language.Kwara'ae=Kwara'ae -controlledvocabulary.language.Kwasio=Kwasio -controlledvocabulary.language.Kwaya=Kwaya -controlledvocabulary.language.Kwaza=Kwaza -controlledvocabulary.language.Kwegu=Kwegu -controlledvocabulary.language.Kwer=Kwer -controlledvocabulary.language.Kwerba=Kwerba -controlledvocabulary.language.Kwerba_Mamberamo=Kwerba Mamberamo -controlledvocabulary.language.Kwere=Kwere -controlledvocabulary.language.Kwerisa=Kwerisa -controlledvocabulary.language.Kwese=Kwese -controlledvocabulary.language.Kwesten=Kwesten -controlledvocabulary.language.Kwini=Kwini -controlledvocabulary.language.Kwinsu=Kwinsu -controlledvocabulary.language.Kwinti=Kwinti -controlledvocabulary.language.Kwoma=Kwoma -controlledvocabulary.language.Kwomtari=Kwomtari -controlledvocabulary.language.Kxoe=Kxoe -controlledvocabulary.language.Kyak=Kyak -controlledvocabulary.language.Kyaka=Kyaka -controlledvocabulary.language.Kyan-Karyaw_Naga=Kyan-Karyaw Naga -controlledvocabulary.language.Kyanga=Kyanga -controlledvocabulary.language.Kyenele=Kyenele -controlledvocabulary.language.Kyerung=Kyerung -controlledvocabulary.language.K�te=K�te -controlledvocabulary.language.K�l�=K�l� -controlledvocabulary.language.K�lsch=K�lsch -controlledvocabulary.language.Klngaxo_Bozo=K?l?ngaxo Bozo -controlledvocabulary.language.La'bi=La'bi -controlledvocabulary.language.Laal=Laal -controlledvocabulary.language.Laari=Laari -controlledvocabulary.language.Laarim=Laarim -controlledvocabulary.language.Laba=Laba -controlledvocabulary.language.Label=Label -controlledvocabulary.language.Labir=Labir -controlledvocabulary.language.Labo=Labo -controlledvocabulary.language.Labo_Phowa=Labo Phowa -controlledvocabulary.language.Labu=Labu -controlledvocabulary.language.Labuk-Kinabatangan_Kadazan=Labuk-Kinabatangan Kadazan -controlledvocabulary.language.Lacandon=Lacandon -controlledvocabulary.language.Lachi=Lachi -controlledvocabulary.language.Lachiguiri_Zapotec=Lachiguiri Zapotec -controlledvocabulary.language.Lachix�o_Zapotec=Lachix�o Zapotec -controlledvocabulary.language.Ladakhi=Ladakhi -controlledvocabulary.language.Ladin=Ladin -controlledvocabulary.language.Ladino=Ladino -controlledvocabulary.language.Ladji_Ladji=Ladji Ladji -controlledvocabulary.language.Laeko-Libuat=Laeko-Libuat -controlledvocabulary.language.Lafofa=Lafofa -controlledvocabulary.language.Laghu=Laghu -controlledvocabulary.language.Laghuu=Laghuu -controlledvocabulary.language.Lagwan=Lagwan -controlledvocabulary.language.Laha_(Indonesia)=Laha (Indonesia) -controlledvocabulary.language.Laha_(Viet_Nam)=Laha (Viet Nam) -controlledvocabulary.language.Lahanan=Lahanan -controlledvocabulary.language.Lahnda=Lahnda -controlledvocabulary.language.Lahta_Karen=Lahta Karen -controlledvocabulary.language.Lahu=Lahu -controlledvocabulary.language.Lahu_Shi=Lahu Shi -controlledvocabulary.language.Lahul_Lohar=Lahul Lohar -controlledvocabulary.language.Laimbue=Laimbue -controlledvocabulary.language.Laitu_Chin=Laitu Chin -controlledvocabulary.language.Laiyolo=Laiyolo -controlledvocabulary.language.Lak=Lak -controlledvocabulary.language.Laka_(Chad)=Laka (Chad) -controlledvocabulary.language.Lakalei=Lakalei -controlledvocabulary.language.Lake_Miwok=Lake Miwok -controlledvocabulary.language.Lakha=Lakha -controlledvocabulary.language.Laki=Laki -controlledvocabulary.language.Lakkia=Lakkia -controlledvocabulary.language.Lakon=Lakon -controlledvocabulary.language.Lakond�=Lakond� -controlledvocabulary.language.Lakota=Lakota -controlledvocabulary.language.Lakota_Dida=Lakota Dida -controlledvocabulary.language.Lakurumau=Lakurumau -controlledvocabulary.language.Lala=Lala -controlledvocabulary.language.Lala-Bisa=Lala-Bisa -controlledvocabulary.language.Lala-Roba=Lala-Roba -controlledvocabulary.language.Lalana_Chinantec=Lalana Chinantec -controlledvocabulary.language.Lalia=Lalia -controlledvocabulary.language.Lama_(Togo)=Lama (Togo) -controlledvocabulary.language.Lama_Bai=Lama Bai -controlledvocabulary.language.Lamaholot=Lamaholot -controlledvocabulary.language.Lamalama=Lamalama -controlledvocabulary.language.Lamalera=Lamalera -controlledvocabulary.language.Lamang=Lamang -controlledvocabulary.language.Lamatuka=Lamatuka -controlledvocabulary.language.Lamba=Lamba -controlledvocabulary.language.Lambadi=Lambadi -controlledvocabulary.language.Lambayeque_Quechua=Lambayeque Quechua -controlledvocabulary.language.Lambichhong=Lambichhong -controlledvocabulary.language.Lamboya=Lamboya -controlledvocabulary.language.Lambya=Lambya -controlledvocabulary.language.Lame=Lame -controlledvocabulary.language.Lamenu=Lamenu -controlledvocabulary.language.Lamja-Dengsa-Tola=Lamja-Dengsa-Tola -controlledvocabulary.language.Lamkang=Lamkang -controlledvocabulary.language.Lamma=Lamma -controlledvocabulary.language.Lamnso'=Lamnso' -controlledvocabulary.language.Lamogai=Lamogai -controlledvocabulary.language.Lampung_Api=Lampung Api -controlledvocabulary.language.Lampung_Nyo=Lampung Nyo -controlledvocabulary.language.Lamu=Lamu -controlledvocabulary.language.Lanas_Lobu=Lanas Lobu -controlledvocabulary.language.Landoma=Landoma -controlledvocabulary.language.Lang'e=Lang'e -controlledvocabulary.language.Langam=Langam -controlledvocabulary.language.Langbashe=Langbashe -controlledvocabulary.language.Langnian_Buyang=Langnian Buyang -controlledvocabulary.language.Lango_(South_Sudan)=Lango (South Sudan) -controlledvocabulary.language.Lango_(Uganda)=Lango (Uganda) -controlledvocabulary.language.Langobardic=Langobardic -controlledvocabulary.language.Langue_des_signes_de_Belgique_Francophone=Langue des signes de Belgique Francophone -controlledvocabulary.language.Lanima=Lanima -controlledvocabulary.language.Lanoh=Lanoh -controlledvocabulary.language.Lao=Lao -controlledvocabulary.language.Lao_Naga=Lao Naga -controlledvocabulary.language.Laomian=Laomian -controlledvocabulary.language.Laopang=Laopang -controlledvocabulary.language.Laos_Sign_Language=Laos Sign Language -controlledvocabulary.language.Lapagu�a-Guivini_Zapotec=Lapagu�a-Guivini Zapotec -controlledvocabulary.language.Laragia=Laragia -controlledvocabulary.language.Larantuka_Malay=Larantuka Malay -controlledvocabulary.language.Lardil=Lardil -controlledvocabulary.language.Larevat=Larevat -controlledvocabulary.language.Large_Flowery_Miao=Large Flowery Miao -controlledvocabulary.language.Lari=Lari -controlledvocabulary.language.Larike-Wakasihu=Larike-Wakasihu -controlledvocabulary.language.Laro=Laro -controlledvocabulary.language.Larteh=Larteh -controlledvocabulary.language.Laru=Laru -controlledvocabulary.language.Las_Delicias_Zapotec=Las Delicias Zapotec -controlledvocabulary.language.Lasalimu=Lasalimu -controlledvocabulary.language.Lasgerdi=Lasgerdi -controlledvocabulary.language.Lashi=Lashi -controlledvocabulary.language.Lasi=Lasi -controlledvocabulary.language.Late_Middle_Chinese=Late Middle Chinese -controlledvocabulary.language.Latgalian=Latgalian -controlledvocabulary.language.Latin=Latin -controlledvocabulary.language.Latu=Latu -controlledvocabulary.language.Latund�=Latund� -controlledvocabulary.language.Latvian=Latvian -controlledvocabulary.language.Latvian_Sign_Language=Latvian Sign Language -controlledvocabulary.language.Lau=Lau -controlledvocabulary.language.Laua=Laua -controlledvocabulary.language.Lauan=Lauan -controlledvocabulary.language.Lauje=Lauje -controlledvocabulary.language.Laura=Laura -controlledvocabulary.language.Laurentian=Laurentian -controlledvocabulary.language.Lautu_Chin=Lautu Chin -controlledvocabulary.language.Lavatbura-Lamusong=Lavatbura-Lamusong -controlledvocabulary.language.Laven=Laven -controlledvocabulary.language.Lavi=Lavi -controlledvocabulary.language.Lavukaleve=Lavukaleve -controlledvocabulary.language.Lawangan=Lawangan -controlledvocabulary.language.Lawu=Lawu -controlledvocabulary.language.Lawunuia=Lawunuia -controlledvocabulary.language.Layakha=Layakha -controlledvocabulary.language.Laz=Laz -controlledvocabulary.language.Lealao_Chinantec=Lealao Chinantec -controlledvocabulary.language.Leco=Leco -controlledvocabulary.language.Ledo_Kaili=Ledo Kaili -controlledvocabulary.language.Leelau=Leelau -controlledvocabulary.language.Lefa=Lefa -controlledvocabulary.language.Lega-Mwenga=Lega-Mwenga -controlledvocabulary.language.Lega-Shabunda=Lega-Shabunda -controlledvocabulary.language.Legbo=Legbo -controlledvocabulary.language.Legenyem=Legenyem -controlledvocabulary.language.Lehali=Lehali -controlledvocabulary.language.Lehalurup=Lehalurup -controlledvocabulary.language.Lehar=Lehar -controlledvocabulary.language.Leinong_Naga=Leinong Naga -controlledvocabulary.language.Leipon=Leipon -controlledvocabulary.language.Lelak=Lelak -controlledvocabulary.language.Lele_(Chad)=Lele (Chad) -controlledvocabulary.language.Lele_(Democratic_Republic_of_Congo)=Lele (Democratic Republic of Congo) -controlledvocabulary.language.Lele_(Guinea)=Lele (Guinea) -controlledvocabulary.language.Lele_(Papua_New_Guinea)=Lele (Papua New Guinea) -controlledvocabulary.language.Lelemi=Lelemi -controlledvocabulary.language.Lelepa=Lelepa -controlledvocabulary.language.Lembena=Lembena -controlledvocabulary.language.Lemerig=Lemerig -controlledvocabulary.language.Lemio=Lemio -controlledvocabulary.language.Lemnian=Lemnian -controlledvocabulary.language.Lemolang=Lemolang -controlledvocabulary.language.Lemoro=Lemoro -controlledvocabulary.language.Lenakel=Lenakel -controlledvocabulary.language.Lenca=Lenca -controlledvocabulary.language.Lendu=Lendu -controlledvocabulary.language.Lengilu=Lengilu -controlledvocabulary.language.Lengo=Lengo -controlledvocabulary.language.Lengola=Lengola -controlledvocabulary.language.Leningitij=Leningitij -controlledvocabulary.language.Lenje=Lenje -controlledvocabulary.language.Lenkau=Lenkau -controlledvocabulary.language.Lenyima=Lenyima -controlledvocabulary.language.Lepcha=Lepcha -controlledvocabulary.language.Lepki=Lepki -controlledvocabulary.language.Lepontic=Lepontic -controlledvocabulary.language.Lere=Lere -controlledvocabulary.language.Lese=Lese -controlledvocabulary.language.Lesing-Gelimi=Lesing-Gelimi -controlledvocabulary.language.Letemboi=Letemboi -controlledvocabulary.language.Leti_(Cameroon)=Leti (Cameroon) -controlledvocabulary.language.Leti_(Indonesia)=Leti (Indonesia) -controlledvocabulary.language.Levantine_Arabic=Levantine Arabic -controlledvocabulary.language.Levuka=Levuka -controlledvocabulary.language.Lewo=Lewo -controlledvocabulary.language.Lewo_Eleng=Lewo Eleng -controlledvocabulary.language.Lewotobi=Lewotobi -controlledvocabulary.language.Leyigha=Leyigha -controlledvocabulary.language.Lezghian=Lezghian -controlledvocabulary.language.Lhokpu=Lhokpu -controlledvocabulary.language.Lhomi=Lhomi -controlledvocabulary.language.Li'o=Li'o -controlledvocabulary.language.Liabuku=Liabuku -controlledvocabulary.language.Liana-Seti=Liana-Seti -controlledvocabulary.language.Liangmai_Naga=Liangmai Naga -controlledvocabulary.language.Lianshan_Zhuang=Lianshan Zhuang -controlledvocabulary.language.Liberia_Kpelle=Liberia Kpelle -controlledvocabulary.language.Liberian_English=Liberian English -controlledvocabulary.language.Libido=Libido -controlledvocabulary.language.Libinza=Libinza -controlledvocabulary.language.Libon_Bikol=Libon Bikol -controlledvocabulary.language.Liburnian=Liburnian -controlledvocabulary.language.Libyan_Arabic=Libyan Arabic -controlledvocabulary.language.Libyan_Sign_Language=Libyan Sign Language -controlledvocabulary.language.Lidzonka=Lidzonka -controlledvocabulary.language.Ligbi=Ligbi -controlledvocabulary.language.Ligenza=Ligenza -controlledvocabulary.language.Ligurian=Ligurian -controlledvocabulary.language.Ligurian_(Ancient)=Ligurian (Ancient) -controlledvocabulary.language.Lihir=Lihir -controlledvocabulary.language.Lijili=Lijili -controlledvocabulary.language.Lika=Lika -controlledvocabulary.language.Liki=Liki -controlledvocabulary.language.Likila=Likila -controlledvocabulary.language.Likuba=Likuba -controlledvocabulary.language.Likum=Likum -controlledvocabulary.language.Likwala=Likwala -controlledvocabulary.language.Lilau=Lilau -controlledvocabulary.language.Lillooet=Lillooet -controlledvocabulary.language.Limassa=Limassa -controlledvocabulary.language.Limbu=Limbu -controlledvocabulary.language.Limbum=Limbum -controlledvocabulary.language.Limburgan,_Limburger,_Limburgish=Limburgan, Limburger, Limburgish -controlledvocabulary.language.Limi=Limi -controlledvocabulary.language.Limilngan=Limilngan -controlledvocabulary.language.Limos_Kalinga=Limos Kalinga -controlledvocabulary.language.Linear_A=Linear A -controlledvocabulary.language.Lingala=Lingala -controlledvocabulary.language.Lingao=Lingao -controlledvocabulary.language.Lingarak=Lingarak -controlledvocabulary.language.Lingua_Franca=Lingua Franca -controlledvocabulary.language.Lingua_Franca_Nova=Lingua Franca Nova -controlledvocabulary.language.Lipan_Apache=Lipan Apache -controlledvocabulary.language.Lipo=Lipo -controlledvocabulary.language.Lisabata-Nuniali=Lisabata-Nuniali -controlledvocabulary.language.Lisela=Lisela -controlledvocabulary.language.Lish=Lish -controlledvocabulary.language.Lishana_Deni=Lishana Deni -controlledvocabulary.language.Lishanid_Noshan=Lishanid Noshan -controlledvocabulary.language.Lish�n_Did�n=Lish�n Did�n -controlledvocabulary.language.Lisu=Lisu -controlledvocabulary.language.Literary_Chinese=Literary Chinese -controlledvocabulary.language.Lithuanian=Lithuanian -controlledvocabulary.language.Lithuanian_Sign_Language=Lithuanian Sign Language -controlledvocabulary.language.Litzlitz=Litzlitz -controlledvocabulary.language.Liujiang_Zhuang=Liujiang Zhuang -controlledvocabulary.language.Liuqian_Zhuang=Liuqian Zhuang -controlledvocabulary.language.Liv=Liv -controlledvocabulary.language.Livvi=Livvi -controlledvocabulary.language.Lo-Toga=Lo-Toga -controlledvocabulary.language.Loarki=Loarki -controlledvocabulary.language.Lobala=Lobala -controlledvocabulary.language.Lobi=Lobi -controlledvocabulary.language.Lodhi=Lodhi -controlledvocabulary.language.Logba=Logba -controlledvocabulary.language.Logir=Logir -controlledvocabulary.language.Logo=Logo -controlledvocabulary.language.Logol=Logol -controlledvocabulary.language.Logooli=Logooli -controlledvocabulary.language.Logorik=Logorik -controlledvocabulary.language.Lohorung=Lohorung -controlledvocabulary.language.Loja_Highland_Quichua=Loja Highland Quichua -controlledvocabulary.language.Lojban=Lojban -controlledvocabulary.language.Lokaa=Lokaa -controlledvocabulary.language.Loke=Loke -controlledvocabulary.language.Loko=Loko -controlledvocabulary.language.Lokoya=Lokoya -controlledvocabulary.language.Lola=Lola -controlledvocabulary.language.Lolak=Lolak -controlledvocabulary.language.Lole=Lole -controlledvocabulary.language.Lolo=Lolo -controlledvocabulary.language.Loloda=Loloda -controlledvocabulary.language.Lolopo=Lolopo -controlledvocabulary.language.Loma_(C�te_d'Ivoire)=Loma (C�te d'Ivoire) -controlledvocabulary.language.Loma_(Liberia)=Loma (Liberia) -controlledvocabulary.language.Lomaiviti=Lomaiviti -controlledvocabulary.language.Lomavren=Lomavren -controlledvocabulary.language.Lombard=Lombard -controlledvocabulary.language.Lombi=Lombi -controlledvocabulary.language.Lombo=Lombo -controlledvocabulary.language.Lomwe=Lomwe -controlledvocabulary.language.Loncong=Loncong -controlledvocabulary.language.Long_Phuri_Naga=Long Phuri Naga -controlledvocabulary.language.Long_Wat=Long Wat -controlledvocabulary.language.Longgu=Longgu -controlledvocabulary.language.Longto=Longto -controlledvocabulary.language.Longuda=Longuda -controlledvocabulary.language.Loniu=Loniu -controlledvocabulary.language.Lonwolwol=Lonwolwol -controlledvocabulary.language.Lonzo=Lonzo -controlledvocabulary.language.Loo=Loo -controlledvocabulary.language.Lopa=Lopa -controlledvocabulary.language.Lopi=Lopi -controlledvocabulary.language.Lopit=Lopit -controlledvocabulary.language.Lorang=Lorang -controlledvocabulary.language.Lorediakarkar=Lorediakarkar -controlledvocabulary.language.Loreto-Ucayali_Spanish=Loreto-Ucayali Spanish -controlledvocabulary.language.Lote=Lote -controlledvocabulary.language.Lotha_Naga=Lotha Naga -controlledvocabulary.language.Lotud=Lotud -controlledvocabulary.language.Lou=Lou -controlledvocabulary.language.Louisiana_Creole=Louisiana Creole -controlledvocabulary.language.Loun=Loun -controlledvocabulary.language.Loup_A=Loup A -controlledvocabulary.language.Loup_B=Loup B -controlledvocabulary.language.Low_German=Low German -controlledvocabulary.language.Lower_Burdekin=Lower Burdekin -controlledvocabulary.language.Lower_Chehalis=Lower Chehalis -controlledvocabulary.language.Lower_Grand_Valley_Dani=Lower Grand Valley Dani -controlledvocabulary.language.Lower_Nossob=Lower Nossob -controlledvocabulary.language.Lower_Silesian=Lower Silesian -controlledvocabulary.language.Lower_Sorbian=Lower Sorbian -controlledvocabulary.language.Lower_Southern_Aranda=Lower Southern Aranda -controlledvocabulary.language.Lower_Ta'oih=Lower Ta'oih -controlledvocabulary.language.Lower_Tanana=Lower Tanana -controlledvocabulary.language.Lowland_Oaxaca_Chontal=Lowland Oaxaca Chontal -controlledvocabulary.language.Lowland_Tarahumara=Lowland Tarahumara -controlledvocabulary.language.Loxicha_Zapotec=Loxicha Zapotec -controlledvocabulary.language.Lozi=Lozi -controlledvocabulary.language.Luang=Luang -controlledvocabulary.language.Luba-Katanga=Luba-Katanga -controlledvocabulary.language.Luba-Lulua=Luba-Lulua -controlledvocabulary.language.Lubila=Lubila -controlledvocabulary.language.Lubu=Lubu -controlledvocabulary.language.Lubuagan_Kalinga=Lubuagan Kalinga -controlledvocabulary.language.Luchazi=Luchazi -controlledvocabulary.language.Lucumi=Lucumi -controlledvocabulary.language.Ludian=Ludian -controlledvocabulary.language.Lufu=Lufu -controlledvocabulary.language.Lugbara=Lugbara -controlledvocabulary.language.Luguru=Luguru -controlledvocabulary.language.Luhu=Luhu -controlledvocabulary.language.Luimbi=Luimbi -controlledvocabulary.language.Luiseno=Luiseno -controlledvocabulary.language.Lukpa=Lukpa -controlledvocabulary.language.Lule=Lule -controlledvocabulary.language.Lule_Sami=Lule Sami -controlledvocabulary.language.Lumba-Yakkha=Lumba-Yakkha -controlledvocabulary.language.Lumbu=Lumbu -controlledvocabulary.language.Lumun=Lumun -controlledvocabulary.language.Luna=Luna -controlledvocabulary.language.Lunanakha=Lunanakha -controlledvocabulary.language.Lunda=Lunda -controlledvocabulary.language.Lundayeh=Lundayeh -controlledvocabulary.language.Lungalunga=Lungalunga -controlledvocabulary.language.Lungga=Lungga -controlledvocabulary.language.Luo_(Cameroon)=Luo (Cameroon) -controlledvocabulary.language.Luo_(Kenya_and_Tanzania)=Luo (Kenya and Tanzania) -controlledvocabulary.language.Luopohe_Hmong=Luopohe Hmong -controlledvocabulary.language.Luri=Luri -controlledvocabulary.language.Lusengo=Lusengo -controlledvocabulary.language.Lushai=Lushai -controlledvocabulary.language.Lushootseed=Lushootseed -controlledvocabulary.language.Lusi=Lusi -controlledvocabulary.language.Lusitanian=Lusitanian -controlledvocabulary.language.Lutos=Lutos -controlledvocabulary.language.Luvale=Luvale -controlledvocabulary.language.Luwati=Luwati -controlledvocabulary.language.Luwo=Luwo -controlledvocabulary.language.Luxembourgish,_Letzeburgesch=Luxembourgish, Letzeburgesch -controlledvocabulary.language.Luyana=Luyana -controlledvocabulary.language.Luyia=Luyia -controlledvocabulary.language.Lwalu=Lwalu -controlledvocabulary.language.Lwel=Lwel -controlledvocabulary.language.Lycian=Lycian -controlledvocabulary.language.Lydian=Lydian -controlledvocabulary.language.Lyngngam=Lyngngam -controlledvocabulary.language.Ly�l�=Ly�l� -controlledvocabulary.language.L�adan=L�adan -controlledvocabulary.language.L��_L��_Bwamu=L�� L�� Bwamu -controlledvocabulary.language.L�=L� -controlledvocabulary.language.Ma_(Democratic_Republic_of_Congo)=Ma (Democratic Republic of Congo) -controlledvocabulary.language.Ma_(Papua_New_Guinea)=Ma (Papua New Guinea) -controlledvocabulary.language.Ma_Manda=Ma Manda -controlledvocabulary.language.Ma'anyan=Ma'anyan -controlledvocabulary.language.Ma'di=Ma'di -controlledvocabulary.language.Ma'ya=Ma'ya -controlledvocabulary.language.Maa=Maa -controlledvocabulary.language.Maaka=Maaka -controlledvocabulary.language.Maasina_Fulfulde=Maasina Fulfulde -controlledvocabulary.language.Maay=Maay -controlledvocabulary.language.Maba_(Chad)=Maba (Chad) -controlledvocabulary.language.Maba_(Indonesia)=Maba (Indonesia) -controlledvocabulary.language.Mabaale=Mabaale -controlledvocabulary.language.Mabaan=Mabaan -controlledvocabulary.language.Mabaka_Valley_Kalinga=Mabaka Valley Kalinga -controlledvocabulary.language.Mabire=Mabire -controlledvocabulary.language.Maca=Maca -controlledvocabulary.language.Macaguaje=Macaguaje -controlledvocabulary.language.Macagu�n=Macagu�n -controlledvocabulary.language.Macanese=Macanese -controlledvocabulary.language.Macedo-Romanian=Macedo-Romanian -controlledvocabulary.language.Macedonian=Macedonian -controlledvocabulary.language.Machame=Machame -controlledvocabulary.language.Machiguenga=Machiguenga -controlledvocabulary.language.Machinere=Machinere -controlledvocabulary.language.Machinga=Machinga -controlledvocabulary.language.Maco=Maco -controlledvocabulary.language.Macuna=Macuna -controlledvocabulary.language.Macushi=Macushi -controlledvocabulary.language.Mada_(Cameroon)=Mada (Cameroon) -controlledvocabulary.language.Mada_(Nigeria)=Mada (Nigeria) -controlledvocabulary.language.Madagascar_Sign_Language=Madagascar Sign Language -controlledvocabulary.language.Madak=Madak -controlledvocabulary.language.Madhi_Madhi=Madhi Madhi -controlledvocabulary.language.Madi=Madi -controlledvocabulary.language.Madurese=Madurese -controlledvocabulary.language.Mae=Mae -controlledvocabulary.language.Maek=Maek -controlledvocabulary.language.Maeng_Itneg=Maeng Itneg -controlledvocabulary.language.Mafa=Mafa -controlledvocabulary.language.Mafea=Mafea -controlledvocabulary.language.Mag-Indi_Ayta=Mag-Indi Ayta -controlledvocabulary.language.Mag-antsi_Ayta=Mag-antsi Ayta -controlledvocabulary.language.Magahi=Magahi -controlledvocabulary.language.Magbukun_Ayta=Magbukun Ayta -controlledvocabulary.language.Magdalena_Pe�asco_Mixtec=Magdalena Pe�asco Mixtec -controlledvocabulary.language.Magoma=Magoma -controlledvocabulary.language.Magori=Magori -controlledvocabulary.language.Maguindanaon=Maguindanaon -controlledvocabulary.language.Mag_(Madang_Province)=Mag? (Madang Province) -controlledvocabulary.language.Magyi=Mag?yi -controlledvocabulary.language.Mahali=Mahali -controlledvocabulary.language.Mahasu_Pahari=Mahasu Pahari -controlledvocabulary.language.Mahican=Mahican -controlledvocabulary.language.Mahongwe=Mahongwe -controlledvocabulary.language.Mahou=Mahou -controlledvocabulary.language.Mai_Brat=Mai Brat -controlledvocabulary.language.Maia=Maia -controlledvocabulary.language.Maiadomu=Maiadomu -controlledvocabulary.language.Maiani=Maiani -controlledvocabulary.language.Maii=Maii -controlledvocabulary.language.Mailu=Mailu -controlledvocabulary.language.Maindo=Maindo -controlledvocabulary.language.Mainfr�nkisch=Mainfr�nkisch -controlledvocabulary.language.Mainstream_Kenyah=Mainstream Kenyah -controlledvocabulary.language.Mairasi=Mairasi -controlledvocabulary.language.Maisin=Maisin -controlledvocabulary.language.Maithili=Maithili -controlledvocabulary.language.Maiwa_(Indonesia)=Maiwa (Indonesia) -controlledvocabulary.language.Maiwa_(Papua_New_Guinea)=Maiwa (Papua New Guinea) -controlledvocabulary.language.Maiwala=Maiwala -controlledvocabulary.language.Majang=Majang -controlledvocabulary.language.Majera=Majera -controlledvocabulary.language.Majhi=Majhi -controlledvocabulary.language.Majhwar=Majhwar -controlledvocabulary.language.Majukayang_Kalinga=Majukayang Kalinga -controlledvocabulary.language.Mak_(China)=Mak (China) -controlledvocabulary.language.Mak_(Nigeria)=Mak (Nigeria) -controlledvocabulary.language.Makaa=Makaa -controlledvocabulary.language.Makah=Makah -controlledvocabulary.language.Makalero=Makalero -controlledvocabulary.language.Makasae=Makasae -controlledvocabulary.language.Makasar=Makasar -controlledvocabulary.language.Makassar_Malay=Makassar Malay -controlledvocabulary.language.Makayam=Makayam -controlledvocabulary.language.Makhuwa=Makhuwa -controlledvocabulary.language.Makhuwa-Marrevone=Makhuwa-Marrevone -controlledvocabulary.language.Makhuwa-Meetto=Makhuwa-Meetto -controlledvocabulary.language.Makhuwa-Moniga=Makhuwa-Moniga -controlledvocabulary.language.Makhuwa-Saka=Makhuwa-Saka -controlledvocabulary.language.Makhuwa-Shirima=Makhuwa-Shirima -controlledvocabulary.language.Maklew=Maklew -controlledvocabulary.language.Makolkol=Makolkol -controlledvocabulary.language.Makonde=Makonde -controlledvocabulary.language.Maku'a=Maku'a -controlledvocabulary.language.Makuri_Naga=Makuri Naga -controlledvocabulary.language.Makur�p=Makur�p -controlledvocabulary.language.Makwe=Makwe -controlledvocabulary.language.Makyan_Naga=Makyan Naga -controlledvocabulary.language.Mal=Mal -controlledvocabulary.language.Mal_Paharia=Mal Paharia -controlledvocabulary.language.Mala_(Nigeria)=Mala (Nigeria) -controlledvocabulary.language.Mala_(Papua_New_Guinea)=Mala (Papua New Guinea) -controlledvocabulary.language.Mala_Malasar=Mala Malasar -controlledvocabulary.language.Malaccan_Creole_Malay=Malaccan Creole Malay -controlledvocabulary.language.Malaccan_Creole_Portuguese=Malaccan Creole Portuguese -controlledvocabulary.language.Malagasy=Malagasy -controlledvocabulary.language.Malak_Malak=Malak Malak -controlledvocabulary.language.Malalamai=Malalamai -controlledvocabulary.language.Malango=Malango -controlledvocabulary.language.Malankuravan=Malankuravan -controlledvocabulary.language.Malapandaram=Malapandaram -controlledvocabulary.language.Malaryan=Malaryan -controlledvocabulary.language.Malas=Malas -controlledvocabulary.language.Malasar=Malasar -controlledvocabulary.language.Malavedan=Malavedan -controlledvocabulary.language.Malawi_Lomwe=Malawi Lomwe -controlledvocabulary.language.Malawi_Sena=Malawi Sena -controlledvocabulary.language.Malawian_Sign_Language=Malawian Sign Language -controlledvocabulary.language.Malay=Malay -controlledvocabulary.language.Malay_(individual_language)=Malay (individual language) -controlledvocabulary.language.Malayalam=Malayalam -controlledvocabulary.language.Malayic_Dayak=Malayic Dayak -controlledvocabulary.language.Malaynon=Malaynon -controlledvocabulary.language.Malayo=Malayo -controlledvocabulary.language.Malaysian_Sign_Language=Malaysian Sign Language -controlledvocabulary.language.Malba_Birifor=Malba Birifor -controlledvocabulary.language.Maldivian,_Dhivehi,_Divehi=Maldivian, Dhivehi, Divehi -controlledvocabulary.language.Male_(Ethiopia)=Male (Ethiopia) -controlledvocabulary.language.Male_(Papua_New_Guinea)=Male (Papua New Guinea) -controlledvocabulary.language.Malecite-Passamaquoddy=Malecite-Passamaquoddy -controlledvocabulary.language.Maleng=Maleng -controlledvocabulary.language.Maleu-Kilenge=Maleu-Kilenge -controlledvocabulary.language.Malfaxal=Malfaxal -controlledvocabulary.language.Malgana=Malgana -controlledvocabulary.language.Malgbe=Malgbe -controlledvocabulary.language.Mali=Mali -controlledvocabulary.language.Malila=Malila -controlledvocabulary.language.Malimba=Malimba -controlledvocabulary.language.Malimpung=Malimpung -controlledvocabulary.language.Malinaltepec_Me'phaa=Malinaltepec Me'phaa -controlledvocabulary.language.Malo=Malo -controlledvocabulary.language.Malol=Malol -controlledvocabulary.language.Maltese=Maltese -controlledvocabulary.language.Maltese_Sign_Language=Maltese Sign Language -controlledvocabulary.language.Malua_Bay=Malua Bay -controlledvocabulary.language.Malvi=Malvi -controlledvocabulary.language.Malyangapa=Malyangapa -controlledvocabulary.language.Mal�ku_Ja�ka=Mal�ku Ja�ka -controlledvocabulary.language.Mam=Mam -controlledvocabulary.language.Mama=Mama -controlledvocabulary.language.Mamaa=Mamaa -controlledvocabulary.language.Mamaind�=Mamaind� -controlledvocabulary.language.Mamanwa=Mamanwa -controlledvocabulary.language.Mamara_Senoufo=Mamara Senoufo -controlledvocabulary.language.Mamasa=Mamasa -controlledvocabulary.language.Mambae=Mambae -controlledvocabulary.language.Mambai=Mambai -controlledvocabulary.language.Mamboru=Mamboru -controlledvocabulary.language.Mambwe-Lungu=Mambwe-Lungu -controlledvocabulary.language.Mampruli=Mampruli -controlledvocabulary.language.Mamuju=Mamuju -controlledvocabulary.language.Mamulique=Mamulique -controlledvocabulary.language.Mamusi=Mamusi -controlledvocabulary.language.Mamvu=Mamvu -controlledvocabulary.language.Man_Met=Man Met -controlledvocabulary.language.Manado_Malay=Manado Malay -controlledvocabulary.language.Manam=Manam -controlledvocabulary.language.Manambu=Manambu -controlledvocabulary.language.Manangba=Manangba -controlledvocabulary.language.Manangkari=Manangkari -controlledvocabulary.language.Manchu=Manchu -controlledvocabulary.language.Manda_(Australia)=Manda (Australia) -controlledvocabulary.language.Manda_(India)=Manda (India) -controlledvocabulary.language.Manda_(Tanzania)=Manda (Tanzania) -controlledvocabulary.language.Mandahuaca=Mandahuaca -controlledvocabulary.language.Mandaic=Mandaic -controlledvocabulary.language.Mandan=Mandan -controlledvocabulary.language.Mandandanyi=Mandandanyi -controlledvocabulary.language.Mandar=Mandar -controlledvocabulary.language.Mandara=Mandara -controlledvocabulary.language.Mandari=Mandari -controlledvocabulary.language.Mandarin_Chinese=Mandarin Chinese -controlledvocabulary.language.Mandaya=Mandaya -controlledvocabulary.language.Mandeali=Mandeali -controlledvocabulary.language.Mander=Mander -controlledvocabulary.language.Mandingo=Mandingo -controlledvocabulary.language.Mandinka=Mandinka -controlledvocabulary.language.Mandjak=Mandjak -controlledvocabulary.language.Mandobo_Atas=Mandobo Atas -controlledvocabulary.language.Mandobo_Bawah=Mandobo Bawah -controlledvocabulary.language.Manem=Manem -controlledvocabulary.language.Mang=Mang -controlledvocabulary.language.Manga_Kanuri=Manga Kanuri -controlledvocabulary.language.Mangala=Mangala -controlledvocabulary.language.Mangareva=Mangareva -controlledvocabulary.language.Mangarrayi=Mangarrayi -controlledvocabulary.language.Mangas=Mangas -controlledvocabulary.language.Mangayat=Mangayat -controlledvocabulary.language.Mangbetu=Mangbetu -controlledvocabulary.language.Mangbutu=Mangbutu -controlledvocabulary.language.Mangerr=Mangerr -controlledvocabulary.language.Mangga_Buang=Mangga Buang -controlledvocabulary.language.Manggarai=Manggarai -controlledvocabulary.language.Mango=Mango -controlledvocabulary.language.Mangole=Mangole -controlledvocabulary.language.Mangseng=Mangseng -controlledvocabulary.language.Mangue=Mangue -controlledvocabulary.language.Manichaean_Middle_Persian=Manichaean Middle Persian -controlledvocabulary.language.Manide=Manide -controlledvocabulary.language.Manikion=Manikion -controlledvocabulary.language.Manipa=Manipa -controlledvocabulary.language.Manipuri=Manipuri -controlledvocabulary.language.Mankanya=Mankanya -controlledvocabulary.language.Mankiyali=Mankiyali -controlledvocabulary.language.Manna-Dora=Manna-Dora -controlledvocabulary.language.Mannan=Mannan -controlledvocabulary.language.Mano=Mano -controlledvocabulary.language.Manombai=Manombai -controlledvocabulary.language.Mansaka=Mansaka -controlledvocabulary.language.Mansi=Mansi -controlledvocabulary.language.Mansoanka=Mansoanka -controlledvocabulary.language.Manta=Manta -controlledvocabulary.language.Mantsi=Mantsi -controlledvocabulary.language.Manumanaw_Karen=Manumanaw Karen -controlledvocabulary.language.Manx=Manx -controlledvocabulary.language.Manya=Manya -controlledvocabulary.language.Manyawa=Manyawa -controlledvocabulary.language.Manyika=Manyika -controlledvocabulary.language.Manza=Manza -controlledvocabulary.language.Mao_Naga=Mao Naga -controlledvocabulary.language.Maonan=Maonan -controlledvocabulary.language.Maore_Comorian=Maore Comorian -controlledvocabulary.language.Mape=Mape -controlledvocabulary.language.Mapena=Mapena -controlledvocabulary.language.Mapia=Mapia -controlledvocabulary.language.Mapidian=Mapidian -controlledvocabulary.language.Mapos_Buang=Mapos Buang -controlledvocabulary.language.Mapoyo=Mapoyo -controlledvocabulary.language.Mapudungun=Mapudungun -controlledvocabulary.language.Mapun=Mapun -controlledvocabulary.language.Maquiritari=Maquiritari -controlledvocabulary.language.Mara_Chin=Mara Chin -controlledvocabulary.language.Marachi=Marachi -controlledvocabulary.language.Maraghei=Maraghei -controlledvocabulary.language.Maragus=Maragus -controlledvocabulary.language.Maram_Naga=Maram Naga -controlledvocabulary.language.Marama=Marama -controlledvocabulary.language.Maranao=Maranao -controlledvocabulary.language.Maranunggu=Maranunggu -controlledvocabulary.language.Mararit=Mararit -controlledvocabulary.language.Marathi_(Marh)=Marathi (Mar??h?) -controlledvocabulary.language.Marau=Marau -controlledvocabulary.language.Marba=Marba -controlledvocabulary.language.Mardin_Sign_Language=Mardin Sign Language -controlledvocabulary.language.Maremgi=Maremgi -controlledvocabulary.language.Marenje=Marenje -controlledvocabulary.language.Marfa=Marfa -controlledvocabulary.language.Margany=Margany -controlledvocabulary.language.Marghi_Central=Marghi Central -controlledvocabulary.language.Marghi_South=Marghi South -controlledvocabulary.language.Margos-Yarowilca-Lauricocha_Quechua=Margos-Yarowilca-Lauricocha Quechua -controlledvocabulary.language.Margu=Margu -controlledvocabulary.language.Mari_(East_Sepik_Province)=Mari (East Sepik Province) -controlledvocabulary.language.Mari_(Madang_Province)=Mari (Madang Province) -controlledvocabulary.language.Mari_(Russia)=Mari (Russia) -controlledvocabulary.language.Maria_(India)=Maria (India) -controlledvocabulary.language.Maria_(Papua_New_Guinea)=Maria (Papua New Guinea) -controlledvocabulary.language.Maricopa=Maricopa -controlledvocabulary.language.Maridan=Maridan -controlledvocabulary.language.Maridjabin=Maridjabin -controlledvocabulary.language.Marik=Marik -controlledvocabulary.language.Marimanindji=Marimanindji -controlledvocabulary.language.Marind=Marind -controlledvocabulary.language.Maring=Maring -controlledvocabulary.language.Maring_Naga=Maring Naga -controlledvocabulary.language.Maringarr=Maringarr -controlledvocabulary.language.Marino=Marino -controlledvocabulary.language.Mariri=Mariri -controlledvocabulary.language.Maritime_Sign_Language=Maritime Sign Language -controlledvocabulary.language.Maritsau�=Maritsau� -controlledvocabulary.language.Mariyedi=Mariyedi -controlledvocabulary.language.Marka=Marka -controlledvocabulary.language.Markweeta=Markweeta -controlledvocabulary.language.Marma=Marma -controlledvocabulary.language.Marovo=Marovo -controlledvocabulary.language.Marra=Marra -controlledvocabulary.language.Marriammu=Marriammu -controlledvocabulary.language.Marrithiyel=Marrithiyel -controlledvocabulary.language.Marrucinian=Marrucinian -controlledvocabulary.language.Marshallese=Marshallese -controlledvocabulary.language.Marsian=Marsian -controlledvocabulary.language.Martha's_Vineyard_Sign_Language=Martha's Vineyard Sign Language -controlledvocabulary.language.Marti_Ke=Marti Ke -controlledvocabulary.language.Martu_Wangka=Martu Wangka -controlledvocabulary.language.Martuyhunira=Martuyhunira -controlledvocabulary.language.Maru=Maru -controlledvocabulary.language.Marwari=Marwari -controlledvocabulary.language.Marwari_(India)=Marwari (India) -controlledvocabulary.language.Marwari_(Pakistan)=Marwari (Pakistan) -controlledvocabulary.language.Mar�bo=Mar�bo -controlledvocabulary.language.Masaaba=Masaaba -controlledvocabulary.language.Masadiit_Itneg=Masadiit Itneg -controlledvocabulary.language.Masai=Masai -controlledvocabulary.language.Masalit=Masalit -controlledvocabulary.language.Masana=Masana -controlledvocabulary.language.Masbatenyo=Masbatenyo -controlledvocabulary.language.Mashco_Piro=Mashco Piro -controlledvocabulary.language.Mashi_(Nigeria)=Mashi (Nigeria) -controlledvocabulary.language.Mashi_(Zambia)=Mashi (Zambia) -controlledvocabulary.language.Masikoro_Malagasy=Masikoro Malagasy -controlledvocabulary.language.Masimasi=Masimasi -controlledvocabulary.language.Masiwang=Masiwang -controlledvocabulary.language.Maskelynes=Maskelynes -controlledvocabulary.language.Maslam=Maslam -controlledvocabulary.language.Masmaje=Masmaje -controlledvocabulary.language.Massalat=Massalat -controlledvocabulary.language.Massep=Massep -controlledvocabulary.language.Matagalpa=Matagalpa -controlledvocabulary.language.Matal=Matal -controlledvocabulary.language.Matambwe=Matambwe -controlledvocabulary.language.Matbat=Matbat -controlledvocabulary.language.Matengo=Matengo -controlledvocabulary.language.Matepi=Matepi -controlledvocabulary.language.Matigsalug_Manobo=Matigsalug Manobo -controlledvocabulary.language.Matipuhy=Matipuhy -controlledvocabulary.language.Matngala=Matngala -controlledvocabulary.language.Mato=Mato -controlledvocabulary.language.Mato_Grosso_Ar�ra=Mato Grosso Ar�ra -controlledvocabulary.language.Mator=Mator -controlledvocabulary.language.Mats�s=Mats�s -controlledvocabulary.language.Mattole=Mattole -controlledvocabulary.language.Matu_Chin=Matu Chin -controlledvocabulary.language.Matukar=Matukar -controlledvocabulary.language.Matumbi=Matumbi -controlledvocabulary.language.Matya_Samo=Matya Samo -controlledvocabulary.language.Mat�s=Mat�s -controlledvocabulary.language.Maung=Maung -controlledvocabulary.language.Mauritian_Sign_Language=Mauritian Sign Language -controlledvocabulary.language.Mauwake=Mauwake -controlledvocabulary.language.Mawa_(Chad)=Mawa (Chad) -controlledvocabulary.language.Mawa_(Nigeria)=Mawa (Nigeria) -controlledvocabulary.language.Mawak=Mawak -controlledvocabulary.language.Mawan=Mawan -controlledvocabulary.language.Mawayana=Mawayana -controlledvocabulary.language.Mawchi=Mawchi -controlledvocabulary.language.Mawes=Mawes -controlledvocabulary.language.Maxakal�=Maxakal� -controlledvocabulary.language.Maxi_Gbe=Maxi Gbe -controlledvocabulary.language.Maya_Samo=Maya Samo -controlledvocabulary.language.Mayaguduna=Mayaguduna -controlledvocabulary.language.Mayangna=Mayangna -controlledvocabulary.language.Mayawali=Mayawali -controlledvocabulary.language.Mayeka=Mayeka -controlledvocabulary.language.Mayi-Kulan=Mayi-Kulan -controlledvocabulary.language.Mayi-Thakurti=Mayi-Thakurti -controlledvocabulary.language.Mayi-Yapi=Mayi-Yapi -controlledvocabulary.language.Mayo=Mayo -controlledvocabulary.language.Mayogo=Mayogo -controlledvocabulary.language.Mayoyao_Ifugao=Mayoyao Ifugao -controlledvocabulary.language.Mazagway=Mazagway -controlledvocabulary.language.Mazaltepec_Zapotec=Mazaltepec Zapotec -controlledvocabulary.language.Mazanderani=Mazanderani -controlledvocabulary.language.Mazatl�n_Mazatec=Mazatl�n Mazatec -controlledvocabulary.language.Mazatl�n_Mixe=Mazatl�n Mixe -controlledvocabulary.language.Mba=Mba -controlledvocabulary.language.Mbala=Mbala -controlledvocabulary.language.Mbalanhu=Mbalanhu -controlledvocabulary.language.Mbandja=Mbandja -controlledvocabulary.language.Mbangala=Mbangala -controlledvocabulary.language.Mbangi=Mbangi -controlledvocabulary.language.Mbangwe=Mbangwe -controlledvocabulary.language.Mbara_(Australia)=Mbara (Australia) -controlledvocabulary.language.Mbara_(Chad)=Mbara (Chad) -controlledvocabulary.language.Mbariman-Gudhinma=Mbariman-Gudhinma -controlledvocabulary.language.Mbati=Mbati -controlledvocabulary.language.Mbato=Mbato -controlledvocabulary.language.Mbay=Mbay -controlledvocabulary.language.Mbe=Mbe -controlledvocabulary.language.Mbe'=Mbe' -controlledvocabulary.language.Mbelime=Mbelime -controlledvocabulary.language.Mbere=Mbere -controlledvocabulary.language.Mbesa=Mbesa -controlledvocabulary.language.Mbessa=Mbessa -controlledvocabulary.language.Mbo_(Cameroon)=Mbo (Cameroon) -controlledvocabulary.language.Mbo_(Democratic_Republic_of_Congo)=Mbo (Democratic Republic of Congo) -controlledvocabulary.language.Mboi=Mboi -controlledvocabulary.language.Mboko=Mboko -controlledvocabulary.language.Mbole=Mbole -controlledvocabulary.language.Mbonga=Mbonga -controlledvocabulary.language.Mbongno=Mbongno -controlledvocabulary.language.Mbosi=Mbosi -controlledvocabulary.language.Mbowe=Mbowe -controlledvocabulary.language.Mbre=Mbre -controlledvocabulary.language.Mbudum=Mbudum -controlledvocabulary.language.Mbugu=Mbugu -controlledvocabulary.language.Mbugwe=Mbugwe -controlledvocabulary.language.Mbuk=Mbuk -controlledvocabulary.language.Mbuko=Mbuko -controlledvocabulary.language.Mbukushu=Mbukushu -controlledvocabulary.language.Mbula=Mbula -controlledvocabulary.language.Mbula-Bwazza=Mbula-Bwazza -controlledvocabulary.language.Mbule=Mbule -controlledvocabulary.language.Mbulungish=Mbulungish -controlledvocabulary.language.Mbum=Mbum -controlledvocabulary.language.Mbunda=Mbunda -controlledvocabulary.language.Mbunga=Mbunga -controlledvocabulary.language.Mburku=Mburku -controlledvocabulary.language.Mbwela=Mbwela -controlledvocabulary.language.Mby�_Guaran�=Mby� Guaran� -controlledvocabulary.language.Me'en=Me'en -controlledvocabulary.language.Medebur=Medebur -controlledvocabulary.language.Medefaidrin=Medefaidrin -controlledvocabulary.language.Media_Lengua=Media Lengua -controlledvocabulary.language.Median=Median -controlledvocabulary.language.Mednyj_Aleut=Mednyj Aleut -controlledvocabulary.language.Medumba=Medumba -controlledvocabulary.language.Mefele=Mefele -controlledvocabulary.language.Megam=Megam -controlledvocabulary.language.Megleno_Romanian=Megleno Romanian -controlledvocabulary.language.Mehek=Mehek -controlledvocabulary.language.Mehin�ku=Mehin�ku -controlledvocabulary.language.Mehri=Mehri -controlledvocabulary.language.Mekeo=Mekeo -controlledvocabulary.language.Mekmek=Mekmek -controlledvocabulary.language.Mekwei=Mekwei -controlledvocabulary.language.Mel-Khaonh=Mel-Khaonh -controlledvocabulary.language.Mele-Fila=Mele-Fila -controlledvocabulary.language.Melo=Melo -controlledvocabulary.language.Melpa=Melpa -controlledvocabulary.language.Memoni=Memoni -controlledvocabulary.language.Mendalam_Kayan=Mendalam Kayan -controlledvocabulary.language.Mendankwe-Nkwen=Mendankwe-Nkwen -controlledvocabulary.language.Mende_(Papua_New_Guinea)=Mende (Papua New Guinea) -controlledvocabulary.language.Mende_(Sierra_Leone)=Mende (Sierra Leone) -controlledvocabulary.language.Mengaka=Mengaka -controlledvocabulary.language.Mengen=Mengen -controlledvocabulary.language.Mengisa=Mengisa -controlledvocabulary.language.Menka=Menka -controlledvocabulary.language.Menominee=Menominee -controlledvocabulary.language.Mentawai=Mentawai -controlledvocabulary.language.Menya=Menya -controlledvocabulary.language.Meoswar=Meoswar -controlledvocabulary.language.Mer=Mer -controlledvocabulary.language.Meramera=Meramera -controlledvocabulary.language.Merei=Merei -controlledvocabulary.language.Merey=Merey -controlledvocabulary.language.Meriam_Mir=Meriam Mir -controlledvocabulary.language.Merlav=Merlav -controlledvocabulary.language.Meroitic=Meroitic -controlledvocabulary.language.Meru=Meru -controlledvocabulary.language.Merwari=Merwari -controlledvocabulary.language.Mesaka=Mesaka -controlledvocabulary.language.Mescalero-Chiricahua_Apache=Mescalero-Chiricahua Apache -controlledvocabulary.language.Mese=Mese -controlledvocabulary.language.Meskwaki=Meskwaki -controlledvocabulary.language.Mesme=Mesme -controlledvocabulary.language.Mesmes=Mesmes -controlledvocabulary.language.Mesopotamian_Arabic=Mesopotamian Arabic -controlledvocabulary.language.Mesqan=Mesqan -controlledvocabulary.language.Messapic=Messapic -controlledvocabulary.language.Meta'=Meta' -controlledvocabulary.language.Metlat�noc_Mixtec=Metlat�noc Mixtec -controlledvocabulary.language.Mewari=Mewari -controlledvocabulary.language.Mewati=Mewati -controlledvocabulary.language.Mexican_Sign_Language=Mexican Sign Language -controlledvocabulary.language.Meyah=Meyah -controlledvocabulary.language.Mezontla_Popoloca=Mezontla Popoloca -controlledvocabulary.language.Mezquital_Otomi=Mezquital Otomi -controlledvocabulary.language.Mfinu=Mfinu -controlledvocabulary.language.Mfumte=Mfumte -controlledvocabulary.language.Mgbolizhia=Mgbolizhia -controlledvocabulary.language.Mi'kmaq=Mi'kmaq -controlledvocabulary.language.Miahuatl�n_Zapotec=Miahuatl�n Zapotec -controlledvocabulary.language.Miami=Miami -controlledvocabulary.language.Mian=Mian -controlledvocabulary.language.Miani=Miani -controlledvocabulary.language.Michif=Michif -controlledvocabulary.language.Michigamea=Michigamea -controlledvocabulary.language.Michoac�n_Mazahua=Michoac�n Mazahua -controlledvocabulary.language.Michoac�n_Nahuatl=Michoac�n Nahuatl -controlledvocabulary.language.Mid_Grand_Valley_Dani=Mid Grand Valley Dani -controlledvocabulary.language.Mid-Southern_Banda=Mid-Southern Banda -controlledvocabulary.language.Middle_Armenian=Middle Armenian -controlledvocabulary.language.Middle_Breton=Middle Breton -controlledvocabulary.language.Middle_Cornish=Middle Cornish -controlledvocabulary.language.Middle_Dutch_(ca._1050-1350)=Middle Dutch (ca. 1050-1350) -controlledvocabulary.language.Middle_English_(1100-1500)=Middle English (1100-1500) -controlledvocabulary.language.Middle_French_(ca._1400-1600)=Middle French (ca. 1400-1600) -controlledvocabulary.language.Middle_High_German_(ca._1050-1500)=Middle High German (ca. 1050-1500) -controlledvocabulary.language.Middle_Hittite=Middle Hittite -controlledvocabulary.language.Middle_Irish_(900-1200)=Middle Irish (900-1200) -controlledvocabulary.language.Middle_Khmer_(1400_to_1850_CE)=Middle Khmer (1400 to 1850 CE) -controlledvocabulary.language.Middle_Korean_(10th-16th_cent.)=Middle Korean (10th-16th cent.) -controlledvocabulary.language.Middle_Low_German=Middle Low German -controlledvocabulary.language.Middle_Mongolian=Middle Mongolian -controlledvocabulary.language.Middle_Newar=Middle Newar -controlledvocabulary.language.Middle_Watut=Middle Watut -controlledvocabulary.language.Middle_Welsh=Middle Welsh -controlledvocabulary.language.Midob=Midob -controlledvocabulary.language.Migaama=Migaama -controlledvocabulary.language.Migabac=Migabac -controlledvocabulary.language.Migum=Migum -controlledvocabulary.language.Miju-Mishmi=Miju-Mishmi -controlledvocabulary.language.Mikasuki=Mikasuki -controlledvocabulary.language.Mili=Mili -controlledvocabulary.language.Miltu=Miltu -controlledvocabulary.language.Miluk=Miluk -controlledvocabulary.language.Milyan=Milyan -controlledvocabulary.language.Min_Bei_Chinese=Min Bei Chinese -controlledvocabulary.language.Min_Dong_Chinese=Min Dong Chinese -controlledvocabulary.language.Min_Nan_Chinese=Min Nan Chinese -controlledvocabulary.language.Min_Zhong_Chinese=Min Zhong Chinese -controlledvocabulary.language.Mina_(Cameroon)=Mina (Cameroon) -controlledvocabulary.language.Minaean=Minaean -controlledvocabulary.language.Minang=Minang -controlledvocabulary.language.Minangkabau=Minangkabau -controlledvocabulary.language.Minanibai=Minanibai -controlledvocabulary.language.Minaveha=Minaveha -controlledvocabulary.language.Minderico=Minderico -controlledvocabulary.language.Mindiri=Mindiri -controlledvocabulary.language.Mingang_Doso=Mingang Doso -controlledvocabulary.language.Mingrelian=Mingrelian -controlledvocabulary.language.Minica_Huitoto=Minica Huitoto -controlledvocabulary.language.Minidien=Minidien -controlledvocabulary.language.Minjungbal=Minjungbal -controlledvocabulary.language.Minkin=Minkin -controlledvocabulary.language.Minoan=Minoan -controlledvocabulary.language.Minokok=Minokok -controlledvocabulary.language.Minriq=Minriq -controlledvocabulary.language.Mintil=Mintil -controlledvocabulary.language.Minz_Zhuang=Minz Zhuang -controlledvocabulary.language.Miqie=Miqie -controlledvocabulary.language.Mirandese=Mirandese -controlledvocabulary.language.Miraya_Bikol=Miraya Bikol -controlledvocabulary.language.Mirgan=Mirgan -controlledvocabulary.language.Miriti=Miriti -controlledvocabulary.language.Miriwoong=Miriwoong -controlledvocabulary.language.Miriwoong_Sign_Language=Miriwoong Sign Language -controlledvocabulary.language.Mirning=Mirning -controlledvocabulary.language.Miship=Miship -controlledvocabulary.language.Misima-Panaeati=Misima-Panaeati -controlledvocabulary.language.Mising=Mising -controlledvocabulary.language.Mitla_Zapotec=Mitla Zapotec -controlledvocabulary.language.Mitlatongo_Mixtec=Mitlatongo Mixtec -controlledvocabulary.language.Mittu=Mittu -controlledvocabulary.language.Mituku=Mituku -controlledvocabulary.language.Miu=Miu -controlledvocabulary.language.Miwa=Miwa -controlledvocabulary.language.Mixed_Great_Andamanese=Mixed Great Andamanese -controlledvocabulary.language.Mixtepec_Mixtec=Mixtepec Mixtec -controlledvocabulary.language.Mixtepec_Zapotec=Mixtepec Zapotec -controlledvocabulary.language.Miya=Miya -controlledvocabulary.language.Miyako=Miyako -controlledvocabulary.language.Miyakubo_Sign_Language=Miyakubo Sign Language -controlledvocabulary.language.Miyobe=Miyobe -controlledvocabulary.language.Mlabri=Mlabri -controlledvocabulary.language.Mlahs�=Mlahs� -controlledvocabulary.language.Mlap=Mlap -controlledvocabulary.language.Mlomp=Mlomp -controlledvocabulary.language.Mmaala=Mmaala -controlledvocabulary.language.Mmen=Mmen -controlledvocabulary.language.Mo'da=Mo'da -controlledvocabulary.language.Moabite=Moabite -controlledvocabulary.language.Moba=Moba -controlledvocabulary.language.Mobilian=Mobilian -controlledvocabulary.language.Mobumrin_Aizi=Mobumrin Aizi -controlledvocabulary.language.Mobwa_Karen=Mobwa Karen -controlledvocabulary.language.Mochi=Mochi -controlledvocabulary.language.Mochica=Mochica -controlledvocabulary.language.Mocho=Mocho -controlledvocabulary.language.Mocov�=Mocov� -controlledvocabulary.language.Modang=Modang -controlledvocabulary.language.Modole=Modole -controlledvocabulary.language.Moere=Moere -controlledvocabulary.language.Mofu-Gudur=Mofu-Gudur -controlledvocabulary.language.Mogholi=Mogholi -controlledvocabulary.language.Mogofin=Mogofin -controlledvocabulary.language.Mogum=Mogum -controlledvocabulary.language.Mohave=Mohave -controlledvocabulary.language.Mohawk=Mohawk -controlledvocabulary.language.Mohegan-Pequot=Mohegan-Pequot -controlledvocabulary.language.Moi_(Congo)=Moi (Congo) -controlledvocabulary.language.Moi_(Indonesia)=Moi (Indonesia) -controlledvocabulary.language.Moikodi=Moikodi -controlledvocabulary.language.Moingi=Moingi -controlledvocabulary.language.Moji=Moji -controlledvocabulary.language.Mok=Mok -controlledvocabulary.language.Mokati=Mokati -controlledvocabulary.language.Moken=Moken -controlledvocabulary.language.Mokerang=Mokerang -controlledvocabulary.language.Mokilese=Mokilese -controlledvocabulary.language.Moklen=Moklen -controlledvocabulary.language.Mokole=Mokole -controlledvocabulary.language.Mokpwe=Mokpwe -controlledvocabulary.language.Moksela=Moksela -controlledvocabulary.language.Moksha=Moksha -controlledvocabulary.language.Molale=Molale -controlledvocabulary.language.Molbog=Molbog -controlledvocabulary.language.Moldova_Sign_Language=Moldova Sign Language -controlledvocabulary.language.Molengue=Molengue -controlledvocabulary.language.Molima=Molima -controlledvocabulary.language.Molmo_One=Molmo One -controlledvocabulary.language.Molo=Molo -controlledvocabulary.language.Molof=Molof -controlledvocabulary.language.Moloko=Moloko -controlledvocabulary.language.Mom_Jango=Mom Jango -controlledvocabulary.language.Moma=Moma -controlledvocabulary.language.Momare=Momare -controlledvocabulary.language.Mombo_Dogon=Mombo Dogon -controlledvocabulary.language.Mombum=Mombum -controlledvocabulary.language.Momina=Momina -controlledvocabulary.language.Momuna=Momuna -controlledvocabulary.language.Mon=Mon -controlledvocabulary.language.Monastic_Sign_Language=Monastic Sign Language -controlledvocabulary.language.Mondropolon=Mondropolon -controlledvocabulary.language.Mond�=Mond� -controlledvocabulary.language.Mongo=Mongo -controlledvocabulary.language.Mongol=Mongol -controlledvocabulary.language.Mongolia_Buriat=Mongolia Buriat -controlledvocabulary.language.Mongolian=Mongolian -controlledvocabulary.language.Mongolian_Sign_Language=Mongolian Sign Language -controlledvocabulary.language.Mongondow=Mongondow -controlledvocabulary.language.Moni=Moni -controlledvocabulary.language.Mono_(Cameroon)=Mono (Cameroon) -controlledvocabulary.language.Mono_(Democratic_Republic_of_Congo)=Mono (Democratic Republic of Congo) -controlledvocabulary.language.Mono_(Solomon_Islands)=Mono (Solomon Islands) -controlledvocabulary.language.Mono_(USA)=Mono (USA) -controlledvocabulary.language.Monom=Monom -controlledvocabulary.language.Monsang_Naga=Monsang Naga -controlledvocabulary.language.Montenegrin=Montenegrin -controlledvocabulary.language.Montol=Montol -controlledvocabulary.language.Monumbo=Monumbo -controlledvocabulary.language.Monzombo=Monzombo -controlledvocabulary.language.Moo=Moo -controlledvocabulary.language.Moose_Cree=Moose Cree -controlledvocabulary.language.Mop�n_Maya=Mop�n Maya -controlledvocabulary.language.Mor_(Bomberai_Peninsula)=Mor (Bomberai Peninsula) -controlledvocabulary.language.Mor_(Mor_Islands)=Mor (Mor Islands) -controlledvocabulary.language.Moraid=Moraid -controlledvocabulary.language.Morawa=Morawa -controlledvocabulary.language.Morelos_Nahuatl=Morelos Nahuatl -controlledvocabulary.language.Morerebi=Morerebi -controlledvocabulary.language.Moresada=Moresada -controlledvocabulary.language.Mori_Atas=Mori Atas -controlledvocabulary.language.Mori_Bawah=Mori Bawah -controlledvocabulary.language.Morigi=Morigi -controlledvocabulary.language.Moriori=Moriori -controlledvocabulary.language.Morisyen=Morisyen -controlledvocabulary.language.Moro=Moro -controlledvocabulary.language.Moroccan_Arabic=Moroccan Arabic -controlledvocabulary.language.Moroccan_Sign_Language=Moroccan Sign Language -controlledvocabulary.language.Morokodo=Morokodo -controlledvocabulary.language.Morom=Morom -controlledvocabulary.language.Moronene=Moronene -controlledvocabulary.language.Morori=Morori -controlledvocabulary.language.Morouas=Morouas -controlledvocabulary.language.Morrobalama=Morrobalama -controlledvocabulary.language.Mortlockese=Mortlockese -controlledvocabulary.language.Moru=Moru -controlledvocabulary.language.Mosimo=Mosimo -controlledvocabulary.language.Moskona=Moskona -controlledvocabulary.language.Mossi=Mossi -controlledvocabulary.language.Mota=Mota -controlledvocabulary.language.Motlav=Motlav -controlledvocabulary.language.Motu=Motu -controlledvocabulary.language.Mouk-Aria=Mouk-Aria -controlledvocabulary.language.Moundadan_Chetty=Moundadan Chetty -controlledvocabulary.language.Mountain_Koiali=Mountain Koiali -controlledvocabulary.language.Mouwase=Mouwase -controlledvocabulary.language.Movima=Movima -controlledvocabulary.language.Moyadan_Itneg=Moyadan Itneg -controlledvocabulary.language.Moyon_Naga=Moyon Naga -controlledvocabulary.language.Mozambican_Sign_Language=Mozambican Sign Language -controlledvocabulary.language.Mozarabic=Mozarabic -controlledvocabulary.language.Mpade=Mpade -controlledvocabulary.language.Mpalitjanh=Mpalitjanh -controlledvocabulary.language.Mpi=Mpi -controlledvocabulary.language.Mpiemo=Mpiemo -controlledvocabulary.language.Mpinda=Mpinda -controlledvocabulary.language.Mpoto=Mpoto -controlledvocabulary.language.Mpotovoro=Mpotovoro -controlledvocabulary.language.Mpumpong=Mpumpong -controlledvocabulary.language.Mpuono=Mpuono -controlledvocabulary.language.Mpur=Mpur -controlledvocabulary.language.Mro-Khimi_Chin=Mro-Khimi Chin -controlledvocabulary.language.Mru=Mru -controlledvocabulary.language.Mser=Mser -controlledvocabulary.language.Mt._Iraya_Agta=Mt. Iraya Agta -controlledvocabulary.language.Mt._Iriga_Agta=Mt. Iriga Agta -controlledvocabulary.language.Muak_Sa-aak=Muak Sa-aak -controlledvocabulary.language.Mualang=Mualang -controlledvocabulary.language.Mubami=Mubami -controlledvocabulary.language.Mubi=Mubi -controlledvocabulary.language.Muda=Muda -controlledvocabulary.language.Mudburra=Mudburra -controlledvocabulary.language.Mudhili_Gadaba=Mudhili Gadaba -controlledvocabulary.language.Mudu_Koraga=Mudu Koraga -controlledvocabulary.language.Muduga=Muduga -controlledvocabulary.language.Mufian=Mufian -controlledvocabulary.language.Mugom=Mugom -controlledvocabulary.language.Muinane=Muinane -controlledvocabulary.language.Mukha-Dora=Mukha-Dora -controlledvocabulary.language.Mukulu=Mukulu -controlledvocabulary.language.Mulaha=Mulaha -controlledvocabulary.language.Mulam=Mulam -controlledvocabulary.language.Mulao=Mulao -controlledvocabulary.language.Mulgi=Mulgi -controlledvocabulary.language.Mullu_Kurumba=Mullu Kurumba -controlledvocabulary.language.Multiple_languages=Multiple languages -controlledvocabulary.language.Muluridyi=Muluridyi -controlledvocabulary.language.Mum=Mum -controlledvocabulary.language.Mumuye=Mumuye -controlledvocabulary.language.Muna=Muna -controlledvocabulary.language.Munda=Munda -controlledvocabulary.language.Mundabli=Mundabli -controlledvocabulary.language.Mundang=Mundang -controlledvocabulary.language.Mundani=Mundani -controlledvocabulary.language.Mundari=Mundari -controlledvocabulary.language.Mundat=Mundat -controlledvocabulary.language.Munduruk�=Munduruk� -controlledvocabulary.language.Mungaka=Mungaka -controlledvocabulary.language.Munggui=Munggui -controlledvocabulary.language.Mungkip=Mungkip -controlledvocabulary.language.Muniche=Muniche -controlledvocabulary.language.Munit=Munit -controlledvocabulary.language.Munji=Munji -controlledvocabulary.language.Munsee=Munsee -controlledvocabulary.language.Muong=Muong -controlledvocabulary.language.Mur_Pano=Mur Pano -controlledvocabulary.language.Muratayak=Muratayak -controlledvocabulary.language.Murik_(Malaysia)=Murik (Malaysia) -controlledvocabulary.language.Murik_(Papua_New_Guinea)=Murik (Papua New Guinea) -controlledvocabulary.language.Murkim=Murkim -controlledvocabulary.language.Murle=Murle -controlledvocabulary.language.Murrinh-Patha=Murrinh-Patha -controlledvocabulary.language.Mursi=Mursi -controlledvocabulary.language.Murui_Huitoto=Murui Huitoto -controlledvocabulary.language.Murupi=Murupi -controlledvocabulary.language.Muruwari=Muruwari -controlledvocabulary.language.Musak=Musak -controlledvocabulary.language.Musar=Musar -controlledvocabulary.language.Musasa=Musasa -controlledvocabulary.language.Musey=Musey -controlledvocabulary.language.Musgu=Musgu -controlledvocabulary.language.Mushungulu=Mushungulu -controlledvocabulary.language.Musi=Musi -controlledvocabulary.language.Muskum=Muskum -controlledvocabulary.language.Muslim_Tat=Muslim Tat -controlledvocabulary.language.Musom=Musom -controlledvocabulary.language.Mussau-Emira=Mussau-Emira -controlledvocabulary.language.Muthuvan=Muthuvan -controlledvocabulary.language.Mutu=Mutu -controlledvocabulary.language.Muyang=Muyang -controlledvocabulary.language.Muyuw=Muyuw -controlledvocabulary.language.Muzi=Muzi -controlledvocabulary.language.Mvanip=Mvanip -controlledvocabulary.language.Mvuba=Mvuba -controlledvocabulary.language.Mwaghavul=Mwaghavul -controlledvocabulary.language.Mwali_Comorian=Mwali Comorian -controlledvocabulary.language.Mwan=Mwan -controlledvocabulary.language.Mwani=Mwani -controlledvocabulary.language.Mwatebu=Mwatebu -controlledvocabulary.language.Mwera_(Chimwera)=Mwera (Chimwera) -controlledvocabulary.language.Mwera_(Nyasa)=Mwera (Nyasa) -controlledvocabulary.language.Mwimbi-Muthambi=Mwimbi-Muthambi -controlledvocabulary.language.Myanmar_Sign_Language=Myanmar Sign Language -controlledvocabulary.language.Mycenaean_Greek=Mycenaean Greek -controlledvocabulary.language.Myene=Myene -controlledvocabulary.language.Mysian=Mysian -controlledvocabulary.language.Mzieme_Naga=Mzieme Naga -controlledvocabulary.language.M�ghd�=M�ghd� -controlledvocabulary.language.M�ku=M�ku -controlledvocabulary.language.M�nik=M�nik -controlledvocabulary.language.M�skito=M�skito -controlledvocabulary.language.M�cheno=M�cheno -controlledvocabulary.language.M�n_Chin=M�n Chin -controlledvocabulary.language.M�nd�=M�nd� -controlledvocabulary.language.Mhrri_Prkrit=M?h?r???ri Pr?krit -controlledvocabulary.language.Mori=M?ori -controlledvocabulary.language.N'Ko=N'Ko -controlledvocabulary.language.Na=Na -controlledvocabulary.language.Na-kara=Na-kara -controlledvocabulary.language.Naaba=Naaba -controlledvocabulary.language.Naami=Naami -controlledvocabulary.language.Naasioi=Naasioi -controlledvocabulary.language.Naba=Naba -controlledvocabulary.language.Nabak=Nabak -controlledvocabulary.language.Nabi=Nabi -controlledvocabulary.language.Nachering=Nachering -controlledvocabulary.language.Nadruvian=Nadruvian -controlledvocabulary.language.Nad�b=Nad�b -controlledvocabulary.language.Nafaanra=Nafaanra -controlledvocabulary.language.Nafi=Nafi -controlledvocabulary.language.Nafri=Nafri -controlledvocabulary.language.Nafusi=Nafusi -controlledvocabulary.language.Naga_Pidgin=Naga Pidgin -controlledvocabulary.language.Nagarchal=Nagarchal -controlledvocabulary.language.Nage=Nage -controlledvocabulary.language.Nagumi=Nagumi -controlledvocabulary.language.Nahali=Nahali -controlledvocabulary.language.Nahari=Nahari -controlledvocabulary.language.Nai=Nai -controlledvocabulary.language.Najdi_Arabic=Najdi Arabic -controlledvocabulary.language.Naka'ela=Naka'ela -controlledvocabulary.language.Nakai=Nakai -controlledvocabulary.language.Nakame=Nakame -controlledvocabulary.language.Nakanai=Nakanai -controlledvocabulary.language.Nake=Nake -controlledvocabulary.language.Naki=Naki -controlledvocabulary.language.Nakwi=Nakwi -controlledvocabulary.language.Nalca=Nalca -controlledvocabulary.language.Nali=Nali -controlledvocabulary.language.Nalik=Nalik -controlledvocabulary.language.Nalu=Nalu -controlledvocabulary.language.Naluo_Yi=Naluo Yi -controlledvocabulary.language.Nal�go=Nal�go -controlledvocabulary.language.Nama_(Papua_New_Guinea)=Nama (Papua New Guinea) -controlledvocabulary.language.Namakura=Namakura -controlledvocabulary.language.Namat=Namat -controlledvocabulary.language.Nambo=Nambo -controlledvocabulary.language.Nambya=Nambya -controlledvocabulary.language.Namia=Namia -controlledvocabulary.language.Namiae=Namiae -controlledvocabulary.language.Namibian_Sign_Language=Namibian Sign Language -controlledvocabulary.language.Namla=Namla -controlledvocabulary.language.Namo=Namo -controlledvocabulary.language.Namonuito=Namonuito -controlledvocabulary.language.Namosi-Naitasiri-Serua=Namosi-Naitasiri-Serua -controlledvocabulary.language.Namuyi=Namuyi -controlledvocabulary.language.Nanai=Nanai -controlledvocabulary.language.Nancere=Nancere -controlledvocabulary.language.Nande=Nande -controlledvocabulary.language.Nandi=Nandi -controlledvocabulary.language.Nanerig�_S�noufo=Nanerig� S�noufo -controlledvocabulary.language.Nanga_Dama_Dogon=Nanga Dama Dogon -controlledvocabulary.language.Nankina=Nankina -controlledvocabulary.language.Nanti=Nanti -controlledvocabulary.language.Nanticoke=Nanticoke -controlledvocabulary.language.Nanubae=Nanubae -controlledvocabulary.language.Napo_Lowland_Quechua=Napo Lowland Quechua -controlledvocabulary.language.Napu=Napu -controlledvocabulary.language.Nar_Phu=Nar Phu -controlledvocabulary.language.Nara=Nara -controlledvocabulary.language.Narak=Narak -controlledvocabulary.language.Narango=Narango -controlledvocabulary.language.Nari_Nari=Nari Nari -controlledvocabulary.language.Naro=Naro -controlledvocabulary.language.Narom=Narom -controlledvocabulary.language.Narragansett=Narragansett -controlledvocabulary.language.Narua=Narua -controlledvocabulary.language.Narungga=Narungga -controlledvocabulary.language.Nasal=Nasal -controlledvocabulary.language.Nasarian=Nasarian -controlledvocabulary.language.Naskapi=Naskapi -controlledvocabulary.language.Natanzi=Natanzi -controlledvocabulary.language.Natchez=Natchez -controlledvocabulary.language.Nateni=Nateni -controlledvocabulary.language.Nathembo=Nathembo -controlledvocabulary.language.Natioro=Natioro -controlledvocabulary.language.Nat�gu=Nat�gu -controlledvocabulary.language.Nauete=Nauete -controlledvocabulary.language.Naukan_Yupik=Naukan Yupik -controlledvocabulary.language.Nauna=Nauna -controlledvocabulary.language.Nauo=Nauo -controlledvocabulary.language.Nauru=Nauru -controlledvocabulary.language.Navajo,_Navaho=Navajo, Navaho -controlledvocabulary.language.Navut=Navut -controlledvocabulary.language.Nawaru=Nawaru -controlledvocabulary.language.Nawathinehena=Nawathinehena -controlledvocabulary.language.Nawdm=Nawdm -controlledvocabulary.language.Nawuri=Nawuri -controlledvocabulary.language.Naxi=Naxi -controlledvocabulary.language.Nayi=Nayi -controlledvocabulary.language.Nayini=Nayini -controlledvocabulary.language.Ncane=Ncane -controlledvocabulary.language.Nchumbulu=Nchumbulu -controlledvocabulary.language.Nda'nda'=Nda'nda' -controlledvocabulary.language.Ndai=Ndai -controlledvocabulary.language.Ndaka=Ndaka -controlledvocabulary.language.Ndali=Ndali -controlledvocabulary.language.Ndam=Ndam -controlledvocabulary.language.Ndamba=Ndamba -controlledvocabulary.language.Ndambomo=Ndambomo -controlledvocabulary.language.Ndasa=Ndasa -controlledvocabulary.language.Ndau=Ndau -controlledvocabulary.language.Nde-Gbite=Nde-Gbite -controlledvocabulary.language.Nde-Nsele-Nta=Nde-Nsele-Nta -controlledvocabulary.language.Ndemli=Ndemli -controlledvocabulary.language.Ndendeule=Ndendeule -controlledvocabulary.language.Ndengereko=Ndengereko -controlledvocabulary.language.Nding=Nding -controlledvocabulary.language.Ndo=Ndo -controlledvocabulary.language.Ndobo=Ndobo -controlledvocabulary.language.Ndoe=Ndoe -controlledvocabulary.language.Ndogo=Ndogo -controlledvocabulary.language.Ndolo=Ndolo -controlledvocabulary.language.Ndom=Ndom -controlledvocabulary.language.Ndombe=Ndombe -controlledvocabulary.language.Ndonde_Hamba=Ndonde Hamba -controlledvocabulary.language.Ndonga=Ndonga -controlledvocabulary.language.Ndoola=Ndoola -controlledvocabulary.language.Ndra'ngith=Ndra'ngith -controlledvocabulary.language.Ndrulo=Ndrulo -controlledvocabulary.language.Nduga=Nduga -controlledvocabulary.language.Ndumu=Ndumu -controlledvocabulary.language.Ndunda=Ndunda -controlledvocabulary.language.Ndunga=Ndunga -controlledvocabulary.language.Ndut=Ndut -controlledvocabulary.language.Ndwewe=Ndwewe -controlledvocabulary.language.Ndyuka-Trio_Pidgin=Ndyuka-Trio Pidgin -controlledvocabulary.language.Ndzwani_Comorian=Ndzwani Comorian -controlledvocabulary.language.Neapolitan=Neapolitan -controlledvocabulary.language.Nedebang=Nedebang -controlledvocabulary.language.Nefamese=Nefamese -controlledvocabulary.language.Negerhollands=Negerhollands -controlledvocabulary.language.Negeri_Sembilan_Malay=Negeri Sembilan Malay -controlledvocabulary.language.Negidal=Negidal -controlledvocabulary.language.Nehan=Nehan -controlledvocabulary.language.Nek=Nek -controlledvocabulary.language.Nekgini=Nekgini -controlledvocabulary.language.Neko=Neko -controlledvocabulary.language.Neku=Neku -controlledvocabulary.language.Nema=Nema -controlledvocabulary.language.Neme=Neme -controlledvocabulary.language.Nemi=Nemi -controlledvocabulary.language.Nen=Nen -controlledvocabulary.language.Nend=Nend -controlledvocabulary.language.Nenets=Nenets -controlledvocabulary.language.Nengone=Nengone -controlledvocabulary.language.Neo=Neo -controlledvocabulary.language.Neo-Hittite=Neo-Hittite -controlledvocabulary.language.Nepalese_Sign_Language=Nepalese Sign Language -controlledvocabulary.language.Nepali=Nepali -controlledvocabulary.language.Nepali_(individual_language)=Nepali (individual language) -controlledvocabulary.language.Nete=Nete -controlledvocabulary.language.New_Caledonian_Javanese=New Caledonian Javanese -controlledvocabulary.language.New_Zealand_Sign_Language=New Zealand Sign Language -controlledvocabulary.language.Newari=Newari -controlledvocabulary.language.Neyo=Neyo -controlledvocabulary.language.Nez_Perce=Nez Perce -controlledvocabulary.language.Ngaanyatjarra=Ngaanyatjarra -controlledvocabulary.language.Ngad'a=Ngad'a -controlledvocabulary.language.Ngadjunmaya=Ngadjunmaya -controlledvocabulary.language.Ngadjuri=Ngadjuri -controlledvocabulary.language.Ngaing=Ngaing -controlledvocabulary.language.Ngaju=Ngaju -controlledvocabulary.language.Ngala=Ngala -controlledvocabulary.language.Ngalakgan=Ngalakgan -controlledvocabulary.language.Ngalum=Ngalum -controlledvocabulary.language.Ngam=Ngam -controlledvocabulary.language.Ngamambo=Ngamambo -controlledvocabulary.language.Ngambay=Ngambay -controlledvocabulary.language.Ngamini=Ngamini -controlledvocabulary.language.Ngamo=Ngamo -controlledvocabulary.language.Ngan'gityemerri=Ngan'gityemerri -controlledvocabulary.language.Nganakarti=Nganakarti -controlledvocabulary.language.Nganasan=Nganasan -controlledvocabulary.language.Ngandi=Ngandi -controlledvocabulary.language.Ngando_(Central_African_Republic)=Ngando (Central African Republic) -controlledvocabulary.language.Ngando_(Democratic_Republic_of_Congo)=Ngando (Democratic Republic of Congo) -controlledvocabulary.language.Ngandyera=Ngandyera -controlledvocabulary.language.Ngangam=Ngangam -controlledvocabulary.language.Ngantangarra=Ngantangarra -controlledvocabulary.language.Nganyaywana=Nganyaywana -controlledvocabulary.language.Ngardi=Ngardi -controlledvocabulary.language.Ngarigu=Ngarigu -controlledvocabulary.language.Ngarinyin=Ngarinyin -controlledvocabulary.language.Ngarinyman=Ngarinyman -controlledvocabulary.language.Ngarla=Ngarla -controlledvocabulary.language.Ngarluma=Ngarluma -controlledvocabulary.language.Ngarrindjeri=Ngarrindjeri -controlledvocabulary.language.Ngas=Ngas -controlledvocabulary.language.Ngasa=Ngasa -controlledvocabulary.language.Ngatik_Men's_Creole=Ngatik Men's Creole -controlledvocabulary.language.Ngawn_Chin=Ngawn Chin -controlledvocabulary.language.Ngawun=Ngawun -controlledvocabulary.language.Ngayawung=Ngayawung -controlledvocabulary.language.Ngazidja_Comorian=Ngazidja Comorian -controlledvocabulary.language.Ngbaka=Ngbaka -controlledvocabulary.language.Ngbaka_Ma'bo=Ngbaka Ma'bo -controlledvocabulary.language.Ngbaka_Manza=Ngbaka Manza -controlledvocabulary.language.Ngbee=Ngbee -controlledvocabulary.language.Ngbinda=Ngbinda -controlledvocabulary.language.Ngbundu=Ngbundu -controlledvocabulary.language.Ngelima=Ngelima -controlledvocabulary.language.Ngemba=Ngemba -controlledvocabulary.language.Ngen=Ngen -controlledvocabulary.language.Ngendelengo=Ngendelengo -controlledvocabulary.language.Ngete=Ngete -controlledvocabulary.language.Nggem=Nggem -controlledvocabulary.language.Nggwahyi=Nggwahyi -controlledvocabulary.language.Ngie=Ngie -controlledvocabulary.language.Ngiemboon=Ngiemboon -controlledvocabulary.language.Ngile=Ngile -controlledvocabulary.language.Ngindo=Ngindo -controlledvocabulary.language.Ngiti=Ngiti -controlledvocabulary.language.Ngizim=Ngizim -controlledvocabulary.language.Ngk�lmpw_Kanum=Ngk�lmpw Kanum -controlledvocabulary.language.Ngom=Ngom -controlledvocabulary.language.Ngomba=Ngomba -controlledvocabulary.language.Ngombale=Ngombale -controlledvocabulary.language.Ngombe_(Central_African_Republic)=Ngombe (Central African Republic) -controlledvocabulary.language.Ngombe_(Democratic_Republic_of_Congo)=Ngombe (Democratic Republic of Congo) -controlledvocabulary.language.Ngongo=Ngongo -controlledvocabulary.language.Ngoni_(Mozambique)=Ngoni (Mozambique) -controlledvocabulary.language.Ngoni_(Tanzania)=Ngoni (Tanzania) -controlledvocabulary.language.Ngoshie=Ngoshie -controlledvocabulary.language.Ngul=Ngul -controlledvocabulary.language.Ngulu=Ngulu -controlledvocabulary.language.Nguluwan=Nguluwan -controlledvocabulary.language.Ngumbarl=Ngumbarl -controlledvocabulary.language.Ngumbi=Ngumbi -controlledvocabulary.language.Ngunawal=Ngunawal -controlledvocabulary.language.Ngundi=Ngundi -controlledvocabulary.language.Ngundu=Ngundu -controlledvocabulary.language.Ngungwel=Ngungwel -controlledvocabulary.language.Ngurimi=Ngurimi -controlledvocabulary.language.Ngurmbur=Ngurmbur -controlledvocabulary.language.Ngu�n=Ngu�n -controlledvocabulary.language.Ngwaba=Ngwaba -controlledvocabulary.language.Ngwe=Ngwe -controlledvocabulary.language.Ngwo=Ngwo -controlledvocabulary.language.Ng�bere=Ng�bere -controlledvocabulary.language.Nhanda=Nhanda -controlledvocabulary.language.Nhengatu=Nhengatu -controlledvocabulary.language.Nhirrpi=Nhirrpi -controlledvocabulary.language.Nhuwala=Nhuwala -controlledvocabulary.language.Nias=Nias -controlledvocabulary.language.Nicaragua_Creole_English=Nicaragua Creole English -controlledvocabulary.language.Nicaraguan_Sign_Language=Nicaraguan Sign Language -controlledvocabulary.language.Niellim=Niellim -controlledvocabulary.language.Nigeria_Mambila=Nigeria Mambila -controlledvocabulary.language.Nigerian_Fulfulde=Nigerian Fulfulde -controlledvocabulary.language.Nigerian_Pidgin=Nigerian Pidgin -controlledvocabulary.language.Nigerian_Sign_Language=Nigerian Sign Language -controlledvocabulary.language.Nihali=Nihali -controlledvocabulary.language.Nii=Nii -controlledvocabulary.language.Niksek=Niksek -controlledvocabulary.language.Nila=Nila -controlledvocabulary.language.Nilamba=Nilamba -controlledvocabulary.language.Nimadi=Nimadi -controlledvocabulary.language.Nimanbur=Nimanbur -controlledvocabulary.language.Nimbari=Nimbari -controlledvocabulary.language.Nimboran=Nimboran -controlledvocabulary.language.Nimi=Nimi -controlledvocabulary.language.Nimo=Nimo -controlledvocabulary.language.Nimoa=Nimoa -controlledvocabulary.language.Ninam=Ninam -controlledvocabulary.language.Nindi=Nindi -controlledvocabulary.language.Ningera=Ningera -controlledvocabulary.language.Ninggerum=Ninggerum -controlledvocabulary.language.Ningil=Ningil -controlledvocabulary.language.Ninia_Yali=Ninia Yali -controlledvocabulary.language.Ninzo=Ninzo -controlledvocabulary.language.Nipsan=Nipsan -controlledvocabulary.language.Nisa=Nisa -controlledvocabulary.language.Nisenan=Nisenan -controlledvocabulary.language.Nisga'a=Nisga'a -controlledvocabulary.language.Nisi_(China)=Nisi (China) -controlledvocabulary.language.Niuafo'ou=Niuafo'ou -controlledvocabulary.language.Niuatoputapu=Niuatoputapu -controlledvocabulary.language.Niuean=Niuean -controlledvocabulary.language.Nivacl�=Nivacl� -controlledvocabulary.language.Niwer_Mil=Niwer Mil -controlledvocabulary.language.Njalgulgule=Njalgulgule -controlledvocabulary.language.Njebi=Njebi -controlledvocabulary.language.Njen=Njen -controlledvocabulary.language.Njerep=Njerep -controlledvocabulary.language.Njyem=Njyem -controlledvocabulary.language.Nkami=Nkami -controlledvocabulary.language.Nkangala=Nkangala -controlledvocabulary.language.Nkari=Nkari -controlledvocabulary.language.Nkem-Nkum=Nkem-Nkum -controlledvocabulary.language.Nkhumbi=Nkhumbi -controlledvocabulary.language.Nkongho=Nkongho -controlledvocabulary.language.Nkonya=Nkonya -controlledvocabulary.language.Nkoroo=Nkoroo -controlledvocabulary.language.Nkoya=Nkoya -controlledvocabulary.language.Nkukoli=Nkukoli -controlledvocabulary.language.Nkutu=Nkutu -controlledvocabulary.language.Nnam=Nnam -controlledvocabulary.language.No_linguistic_content=No linguistic content -controlledvocabulary.language.Nobiin=Nobiin -controlledvocabulary.language.Nobonob=Nobonob -controlledvocabulary.language.Nocte_Naga=Nocte Naga -controlledvocabulary.language.Nogai=Nogai -controlledvocabulary.language.Noipx=Noipx -controlledvocabulary.language.Noiri=Noiri -controlledvocabulary.language.Nokuku=Nokuku -controlledvocabulary.language.Nomaande=Nomaande -controlledvocabulary.language.Nomane=Nomane -controlledvocabulary.language.Nomatsiguenga=Nomatsiguenga -controlledvocabulary.language.Nomlaki=Nomlaki -controlledvocabulary.language.Nomu=Nomu -controlledvocabulary.language.Nong_Zhuang=Nong Zhuang -controlledvocabulary.language.Nonuya=Nonuya -controlledvocabulary.language.Nooksack=Nooksack -controlledvocabulary.language.Noon=Noon -controlledvocabulary.language.Noone=Noone -controlledvocabulary.language.Nopala_Chatino=Nopala Chatino -controlledvocabulary.language.Noric=Noric -controlledvocabulary.language.Norn=Norn -controlledvocabulary.language.Norra=Norra -controlledvocabulary.language.North_Alaskan_Inupiatun=North Alaskan Inupiatun -controlledvocabulary.language.North_Ambrym=North Ambrym -controlledvocabulary.language.North_Asmat=North Asmat -controlledvocabulary.language.North_Awyu=North Awyu -controlledvocabulary.language.North_Azerbaijani=North Azerbaijani -controlledvocabulary.language.North_Babar=North Babar -controlledvocabulary.language.North_Bolivian_Quechua=North Bolivian Quechua -controlledvocabulary.language.North_Central_Mixe=North Central Mixe -controlledvocabulary.language.North_Efate=North Efate -controlledvocabulary.language.North_Fali=North Fali -controlledvocabulary.language.North_Giziga=North Giziga -controlledvocabulary.language.North_Jun�n_Quechua=North Jun�n Quechua -controlledvocabulary.language.North_Marquesan=North Marquesan -controlledvocabulary.language.North_Mesopotamian_Arabic=North Mesopotamian Arabic -controlledvocabulary.language.North_Midlands_Tasmanian=North Midlands Tasmanian -controlledvocabulary.language.North_Mofu=North Mofu -controlledvocabulary.language.North_Moluccan_Malay=North Moluccan Malay -controlledvocabulary.language.North_Muyu=North Muyu -controlledvocabulary.language.North_Nuaulu=North Nuaulu -controlledvocabulary.language.North_Picene=North Picene -controlledvocabulary.language.North_Slavey=North Slavey -controlledvocabulary.language.North_Tairora=North Tairora -controlledvocabulary.language.North_Tanna=North Tanna -controlledvocabulary.language.North_Wahgi=North Wahgi -controlledvocabulary.language.North_Watut=North Watut -controlledvocabulary.language.Northeast_Kiwai=Northeast Kiwai -controlledvocabulary.language.Northeast_Maidu=Northeast Maidu -controlledvocabulary.language.Northeast_Pashai=Northeast Pashai -controlledvocabulary.language.Northeastern_Dinka=Northeastern Dinka -controlledvocabulary.language.Northeastern_Pomo=Northeastern Pomo -controlledvocabulary.language.Northeastern_Tasmanian=Northeastern Tasmanian -controlledvocabulary.language.Northeastern_Thai=Northeastern Thai -controlledvocabulary.language.Northern_Alta=Northern Alta -controlledvocabulary.language.Northern_Altai=Northern Altai -controlledvocabulary.language.Northern_Amami-Oshima=Northern Amami-Oshima -controlledvocabulary.language.Northern_Betsimisaraka_Malagasy=Northern Betsimisaraka Malagasy -controlledvocabulary.language.Northern_Binukidnon=Northern Binukidnon -controlledvocabulary.language.Northern_Bobo_Madar�=Northern Bobo Madar� -controlledvocabulary.language.Northern_Bontok=Northern Bontok -controlledvocabulary.language.Northern_Catanduanes_Bikol=Northern Catanduanes Bikol -controlledvocabulary.language.Northern_Conchucos_Ancash_Quechua=Northern Conchucos Ancash Quechua -controlledvocabulary.language.Northern_Dagara=Northern Dagara -controlledvocabulary.language.Northern_Dong=Northern Dong -controlledvocabulary.language.Northern_East_Cree=Northern East Cree -controlledvocabulary.language.Northern_Ember�=Northern Ember� -controlledvocabulary.language.Northern_Frisian=Northern Frisian -controlledvocabulary.language.Northern_Ghale=Northern Ghale -controlledvocabulary.language.Northern_Gondi=Northern Gondi -controlledvocabulary.language.Northern_Grebo=Northern Grebo -controlledvocabulary.language.Northern_Guiyang_Hmong=Northern Guiyang Hmong -controlledvocabulary.language.Northern_Haida=Northern Haida -controlledvocabulary.language.Northern_Hindko=Northern Hindko -controlledvocabulary.language.Northern_Huishui_Hmong=Northern Huishui Hmong -controlledvocabulary.language.Northern_Kalapuya=Northern Kalapuya -controlledvocabulary.language.Northern_Kankanay=Northern Kankanay -controlledvocabulary.language.Northern_Katang=Northern Katang -controlledvocabulary.language.Northern_Khmer=Northern Khmer -controlledvocabulary.language.Northern_Kissi=Northern Kissi -controlledvocabulary.language.Northern_Kurdish=Northern Kurdish -controlledvocabulary.language.Northern_Luri=Northern Luri -controlledvocabulary.language.Northern_Mashan_Hmong=Northern Mashan Hmong -controlledvocabulary.language.Northern_Muji=Northern Muji -controlledvocabulary.language.Northern_Nago=Northern Nago -controlledvocabulary.language.Northern_Ndebele=Northern Ndebele -controlledvocabulary.language.Northern_Ngbandi=Northern Ngbandi -controlledvocabulary.language.Northern_Nisu=Northern Nisu -controlledvocabulary.language.Northern_Nuni=Northern Nuni -controlledvocabulary.language.Northern_Oaxaca_Nahuatl=Northern Oaxaca Nahuatl -controlledvocabulary.language.Northern_Ohlone=Northern Ohlone -controlledvocabulary.language.Northern_One=Northern One -controlledvocabulary.language.Northern_Paiute=Northern Paiute -controlledvocabulary.language.Northern_Pame=Northern Pame -controlledvocabulary.language.Northern_Pashto=Northern Pashto -controlledvocabulary.language.Northern_Pastaza_Quichua=Northern Pastaza Quichua -controlledvocabulary.language.Northern_Ping_Chinese=Northern Ping Chinese -controlledvocabulary.language.Northern_Pomo=Northern Pomo -controlledvocabulary.language.Northern_Puebla_Nahuatl=Northern Puebla Nahuatl -controlledvocabulary.language.Northern_Pumi=Northern Pumi -controlledvocabulary.language.Northern_Qiandong_Miao=Northern Qiandong Miao -controlledvocabulary.language.Northern_Qiang=Northern Qiang -controlledvocabulary.language.Northern_Rengma_Naga=Northern Rengma Naga -controlledvocabulary.language.Northern_Roglai=Northern Roglai -controlledvocabulary.language.Northern_Sami=Northern Sami -controlledvocabulary.language.Northern_Sierra_Miwok=Northern Sierra Miwok -controlledvocabulary.language.Northern_Sorsoganon=Northern Sorsoganon -controlledvocabulary.language.Northern_Subanen=Northern Subanen -controlledvocabulary.language.Northern_Tarahumara=Northern Tarahumara -controlledvocabulary.language.Northern_Tasmanian=Northern Tasmanian -controlledvocabulary.language.Northern_Tepehuan=Northern Tepehuan -controlledvocabulary.language.Northern_Thai=Northern Thai -controlledvocabulary.language.Northern_Tidung=Northern Tidung -controlledvocabulary.language.Northern_Tiwa=Northern Tiwa -controlledvocabulary.language.Northern_Tlaxiaco_Mixtec=Northern Tlaxiaco Mixtec -controlledvocabulary.language.Northern_Toussian=Northern Toussian -controlledvocabulary.language.Northern_Tujia=Northern Tujia -controlledvocabulary.language.Northern_Tutchone=Northern Tutchone -controlledvocabulary.language.Northern_Uzbek=Northern Uzbek -controlledvocabulary.language.Northern_Yukaghir=Northern Yukaghir -controlledvocabulary.language.Northwest_Alaska_Inupiatun=Northwest Alaska Inupiatun -controlledvocabulary.language.Northwest_Gbaya=Northwest Gbaya -controlledvocabulary.language.Northwest_Maidu=Northwest Maidu -controlledvocabulary.language.Northwest_Oaxaca_Mixtec=Northwest Oaxaca Mixtec -controlledvocabulary.language.Northwest_Pashai=Northwest Pashai -controlledvocabulary.language.Northwestern_Dinka=Northwestern Dinka -controlledvocabulary.language.Northwestern_Fars=Northwestern Fars -controlledvocabulary.language.Northwestern_Kolami=Northwestern Kolami -controlledvocabulary.language.Northwestern_Nisu=Northwestern Nisu -controlledvocabulary.language.Northwestern_Ojibwa=Northwestern Ojibwa -controlledvocabulary.language.Northwestern_Tasmanian=Northwestern Tasmanian -controlledvocabulary.language.Norwegian=Norwegian -controlledvocabulary.language.Norwegian_Bokm�l=Norwegian Bokm�l -controlledvocabulary.language.Norwegian_Nynorsk=Norwegian Nynorsk -controlledvocabulary.language.Norwegian_Sign_Language=Norwegian Sign Language -controlledvocabulary.language.Notre=Notre -controlledvocabulary.language.Notsi=Notsi -controlledvocabulary.language.Nottoway=Nottoway -controlledvocabulary.language.Nottoway-Meherrin=Nottoway-Meherrin -controlledvocabulary.language.Novial=Novial -controlledvocabulary.language.Noy=Noy -controlledvocabulary.language.Nsenga=Nsenga -controlledvocabulary.language.Nshi=Nshi -controlledvocabulary.language.Nsongo=Nsongo -controlledvocabulary.language.Ntcham=Ntcham -controlledvocabulary.language.Nteng=Nteng -controlledvocabulary.language.Ntomba=Ntomba -controlledvocabulary.language.Nubaca=Nubaca -controlledvocabulary.language.Nubi=Nubi -controlledvocabulary.language.Nubri=Nubri -controlledvocabulary.language.Nuer=Nuer -controlledvocabulary.language.Nugunu_(Australia)=Nugunu (Australia) -controlledvocabulary.language.Nugunu_(Cameroon)=Nugunu (Cameroon) -controlledvocabulary.language.Nuk=Nuk -controlledvocabulary.language.Nukak_Mak�=Nukak Mak� -controlledvocabulary.language.Nukna=Nukna -controlledvocabulary.language.Nukuini=Nukuini -controlledvocabulary.language.Nukumanu=Nukumanu -controlledvocabulary.language.Nukunul=Nukunul -controlledvocabulary.language.Nukuoro=Nukuoro -controlledvocabulary.language.Nukuria=Nukuria -controlledvocabulary.language.Numana=Numana -controlledvocabulary.language.Numanggang=Numanggang -controlledvocabulary.language.Numbami=Numbami -controlledvocabulary.language.Nume=Nume -controlledvocabulary.language.Numidian=Numidian -controlledvocabulary.language.Num��=Num�� -controlledvocabulary.language.Nung_(Viet_Nam)=Nung (Viet Nam) -controlledvocabulary.language.Nungali=Nungali -controlledvocabulary.language.Nunggubuyu=Nunggubuyu -controlledvocabulary.language.Nungu=Nungu -controlledvocabulary.language.Nuosu=Nuosu -controlledvocabulary.language.Nupbikha=Nupbikha -controlledvocabulary.language.Nupe-Nupe-Tako=Nupe-Nupe-Tako -controlledvocabulary.language.Nusa_Laut=Nusa Laut -controlledvocabulary.language.Nusu=Nusu -controlledvocabulary.language.Nuu-chah-nulth=Nuu-chah-nulth -controlledvocabulary.language.Nyabwa=Nyabwa -controlledvocabulary.language.Nyaheun=Nyaheun -controlledvocabulary.language.Nyahkur=Nyahkur -controlledvocabulary.language.Nyakyusa-Ngonde=Nyakyusa-Ngonde -controlledvocabulary.language.Nyali=Nyali -controlledvocabulary.language.Nyam=Nyam -controlledvocabulary.language.Nyamal=Nyamal -controlledvocabulary.language.Nyambo=Nyambo -controlledvocabulary.language.Nyamusa-Molo=Nyamusa-Molo -controlledvocabulary.language.Nyamwanga=Nyamwanga -controlledvocabulary.language.Nyamwezi=Nyamwezi -controlledvocabulary.language.Nyaneka=Nyaneka -controlledvocabulary.language.Nyang'i=Nyang'i -controlledvocabulary.language.Nyanga=Nyanga -controlledvocabulary.language.Nyanga-li=Nyanga-li -controlledvocabulary.language.Nyangatom=Nyangatom -controlledvocabulary.language.Nyangbo=Nyangbo -controlledvocabulary.language.Nyangga=Nyangga -controlledvocabulary.language.Nyangumarta=Nyangumarta -controlledvocabulary.language.Nyankole=Nyankole -controlledvocabulary.language.Nyankpa=Nyankpa -controlledvocabulary.language.Nyarafolo_Senoufo=Nyarafolo Senoufo -controlledvocabulary.language.Nyaturu=Nyaturu -controlledvocabulary.language.Nyaw=Nyaw -controlledvocabulary.language.Nyawaygi=Nyawaygi -controlledvocabulary.language.Nyemba=Nyemba -controlledvocabulary.language.Nyengo=Nyengo -controlledvocabulary.language.Nyenkha=Nyenkha -controlledvocabulary.language.Nyeu=Nyeu -controlledvocabulary.language.Nyiha_(Malawi)=Nyiha (Malawi) -controlledvocabulary.language.Nyiha_(Tanzania)=Nyiha (Tanzania) -controlledvocabulary.language.Nyika_(Malawi_and_Zambia)=Nyika (Malawi and Zambia) -controlledvocabulary.language.Nyika_(Tanzania)=Nyika (Tanzania) -controlledvocabulary.language.Nyikina=Nyikina -controlledvocabulary.language.Nyindrou=Nyindrou -controlledvocabulary.language.Nyindu=Nyindu -controlledvocabulary.language.Nyishi=Nyishi -controlledvocabulary.language.Nyiyaparli=Nyiyaparli -controlledvocabulary.language.Nyokon=Nyokon -controlledvocabulary.language.Nyole=Nyole -controlledvocabulary.language.Nyong=Nyong -controlledvocabulary.language.Nyore=Nyore -controlledvocabulary.language.Nyoro=Nyoro -controlledvocabulary.language.Nyulnyul=Nyulnyul -controlledvocabulary.language.Nyungar=Nyungar -controlledvocabulary.language.Nyungwe=Nyungwe -controlledvocabulary.language.Ny�layu=Ny�layu -controlledvocabulary.language.Nzadi=Nzadi -controlledvocabulary.language.Nzakambay=Nzakambay -controlledvocabulary.language.Nzakara=Nzakara -controlledvocabulary.language.Nzanyi=Nzanyi -controlledvocabulary.language.Nzima=Nzima -controlledvocabulary.language.N�-Meo=N�-Meo -controlledvocabulary.language.N�l�mwa-Nixumwak=N�l�mwa-Nixumwak -controlledvocabulary.language.N�pode_Huitoto=N�pode Huitoto -controlledvocabulary.language.Nng=N?ng -controlledvocabulary.language.O'chi'chi'=O'chi'chi' -controlledvocabulary.language.O'du=O'du -controlledvocabulary.language.Obanliku=Obanliku -controlledvocabulary.language.Obispe�o=Obispe�o -controlledvocabulary.language.Oblo=Oblo -controlledvocabulary.language.Obo_Manobo=Obo Manobo -controlledvocabulary.language.Obokuitai=Obokuitai -controlledvocabulary.language.Obolo=Obolo -controlledvocabulary.language.Obulom=Obulom -controlledvocabulary.language.Ocaina=Ocaina -controlledvocabulary.language.Occitan=Occitan -controlledvocabulary.language.Ocotepec_Mixtec=Ocotepec Mixtec -controlledvocabulary.language.Ocotl�n_Zapotec=Ocotl�n Zapotec -controlledvocabulary.language.Od=Od -controlledvocabulary.language.Odia=Odia -controlledvocabulary.language.Odiai=Odiai -controlledvocabulary.language.Odoodee=Odoodee -controlledvocabulary.language.Odual=Odual -controlledvocabulary.language.Odut=Odut -controlledvocabulary.language.Ofay�=Ofay� -controlledvocabulary.language.Official_Aramaic_(700-300_BCE)=Official Aramaic (700-300 BCE) -controlledvocabulary.language.Ofo=Ofo -controlledvocabulary.language.Ogbah=Ogbah -controlledvocabulary.language.Ogbia=Ogbia -controlledvocabulary.language.Ogbogolo=Ogbogolo -controlledvocabulary.language.Ogbronuagum=Ogbronuagum -controlledvocabulary.language.Ogea=Ogea -controlledvocabulary.language.Oirata=Oirata -controlledvocabulary.language.Ojibwe,_Ojibwa=Ojibwe, Ojibwa -controlledvocabulary.language.Ojitl�n_Chinantec=Ojitl�n Chinantec -controlledvocabulary.language.Okanagan=Okanagan -controlledvocabulary.language.Oki-No-Erabu=Oki-No-Erabu -controlledvocabulary.language.Okiek=Okiek -controlledvocabulary.language.Oko-Eni-Osayen=Oko-Eni-Osayen -controlledvocabulary.language.Oko-Juwoi=Oko-Juwoi -controlledvocabulary.language.Okobo=Okobo -controlledvocabulary.language.Okodia=Okodia -controlledvocabulary.language.Okolie=Okolie -controlledvocabulary.language.Okolod=Okolod -controlledvocabulary.language.Okpamheri=Okpamheri -controlledvocabulary.language.Okpe_(Northwestern_Edo)=Okpe (Northwestern Edo) -controlledvocabulary.language.Okpe_(Southwestern_Edo)=Okpe (Southwestern Edo) -controlledvocabulary.language.Oksapmin=Oksapmin -controlledvocabulary.language.Oku=Oku -controlledvocabulary.language.Old_Aramaic_(up_to_700_BCE)=Old Aramaic (up to 700 BCE) -controlledvocabulary.language.Old_Avar=Old Avar -controlledvocabulary.language.Old_Breton=Old Breton -controlledvocabulary.language.Old_Burmese=Old Burmese -controlledvocabulary.language.Old_Cham=Old Cham -controlledvocabulary.language.Old_Chinese=Old Chinese -controlledvocabulary.language.Old_Church_Slavonic,_Church_Slavonic,_Old_Bulgarian=Old Church Slavonic, Church Slavonic, Old Bulgarian -controlledvocabulary.language.Old_Cornish=Old Cornish -controlledvocabulary.language.Old_Dutch=Old Dutch -controlledvocabulary.language.Old_English_(ca._450-1100)=Old English (ca. 450-1100) -controlledvocabulary.language.Old_French_(842-ca._1400)=Old French (842-ca. 1400) -controlledvocabulary.language.Old_Frisian=Old Frisian -controlledvocabulary.language.Old_Georgian=Old Georgian -controlledvocabulary.language.Old_High_German_(ca._750-1050)=Old High German (ca. 750-1050) -controlledvocabulary.language.Old_Hittite=Old Hittite -controlledvocabulary.language.Old_Hungarian=Old Hungarian -controlledvocabulary.language.Old_Irish_(to_900)=Old Irish (to 900) -controlledvocabulary.language.Old_Japanese=Old Japanese -controlledvocabulary.language.Old_Kentish_Sign_Language=Old Kentish Sign Language -controlledvocabulary.language.Old_Khmer=Old Khmer -controlledvocabulary.language.Old_Korean_(3rd-9th_cent.)=Old Korean (3rd-9th cent.) -controlledvocabulary.language.Old_Lithuanian=Old Lithuanian -controlledvocabulary.language.Old_Malay=Old Malay -controlledvocabulary.language.Old_Manipuri=Old Manipuri -controlledvocabulary.language.Old_Marathi=Old Marathi -controlledvocabulary.language.Old_Mon=Old Mon -controlledvocabulary.language.Old_Norse=Old Norse -controlledvocabulary.language.Old_Nubian=Old Nubian -controlledvocabulary.language.Old_Ossetic=Old Ossetic -controlledvocabulary.language.Old_Persian_(ca._600-400_B.C.)=Old Persian (ca. 600-400 B.C.) -controlledvocabulary.language.Old_Proven�al_(to_1500)=Old Proven�al (to 1500) -controlledvocabulary.language.Old_Russian=Old Russian -controlledvocabulary.language.Old_Saxon=Old Saxon -controlledvocabulary.language.Old_Spanish=Old Spanish -controlledvocabulary.language.Old_Sundanese=Old Sundanese -controlledvocabulary.language.Old_Tamil=Old Tamil -controlledvocabulary.language.Old_Tibetan=Old Tibetan -controlledvocabulary.language.Old_Turkish=Old Turkish -controlledvocabulary.language.Old_Uighur=Old Uighur -controlledvocabulary.language.Old_Welsh=Old Welsh -controlledvocabulary.language.Olekha=Olekha -controlledvocabulary.language.Olkol=Olkol -controlledvocabulary.language.Olo=Olo -controlledvocabulary.language.Oloma=Oloma -controlledvocabulary.language.Olrat=Olrat -controlledvocabulary.language.Olu'bo=Olu'bo -controlledvocabulary.language.Olulumo-Ikom=Olulumo-Ikom -controlledvocabulary.language.Oluta_Popoluca=Oluta Popoluca -controlledvocabulary.language.Omagua=Omagua -controlledvocabulary.language.Omaha-Ponca=Omaha-Ponca -controlledvocabulary.language.Omani_Arabic=Omani Arabic -controlledvocabulary.language.Ombamba=Ombamba -controlledvocabulary.language.Ombo=Ombo -controlledvocabulary.language.Ometepec_Nahuatl=Ometepec Nahuatl -controlledvocabulary.language.Omi=Omi -controlledvocabulary.language.Omok=Omok -controlledvocabulary.language.Omotik=Omotik -controlledvocabulary.language.Omurano=Omurano -controlledvocabulary.language.Ona=Ona -controlledvocabulary.language.Oneida=Oneida -controlledvocabulary.language.Ong=Ong -controlledvocabulary.language.Onin=Onin -controlledvocabulary.language.Onin_Based_Pidgin=Onin Based Pidgin -controlledvocabulary.language.Onjob=Onjob -controlledvocabulary.language.Ono=Ono -controlledvocabulary.language.Onobasulu=Onobasulu -controlledvocabulary.language.Onondaga=Onondaga -controlledvocabulary.language.Ontenu=Ontenu -controlledvocabulary.language.Ontong_Java=Ontong Java -controlledvocabulary.language.Oorlams=Oorlams -controlledvocabulary.language.Opao=Opao -controlledvocabulary.language.Opata=Opata -controlledvocabulary.language.Orang_Kanaq=Orang Kanaq -controlledvocabulary.language.Orang_Seletar=Orang Seletar -controlledvocabulary.language.Oraon_Sadri=Oraon Sadri -controlledvocabulary.language.Orej�n=Orej�n -controlledvocabulary.language.Oring=Oring -controlledvocabulary.language.Oriya=Oriya -controlledvocabulary.language.Orizaba_Nahuatl=Orizaba Nahuatl -controlledvocabulary.language.Orma=Orma -controlledvocabulary.language.Ormu=Ormu -controlledvocabulary.language.Ormuri=Ormuri -controlledvocabulary.language.Oro=Oro -controlledvocabulary.language.Oro_Win=Oro Win -controlledvocabulary.language.Oroch=Oroch -controlledvocabulary.language.Oroha=Oroha -controlledvocabulary.language.Orok=Orok -controlledvocabulary.language.Orokaiva=Orokaiva -controlledvocabulary.language.Oroko=Oroko -controlledvocabulary.language.Orokolo=Orokolo -controlledvocabulary.language.Oromo=Oromo -controlledvocabulary.language.Oroqen=Oroqen -controlledvocabulary.language.Orowe=Orowe -controlledvocabulary.language.Oruma=Oruma -controlledvocabulary.language.Orya=Orya -controlledvocabulary.language.Osage=Osage -controlledvocabulary.language.Osatu=Osatu -controlledvocabulary.language.Oscan=Oscan -controlledvocabulary.language.Osing=Osing -controlledvocabulary.language.Ososo=Ososo -controlledvocabulary.language.Ossetian,_Ossetic=Ossetian, Ossetic -controlledvocabulary.language.Ot_Danum=Ot Danum -controlledvocabulary.language.Otank=Otank -controlledvocabulary.language.Oti=Oti -controlledvocabulary.language.Otoro=Otoro -controlledvocabulary.language.Ottawa=Ottawa -controlledvocabulary.language.Ottoman_Turkish_(1500-1928)=Ottoman Turkish (1500-1928) -controlledvocabulary.language.Otuho=Otuho -controlledvocabulary.language.Otuke=Otuke -controlledvocabulary.language.Ouma=Ouma -controlledvocabulary.language.Oune=Oune -controlledvocabulary.language.Owa=Owa -controlledvocabulary.language.Owenia=Owenia -controlledvocabulary.language.Owiniga=Owiniga -controlledvocabulary.language.Oy=Oy -controlledvocabulary.language.Oya'oya=Oya'oya -controlledvocabulary.language.Oyda=Oyda -controlledvocabulary.language.Oyster_Bay_Tasmanian=Oyster Bay Tasmanian -controlledvocabulary.language.Ozolotepec_Zapotec=Ozolotepec Zapotec -controlledvocabulary.language.Ozumac�n_Chinantec=Ozumac�n Chinantec -controlledvocabulary.language.Pa_Di=Pa Di -controlledvocabulary.language.Pa'a=Pa'a -controlledvocabulary.language.Pa'o_Karen=Pa'o Karen -controlledvocabulary.language.Pa-Hng=Pa-Hng -controlledvocabulary.language.Paakantyi=Paakantyi -controlledvocabulary.language.Paama=Paama -controlledvocabulary.language.Paasaal=Paasaal -controlledvocabulary.language.Pacahuara=Pacahuara -controlledvocabulary.language.Pacaraos_Quechua=Pacaraos Quechua -controlledvocabulary.language.Pacific_Gulf_Yupik=Pacific Gulf Yupik -controlledvocabulary.language.Pacoh=Pacoh -controlledvocabulary.language.Padoe=Padoe -controlledvocabulary.language.Paekche=Paekche -controlledvocabulary.language.Paelignian=Paelignian -controlledvocabulary.language.Pagi=Pagi -controlledvocabulary.language.Pagibete=Pagibete -controlledvocabulary.language.Pagu=Pagu -controlledvocabulary.language.Pahanan_Agta=Pahanan Agta -controlledvocabulary.language.Pahari=Pahari -controlledvocabulary.language.Pahari-Potwari=Pahari-Potwari -controlledvocabulary.language.Pahi=Pahi -controlledvocabulary.language.Pahlavani=Pahlavani -controlledvocabulary.language.Pahlavi=Pahlavi -controlledvocabulary.language.Pai_Tavytera=Pai Tavytera -controlledvocabulary.language.Paic�=Paic� -controlledvocabulary.language.Paipai=Paipai -controlledvocabulary.language.Paite_Chin=Paite Chin -controlledvocabulary.language.Paiwan=Paiwan -controlledvocabulary.language.Pak-Tong=Pak-Tong -controlledvocabulary.language.Pakanha=Pakanha -controlledvocabulary.language.Paka�snovos=Paka�snovos -controlledvocabulary.language.Pakistan_Sign_Language=Pakistan Sign Language -controlledvocabulary.language.Paku=Paku -controlledvocabulary.language.Paku_Karen=Paku Karen -controlledvocabulary.language.Pal=Pal -controlledvocabulary.language.Palaic=Palaic -controlledvocabulary.language.Palaka_Senoufo=Palaka Senoufo -controlledvocabulary.language.Palantla_Chinantec=Palantla Chinantec -controlledvocabulary.language.Palauan=Palauan -controlledvocabulary.language.Paleni=Paleni -controlledvocabulary.language.Palenquero=Palenquero -controlledvocabulary.language.Palik�r=Palik�r -controlledvocabulary.language.Paliyan=Paliyan -controlledvocabulary.language.Pallanganmiddang=Pallanganmiddang -controlledvocabulary.language.Paloor=Paloor -controlledvocabulary.language.Palu'e=Palu'e -controlledvocabulary.language.Paluan=Paluan -controlledvocabulary.language.Palya_Bareli=Palya Bareli -controlledvocabulary.language.Pam=Pam -controlledvocabulary.language.Pambia=Pambia -controlledvocabulary.language.Pamona=Pamona -controlledvocabulary.language.Pamosu=Pamosu -controlledvocabulary.language.Pampanga=Pampanga -controlledvocabulary.language.Pamplona_Atta=Pamplona Atta -controlledvocabulary.language.Pana_(Burkina_Faso)=Pana (Burkina Faso) -controlledvocabulary.language.Pana_(Central_African_Republic)=Pana (Central African Republic) -controlledvocabulary.language.Panamanian_Sign_Language=Panamanian Sign Language -controlledvocabulary.language.Panamint=Panamint -controlledvocabulary.language.Panao_Hu�nuco_Quechua=Panao Hu�nuco Quechua -controlledvocabulary.language.Panar�=Panar� -controlledvocabulary.language.Panasuan=Panasuan -controlledvocabulary.language.Panawa=Panawa -controlledvocabulary.language.Pancana=Pancana -controlledvocabulary.language.Panchpargania=Panchpargania -controlledvocabulary.language.Pande=Pande -controlledvocabulary.language.Pangasinan=Pangasinan -controlledvocabulary.language.Pangseng=Pangseng -controlledvocabulary.language.Pangu=Pangu -controlledvocabulary.language.Pangutaran_Sama=Pangutaran Sama -controlledvocabulary.language.Pangwa=Pangwa -controlledvocabulary.language.Pangwali=Pangwali -controlledvocabulary.language.Panim=Panim -controlledvocabulary.language.Paniya=Paniya -controlledvocabulary.language.Panjabi,_Punjabi=Panjabi, Punjabi -controlledvocabulary.language.Pankarar�=Pankarar� -controlledvocabulary.language.Pankarar�=Pankarar� -controlledvocabulary.language.Pankhu=Pankhu -controlledvocabulary.language.Pannei=Pannei -controlledvocabulary.language.Pano=Pano -controlledvocabulary.language.Panoan_Katuk�na=Panoan Katuk�na -controlledvocabulary.language.Panobo=Panobo -controlledvocabulary.language.Panyi_Bai=Panyi Bai -controlledvocabulary.language.Papantla_Totonac=Papantla Totonac -controlledvocabulary.language.Papapana=Papapana -controlledvocabulary.language.Papar=Papar -controlledvocabulary.language.Papasena=Papasena -controlledvocabulary.language.Papel=Papel -controlledvocabulary.language.Papi=Papi -controlledvocabulary.language.Papiamento=Papiamento -controlledvocabulary.language.Papora=Papora -controlledvocabulary.language.Papua_New_Guinean_Sign_Language=Papua New Guinean Sign Language -controlledvocabulary.language.Papuan_Malay=Papuan Malay -controlledvocabulary.language.Papuma=Papuma -controlledvocabulary.language.Parachi=Parachi -controlledvocabulary.language.Paraguayan_Guaran�=Paraguayan Guaran� -controlledvocabulary.language.Paraguayan_Sign_Language=Paraguayan Sign Language -controlledvocabulary.language.Parakan�=Parakan� -controlledvocabulary.language.Paranan=Paranan -controlledvocabulary.language.Paranaw�t=Paranaw�t -controlledvocabulary.language.Paraujano=Paraujano -controlledvocabulary.language.Parauk=Parauk -controlledvocabulary.language.Parawen=Parawen -controlledvocabulary.language.Pardhan=Pardhan -controlledvocabulary.language.Pardhi=Pardhi -controlledvocabulary.language.Pare=Pare -controlledvocabulary.language.Parec�s=Parec�s -controlledvocabulary.language.Parenga=Parenga -controlledvocabulary.language.Parkari_Koli=Parkari Koli -controlledvocabulary.language.Parkwa=Parkwa -controlledvocabulary.language.Parsi-Dari=Parsi-Dari -controlledvocabulary.language.Parthian=Parthian -controlledvocabulary.language.Parya=Parya -controlledvocabulary.language.Par�_Ar�ra=Par� Ar�ra -controlledvocabulary.language.Par�_Gavi�o=Par� Gavi�o -controlledvocabulary.language.Pashto,_Pushto=Pashto, Pushto -controlledvocabulary.language.Pasi=Pasi -controlledvocabulary.language.Pass_Valley_Yali=Pass Valley Yali -controlledvocabulary.language.Patamona=Patamona -controlledvocabulary.language.Patani=Patani -controlledvocabulary.language.Patax�_H�-Ha-H�e=Patax� H�-Ha-H�e -controlledvocabulary.language.Patep=Patep -controlledvocabulary.language.Pathiya=Pathiya -controlledvocabulary.language.Patpatar=Patpatar -controlledvocabulary.language.Pattani=Pattani -controlledvocabulary.language.Pattani_Malay=Pattani Malay -controlledvocabulary.language.Pattapu=Pattapu -controlledvocabulary.language.Patwin=Patwin -controlledvocabulary.language.Paulohi=Paulohi -controlledvocabulary.language.Paumar�=Paumar� -controlledvocabulary.language.Paunaka=Paunaka -controlledvocabulary.language.Pauri_Bareli=Pauri Bareli -controlledvocabulary.language.Pauserna=Pauserna -controlledvocabulary.language.Pawaia=Pawaia -controlledvocabulary.language.Pawnee=Pawnee -controlledvocabulary.language.Paynamar=Paynamar -controlledvocabulary.language.Pazeh=Pazeh -controlledvocabulary.language.Pe=Pe -controlledvocabulary.language.Pear=Pear -controlledvocabulary.language.Pech=Pech -controlledvocabulary.language.Pecheneg=Pecheneg -controlledvocabulary.language.Pedi=Pedi -controlledvocabulary.language.Pei=Pei -controlledvocabulary.language.Pekal=Pekal -controlledvocabulary.language.Pela=Pela -controlledvocabulary.language.Pele-Ata=Pele-Ata -controlledvocabulary.language.Pelende=Pelende -controlledvocabulary.language.Pemon=Pemon -controlledvocabulary.language.Penang_Sign_Language=Penang Sign Language -controlledvocabulary.language.Penchal=Penchal -controlledvocabulary.language.Pendau=Pendau -controlledvocabulary.language.Pengo=Pengo -controlledvocabulary.language.Pennsylvania_German=Pennsylvania German -controlledvocabulary.language.Penrhyn=Penrhyn -controlledvocabulary.language.Pentlatch=Pentlatch -controlledvocabulary.language.Perai=Perai -controlledvocabulary.language.Peranakan_Indonesian=Peranakan Indonesian -controlledvocabulary.language.Pere=Pere -controlledvocabulary.language.Peripheral_Mongolian=Peripheral Mongolian -controlledvocabulary.language.Pero=Pero -controlledvocabulary.language.Persian_(Farsi)=Persian (Farsi) -controlledvocabulary.language.Peruvian_Sign_Language=Peruvian Sign Language -controlledvocabulary.language.Pesse=Pesse -controlledvocabulary.language.Petapa_Zapotec=Petapa Zapotec -controlledvocabulary.language.Petats=Petats -controlledvocabulary.language.Petjo=Petjo -controlledvocabulary.language.Pe�oles_Mixtec=Pe�oles Mixtec -controlledvocabulary.language.Pfaelzisch=Pfaelzisch -controlledvocabulary.language.Phai=Phai -controlledvocabulary.language.Phake=Phake -controlledvocabulary.language.Phala=Phala -controlledvocabulary.language.Phalura=Phalura -controlledvocabulary.language.Phana'=Phana' -controlledvocabulary.language.Phangduwali=Phangduwali -controlledvocabulary.language.Phende=Phende -controlledvocabulary.language.Philippine_Sign_Language=Philippine Sign Language -controlledvocabulary.language.Phimbi=Phimbi -controlledvocabulary.language.Phoenician=Phoenician -controlledvocabulary.language.Phola=Phola -controlledvocabulary.language.Pholo=Pholo -controlledvocabulary.language.Phom_Naga=Phom Naga -controlledvocabulary.language.Phong-Kniang=Phong-Kniang -controlledvocabulary.language.Phrae_Pwo_Karen=Phrae Pwo Karen -controlledvocabulary.language.Phrygian=Phrygian -controlledvocabulary.language.Phu_Thai=Phu Thai -controlledvocabulary.language.Phuan=Phuan -controlledvocabulary.language.Phudagi=Phudagi -controlledvocabulary.language.Phuie=Phuie -controlledvocabulary.language.Phukha=Phukha -controlledvocabulary.language.Phuma=Phuma -controlledvocabulary.language.Phunoi=Phunoi -controlledvocabulary.language.Phuong=Phuong -controlledvocabulary.language.Phupa=Phupa -controlledvocabulary.language.Phupha=Phupha -controlledvocabulary.language.Phuza=Phuza -controlledvocabulary.language.Piamatsina=Piamatsina -controlledvocabulary.language.Piame=Piame -controlledvocabulary.language.Piapoco=Piapoco -controlledvocabulary.language.Piaroa=Piaroa -controlledvocabulary.language.Picard=Picard -controlledvocabulary.language.Pichis_Ash�ninka=Pichis Ash�ninka -controlledvocabulary.language.Pictish=Pictish -controlledvocabulary.language.Pidgin_Delaware=Pidgin Delaware -controlledvocabulary.language.Piemontese=Piemontese -controlledvocabulary.language.Pijao=Pijao -controlledvocabulary.language.Pije=Pije -controlledvocabulary.language.Pijin=Pijin -controlledvocabulary.language.Pilag�=Pilag� -controlledvocabulary.language.Pileni=Pileni -controlledvocabulary.language.Pima_Bajo=Pima Bajo -controlledvocabulary.language.Pimbwe=Pimbwe -controlledvocabulary.language.Pinai-Hagahai=Pinai-Hagahai -controlledvocabulary.language.Pindiini=Pindiini -controlledvocabulary.language.Pingelapese=Pingelapese -controlledvocabulary.language.Pinigura=Pinigura -controlledvocabulary.language.Pinjarup=Pinjarup -controlledvocabulary.language.Pinji=Pinji -controlledvocabulary.language.Pinotepa_Nacional_Mixtec=Pinotepa Nacional Mixtec -controlledvocabulary.language.Pintupi-Luritja=Pintupi-Luritja -controlledvocabulary.language.Pinyin=Pinyin -controlledvocabulary.language.Pipil=Pipil -controlledvocabulary.language.Pirah�=Pirah� -controlledvocabulary.language.Piratapuyo=Piratapuyo -controlledvocabulary.language.Pirlatapa=Pirlatapa -controlledvocabulary.language.Piro=Piro -controlledvocabulary.language.Pirriya=Pirriya -controlledvocabulary.language.Pisabo=Pisabo -controlledvocabulary.language.Pisaflores_Tepehua=Pisaflores Tepehua -controlledvocabulary.language.Piscataway=Piscataway -controlledvocabulary.language.Pisidian=Pisidian -controlledvocabulary.language.Pitcairn-Norfolk=Pitcairn-Norfolk -controlledvocabulary.language.Pite_Sami=Pite Sami -controlledvocabulary.language.Piti=Piti -controlledvocabulary.language.Pitjantjatjara=Pitjantjatjara -controlledvocabulary.language.Pitta_Pitta=Pitta Pitta -controlledvocabulary.language.Piu=Piu -controlledvocabulary.language.Piya-Kwonci=Piya-Kwonci -controlledvocabulary.language.Plains_Cree=Plains Cree -controlledvocabulary.language.Plains_Indian_Sign_Language=Plains Indian Sign Language -controlledvocabulary.language.Plains_Miwok=Plains Miwok -controlledvocabulary.language.Plapo_Krumen=Plapo Krumen -controlledvocabulary.language.Plateau_Malagasy=Plateau Malagasy -controlledvocabulary.language.Plautdietsch=Plautdietsch -controlledvocabulary.language.Playero=Playero -controlledvocabulary.language.Pnar=Pnar -controlledvocabulary.language.Pochuri_Naga=Pochuri Naga -controlledvocabulary.language.Pochutec=Pochutec -controlledvocabulary.language.Podena=Podena -controlledvocabulary.language.Pogolo=Pogolo -controlledvocabulary.language.Pohnpeian=Pohnpeian -controlledvocabulary.language.Pokang�=Pokang� -controlledvocabulary.language.Poke=Poke -controlledvocabulary.language.Pokomo=Pokomo -controlledvocabulary.language.Polabian=Polabian -controlledvocabulary.language.Polari=Polari -controlledvocabulary.language.Polish=Polish -controlledvocabulary.language.Polish_Sign_Language=Polish Sign Language -controlledvocabulary.language.Polonombauk=Polonombauk -controlledvocabulary.language.Pom=Pom -controlledvocabulary.language.Pomo=Pomo -controlledvocabulary.language.Ponam=Ponam -controlledvocabulary.language.Ponosakan=Ponosakan -controlledvocabulary.language.Pontic=Pontic -controlledvocabulary.language.Ponyo-Gongwang_Naga=Ponyo-Gongwang Naga -controlledvocabulary.language.Popti'=Popti' -controlledvocabulary.language.Poqomam=Poqomam -controlledvocabulary.language.Poqomchi'=Poqomchi' -controlledvocabulary.language.Porohanon=Porohanon -controlledvocabulary.language.Port_Sandwich=Port Sandwich -controlledvocabulary.language.Port_Sorell_Tasmanian=Port Sorell Tasmanian -controlledvocabulary.language.Port_Vato=Port Vato -controlledvocabulary.language.Portuguese=Portuguese -controlledvocabulary.language.Portuguese_Sign_Language=Portuguese Sign Language -controlledvocabulary.language.Potawatomi=Potawatomi -controlledvocabulary.language.Potigu�ra=Potigu�ra -controlledvocabulary.language.Pottangi_Ollar_Gadaba=Pottangi Ollar Gadaba -controlledvocabulary.language.Poumei_Naga=Poumei Naga -controlledvocabulary.language.Pouye=Pouye -controlledvocabulary.language.Powari=Powari -controlledvocabulary.language.Powhatan=Powhatan -controlledvocabulary.language.Poyan�wa=Poyan�wa -controlledvocabulary.language.Prasuni=Prasuni -controlledvocabulary.language.Primitive_Irish=Primitive Irish -controlledvocabulary.language.Principense=Principense -controlledvocabulary.language.Providencia_Sign_Language=Providencia Sign Language -controlledvocabulary.language.Prussian=Prussian -controlledvocabulary.language.Psikye=Psikye -controlledvocabulary.language.Pu-Xian_Chinese=Pu-Xian Chinese -controlledvocabulary.language.Puare=Puare -controlledvocabulary.language.Pudtol_Atta=Pudtol Atta -controlledvocabulary.language.Puebla_Mazatec=Puebla Mazatec -controlledvocabulary.language.Puelche=Puelche -controlledvocabulary.language.Puerto_Rican_Sign_Language=Puerto Rican Sign Language -controlledvocabulary.language.Puimei_Naga=Puimei Naga -controlledvocabulary.language.Puinave=Puinave -controlledvocabulary.language.Pukapuka=Pukapuka -controlledvocabulary.language.Pulaar=Pulaar -controlledvocabulary.language.Pulabu=Pulabu -controlledvocabulary.language.Pular=Pular -controlledvocabulary.language.Puluwatese=Puluwatese -controlledvocabulary.language.Puma=Puma -controlledvocabulary.language.Pumpokol=Pumpokol -controlledvocabulary.language.Pum�=Pum� -controlledvocabulary.language.Punan_Aput=Punan Aput -controlledvocabulary.language.Punan_Bah-Biau=Punan Bah-Biau -controlledvocabulary.language.Punan_Batu_1=Punan Batu 1 -controlledvocabulary.language.Punan_Merah=Punan Merah -controlledvocabulary.language.Punan_Merap=Punan Merap -controlledvocabulary.language.Punan_Tubu=Punan Tubu -controlledvocabulary.language.Punic=Punic -controlledvocabulary.language.Puno_Quechua=Puno Quechua -controlledvocabulary.language.Punthamara=Punthamara -controlledvocabulary.language.Punu=Punu -controlledvocabulary.language.Puoc=Puoc -controlledvocabulary.language.Puquina=Puquina -controlledvocabulary.language.Puragi=Puragi -controlledvocabulary.language.Purari=Purari -controlledvocabulary.language.Purepecha=Purepecha -controlledvocabulary.language.Puri=Puri -controlledvocabulary.language.Purik=Purik -controlledvocabulary.language.Purisime�o=Purisime�o -controlledvocabulary.language.Puroik=Puroik -controlledvocabulary.language.Purubor�=Purubor� -controlledvocabulary.language.Purum=Purum -controlledvocabulary.language.Putai=Putai -controlledvocabulary.language.Putoh=Putoh -controlledvocabulary.language.Putukwam=Putukwam -controlledvocabulary.language.Puyo=Puyo -controlledvocabulary.language.Puyo-Paekche=Puyo-Paekche -controlledvocabulary.language.Puyuma=Puyuma -controlledvocabulary.language.Pwaamei=Pwaamei -controlledvocabulary.language.Pwapw�=Pwapw� -controlledvocabulary.language.Pwo_Eastern_Karen=Pwo Eastern Karen -controlledvocabulary.language.Pwo_Northern_Karen=Pwo Northern Karen -controlledvocabulary.language.Pwo_Western_Karen=Pwo Western Karen -controlledvocabulary.language.Pyapun=Pyapun -controlledvocabulary.language.Pye_Krumen=Pye Krumen -controlledvocabulary.language.Pyen=Pyen -controlledvocabulary.language.Pyu_(Myanmar)=Pyu (Myanmar) -controlledvocabulary.language.Pyu_(Papua_New_Guinea)=Pyu (Papua New Guinea) -controlledvocabulary.language.P�ez=P�ez -controlledvocabulary.language.P��fang=P��fang -controlledvocabulary.language.P�ri=P�ri -controlledvocabulary.language.P�mono=P�mono -controlledvocabulary.language.P�v�=P�v� -controlledvocabulary.language.P�koot=P�koot -controlledvocabulary.language.Pli=P?li -controlledvocabulary.language.Q'anjob'al=Q'anjob'al -controlledvocabulary.language.Qabiao=Qabiao -controlledvocabulary.language.Qaqet=Qaqet -controlledvocabulary.language.Qashqa'i=Qashqa'i -controlledvocabulary.language.Qatabanian=Qatabanian -controlledvocabulary.language.Qau=Qau -controlledvocabulary.language.Qawasqar=Qawasqar -controlledvocabulary.language.Qila_Muji=Qila Muji -controlledvocabulary.language.Qimant=Qimant -controlledvocabulary.language.Qiubei_Zhuang=Qiubei Zhuang -controlledvocabulary.language.Quapaw=Quapaw -controlledvocabulary.language.Quebec_Sign_Language=Quebec Sign Language -controlledvocabulary.language.Quechan=Quechan -controlledvocabulary.language.Quechua=Quechua -controlledvocabulary.language.Quenya=Quenya -controlledvocabulary.language.Quer�taro_Otomi=Quer�taro Otomi -controlledvocabulary.language.Quetzaltepec_Mixe=Quetzaltepec Mixe -controlledvocabulary.language.Queyu=Queyu -controlledvocabulary.language.Quiavicuzas_Zapotec=Quiavicuzas Zapotec -controlledvocabulary.language.Quileute=Quileute -controlledvocabulary.language.Quinault=Quinault -controlledvocabulary.language.Quinqui=Quinqui -controlledvocabulary.language.Quioquitani-Quier�_Zapotec=Quioquitani-Quier� Zapotec -controlledvocabulary.language.Quiotepec_Chinantec=Quiotepec Chinantec -controlledvocabulary.language.Quiripi=Quiripi -controlledvocabulary.language.Rabha=Rabha -controlledvocabulary.language.Rade=Rade -controlledvocabulary.language.Raetic=Raetic -controlledvocabulary.language.Rahambuu=Rahambuu -controlledvocabulary.language.Rajah_Kabunsuwan_Manobo=Rajah Kabunsuwan Manobo -controlledvocabulary.language.Rajasthani=Rajasthani -controlledvocabulary.language.Rajbanshi=Rajbanshi -controlledvocabulary.language.Raji=Raji -controlledvocabulary.language.Rajong=Rajong -controlledvocabulary.language.Rajput_Garasia=Rajput Garasia -controlledvocabulary.language.Rakahanga-Manihiki=Rakahanga-Manihiki -controlledvocabulary.language.Rakhine=Rakhine -controlledvocabulary.language.Ralte=Ralte -controlledvocabulary.language.Rama=Rama -controlledvocabulary.language.Ramoaaina=Ramoaaina -controlledvocabulary.language.Ramopa=Ramopa -controlledvocabulary.language.Rampi=Rampi -controlledvocabulary.language.Rana_Tharu=Rana Tharu -controlledvocabulary.language.Rang=Rang -controlledvocabulary.language.Rangi=Rangi -controlledvocabulary.language.Rangkas=Rangkas -controlledvocabulary.language.Ranglong=Ranglong -controlledvocabulary.language.Rangpuri=Rangpuri -controlledvocabulary.language.Rao=Rao -controlledvocabulary.language.Rapa=Rapa -controlledvocabulary.language.Rapanui=Rapanui -controlledvocabulary.language.Rapoisi=Rapoisi -controlledvocabulary.language.Rapting=Rapting -controlledvocabulary.language.Rara_Bakati'=Rara Bakati' -controlledvocabulary.language.Rarotongan=Rarotongan -controlledvocabulary.language.Rasawa=Rasawa -controlledvocabulary.language.Ratagnon=Ratagnon -controlledvocabulary.language.Ratahan=Ratahan -controlledvocabulary.language.Rathawi=Rathawi -controlledvocabulary.language.Rathwi_Bareli=Rathwi Bareli -controlledvocabulary.language.Raute=Raute -controlledvocabulary.language.Ravula=Ravula -controlledvocabulary.language.Rawa=Rawa -controlledvocabulary.language.Rawang=Rawang -controlledvocabulary.language.Rawat=Rawat -controlledvocabulary.language.Rawngtu_Chin=Rawngtu Chin -controlledvocabulary.language.Rawo=Rawo -controlledvocabulary.language.Ray�n_Zoque=Ray�n Zoque -controlledvocabulary.language.Razajerdi=Razajerdi -controlledvocabulary.language.Red_Gelao=Red Gelao -controlledvocabulary.language.Reel=Reel -controlledvocabulary.language.Rejang=Rejang -controlledvocabulary.language.Rejang_Kayan=Rejang Kayan -controlledvocabulary.language.Reli=Reli -controlledvocabulary.language.Rema=Rema -controlledvocabulary.language.Rembarrnga=Rembarrnga -controlledvocabulary.language.Rembong=Rembong -controlledvocabulary.language.Remo=Remo -controlledvocabulary.language.Remontado_Dumagat=Remontado Dumagat -controlledvocabulary.language.Rempi=Rempi -controlledvocabulary.language.Remun=Remun -controlledvocabulary.language.Rendille=Rendille -controlledvocabulary.language.Rengao=Rengao -controlledvocabulary.language.Rennell-Bellona=Rennell-Bellona -controlledvocabulary.language.Repanbitip=Repanbitip -controlledvocabulary.language.Rer_Bare=Rer Bare -controlledvocabulary.language.Rerau=Rerau -controlledvocabulary.language.Rerep=Rerep -controlledvocabulary.language.Reshe=Reshe -controlledvocabulary.language.Res�garo=Res�garo -controlledvocabulary.language.Retta=Retta -controlledvocabulary.language.Reyesano=Reyesano -controlledvocabulary.language.Riang_(India)=Riang (India) -controlledvocabulary.language.Riang_Lai=Riang Lai -controlledvocabulary.language.Riang_Lang=Riang Lang -controlledvocabulary.language.Riantana=Riantana -controlledvocabulary.language.Ribun=Ribun -controlledvocabulary.language.Rigwe=Rigwe -controlledvocabulary.language.Rikbaktsa=Rikbaktsa -controlledvocabulary.language.Rinconada_Bikol=Rinconada Bikol -controlledvocabulary.language.Rinc�n_Zapotec=Rinc�n Zapotec -controlledvocabulary.language.Ringgou=Ringgou -controlledvocabulary.language.Ririo=Ririo -controlledvocabulary.language.Rishiwa=Rishiwa -controlledvocabulary.language.Ritharrngu=Ritharrngu -controlledvocabulary.language.Riung=Riung -controlledvocabulary.language.Riverain_Sango=Riverain Sango -controlledvocabulary.language.Rmeet=Rmeet -controlledvocabulary.language.Rogo=Rogo -controlledvocabulary.language.Rohingya=Rohingya -controlledvocabulary.language.Roma=Roma -controlledvocabulary.language.Romagnol=Romagnol -controlledvocabulary.language.Romam=Romam -controlledvocabulary.language.Romanian=Romanian -controlledvocabulary.language.Romanian_Sign_Language=Romanian Sign Language -controlledvocabulary.language.Romano-Greek=Romano-Greek -controlledvocabulary.language.Romano-Serbian=Romano-Serbian -controlledvocabulary.language.Romanova=Romanova -controlledvocabulary.language.Romansh=Romansh -controlledvocabulary.language.Romany=Romany -controlledvocabulary.language.Romblomanon=Romblomanon -controlledvocabulary.language.Rombo=Rombo -controlledvocabulary.language.Romkun=Romkun -controlledvocabulary.language.Ron=Ron -controlledvocabulary.language.Ronga=Ronga -controlledvocabulary.language.Rongga=Rongga -controlledvocabulary.language.Rongmei_Naga=Rongmei Naga -controlledvocabulary.language.Rongpo=Rongpo -controlledvocabulary.language.Ronji=Ronji -controlledvocabulary.language.Roon=Roon -controlledvocabulary.language.Roria=Roria -controlledvocabulary.language.Rotokas=Rotokas -controlledvocabulary.language.Rotuman=Rotuman -controlledvocabulary.language.Roviana=Roviana -controlledvocabulary.language.Ruching_Palaung=Ruching Palaung -controlledvocabulary.language.Rudbari=Rudbari -controlledvocabulary.language.Rufiji=Rufiji -controlledvocabulary.language.Ruga=Ruga -controlledvocabulary.language.Rukai=Rukai -controlledvocabulary.language.Ruma=Ruma -controlledvocabulary.language.Rumai_Palaung=Rumai Palaung -controlledvocabulary.language.Rumu=Rumu -controlledvocabulary.language.Runga=Runga -controlledvocabulary.language.Rungtu_Chin=Rungtu Chin -controlledvocabulary.language.Rungus=Rungus -controlledvocabulary.language.Rungwa=Rungwa -controlledvocabulary.language.Russia_Buriat=Russia Buriat -controlledvocabulary.language.Russian=Russian -controlledvocabulary.language.Russian_Sign_Language=Russian Sign Language -controlledvocabulary.language.Rusyn=Rusyn -controlledvocabulary.language.Ruthenian=Ruthenian -controlledvocabulary.language.Rutul=Rutul -controlledvocabulary.language.Ruuli=Ruuli -controlledvocabulary.language.Ruund=Ruund -controlledvocabulary.language.Ruwila=Ruwila -controlledvocabulary.language.Rwa=Rwa -controlledvocabulary.language.Rwandan_Sign_Language=Rwandan Sign Language -controlledvocabulary.language.R�union_Creole_French=R�union Creole French -controlledvocabulary.language.Rzi=R?zi?? -controlledvocabulary.language.S'gaw_Karen=S'gaw Karen -controlledvocabulary.language.Sa=Sa -controlledvocabulary.language.Sa'a=Sa'a -controlledvocabulary.language.Sa'ban=Sa'ban -controlledvocabulary.language.Sa'och=Sa'och -controlledvocabulary.language.Saafi-Saafi=Saafi-Saafi -controlledvocabulary.language.Saam=Saam -controlledvocabulary.language.Saamia=Saamia -controlledvocabulary.language.Saaroa=Saaroa -controlledvocabulary.language.Saba=Saba -controlledvocabulary.language.Sabaean=Sabaean -controlledvocabulary.language.Sabah_Bisaya=Sabah Bisaya -controlledvocabulary.language.Sabah_Malay=Sabah Malay -controlledvocabulary.language.Saban�=Saban� -controlledvocabulary.language.Sabaot=Sabaot -controlledvocabulary.language.Sabine=Sabine -controlledvocabulary.language.Sabu=Sabu -controlledvocabulary.language.Sab�m=Sab�m -controlledvocabulary.language.Sacapulteco=Sacapulteco -controlledvocabulary.language.Sadri=Sadri -controlledvocabulary.language.Saek=Saek -controlledvocabulary.language.Saep=Saep -controlledvocabulary.language.Safaliba=Safaliba -controlledvocabulary.language.Safeyoka=Safeyoka -controlledvocabulary.language.Safwa=Safwa -controlledvocabulary.language.Sagala=Sagala -controlledvocabulary.language.Sagalla=Sagalla -controlledvocabulary.language.Saho=Saho -controlledvocabulary.language.Sahu=Sahu -controlledvocabulary.language.Saidi_Arabic=Saidi Arabic -controlledvocabulary.language.Saint_Lucian_Creole_French=Saint Lucian Creole French -controlledvocabulary.language.Saisiyat=Saisiyat -controlledvocabulary.language.Sajalong=Sajalong -controlledvocabulary.language.Sajau_Basap=Sajau Basap -controlledvocabulary.language.Sakachep=Sakachep -controlledvocabulary.language.Sakalava_Malagasy=Sakalava Malagasy -controlledvocabulary.language.Sakao=Sakao -controlledvocabulary.language.Sakata=Sakata -controlledvocabulary.language.Sake=Sake -controlledvocabulary.language.Sakirabi�=Sakirabi� -controlledvocabulary.language.Sakizaya=Sakizaya -controlledvocabulary.language.Sala=Sala -controlledvocabulary.language.Salampasu=Salampasu -controlledvocabulary.language.Salar=Salar -controlledvocabulary.language.Salas=Salas -controlledvocabulary.language.Salasaca_Highland_Quichua=Salasaca Highland Quichua -controlledvocabulary.language.Salawati=Salawati -controlledvocabulary.language.Saleman=Saleman -controlledvocabulary.language.Saliba=Saliba -controlledvocabulary.language.Salinan=Salinan -controlledvocabulary.language.Sallands=Sallands -controlledvocabulary.language.Salt-Yui=Salt-Yui -controlledvocabulary.language.Saluan=Saluan -controlledvocabulary.language.Salum�=Salum� -controlledvocabulary.language.Salvadoran_Sign_Language=Salvadoran Sign Language -controlledvocabulary.language.Sam=Sam -controlledvocabulary.language.Samaritan=Samaritan -controlledvocabulary.language.Samaritan_Aramaic=Samaritan Aramaic -controlledvocabulary.language.Samarokena=Samarokena -controlledvocabulary.language.Samatao=Samatao -controlledvocabulary.language.Samay=Samay -controlledvocabulary.language.Samba=Samba -controlledvocabulary.language.Samba_Daka=Samba Daka -controlledvocabulary.language.Samba_Leko=Samba Leko -controlledvocabulary.language.Sambal=Sambal -controlledvocabulary.language.Sambalpuri=Sambalpuri -controlledvocabulary.language.Sambe=Sambe -controlledvocabulary.language.Samberigi=Samberigi -controlledvocabulary.language.Samburu=Samburu -controlledvocabulary.language.Samei=Samei -controlledvocabulary.language.Samo=Samo -controlledvocabulary.language.Samoan=Samoan -controlledvocabulary.language.Samogitian=Samogitian -controlledvocabulary.language.Samosa=Samosa -controlledvocabulary.language.Sampang=Sampang -controlledvocabulary.language.Samre=Samre -controlledvocabulary.language.Samtao=Samtao -controlledvocabulary.language.Samvedi=Samvedi -controlledvocabulary.language.San_Agust�n_Mixtepec_Zapotec=San Agust�n Mixtepec Zapotec -controlledvocabulary.language.San_Baltazar_Loxicha_Zapotec=San Baltazar Loxicha Zapotec -controlledvocabulary.language.San_Blas_Kuna=San Blas Kuna -controlledvocabulary.language.San_Dionisio_Del_Mar_Huave=San Dionisio Del Mar Huave -controlledvocabulary.language.San_Felipe_Otlaltepec_Popoloca=San Felipe Otlaltepec Popoloca -controlledvocabulary.language.San_Francisco_Del_Mar_Huave=San Francisco Del Mar Huave -controlledvocabulary.language.San_Francisco_Matlatzinca=San Francisco Matlatzinca -controlledvocabulary.language.San_Jer�nimo_Tec�atl_Mazatec=San Jer�nimo Tec�atl Mazatec -controlledvocabulary.language.San_Juan_Atzingo_Popoloca=San Juan Atzingo Popoloca -controlledvocabulary.language.San_Juan_Colorado_Mixtec=San Juan Colorado Mixtec -controlledvocabulary.language.San_Juan_Teita_Mixtec=San Juan Teita Mixtec -controlledvocabulary.language.San_Lu�s_Temalacayuca_Popoloca=San Lu�s Temalacayuca Popoloca -controlledvocabulary.language.San_Marcos_Tlacoyalco_Popoloca=San Marcos Tlacoyalco Popoloca -controlledvocabulary.language.San_Mart�n_Itunyoso_Triqui=San Mart�n Itunyoso Triqui -controlledvocabulary.language.San_Mart�n_Quechua=San Mart�n Quechua -controlledvocabulary.language.San_Mateo_Del_Mar_Huave=San Mateo Del Mar Huave -controlledvocabulary.language.San_Miguel_Creole_French=San Miguel Creole French -controlledvocabulary.language.San_Miguel_El_Grande_Mixtec=San Miguel El Grande Mixtec -controlledvocabulary.language.San_Miguel_Piedras_Mixtec=San Miguel Piedras Mixtec -controlledvocabulary.language.San_Pedro_Amuzgos_Amuzgo=San Pedro Amuzgos Amuzgo -controlledvocabulary.language.San_Pedro_Quiatoni_Zapotec=San Pedro Quiatoni Zapotec -controlledvocabulary.language.San_Salvador_Kongo=San Salvador Kongo -controlledvocabulary.language.San_Vicente_Coatl�n_Zapotec=San Vicente Coatl�n Zapotec -controlledvocabulary.language.Sanaani_Arabic=Sanaani Arabic -controlledvocabulary.language.Sanapan�=Sanapan� -controlledvocabulary.language.Sandawe=Sandawe -controlledvocabulary.language.Sanga_(Democratic_Republic_of_Congo)=Sanga (Democratic Republic of Congo) -controlledvocabulary.language.Sanga_(Nigeria)=Sanga (Nigeria) -controlledvocabulary.language.Sanggau=Sanggau -controlledvocabulary.language.Sangil=Sangil -controlledvocabulary.language.Sangir=Sangir -controlledvocabulary.language.Sangisari=Sangisari -controlledvocabulary.language.Sangkong=Sangkong -controlledvocabulary.language.Sanglechi=Sanglechi -controlledvocabulary.language.Sango=Sango -controlledvocabulary.language.Sangtam_Naga=Sangtam Naga -controlledvocabulary.language.Sangu_(Gabon)=Sangu (Gabon) -controlledvocabulary.language.Sangu_(Tanzania)=Sangu (Tanzania) -controlledvocabulary.language.Sani=Sani -controlledvocabulary.language.Sanie=Sanie -controlledvocabulary.language.Saniyo-Hiyewe=Saniyo-Hiyewe -controlledvocabulary.language.Sankaran_Maninka=Sankaran Maninka -controlledvocabulary.language.Sansi=Sansi -controlledvocabulary.language.Sanskrit_(Saskta)=Sanskrit (Sa?sk?ta) -controlledvocabulary.language.Santa_Ana_de_Tusi_Pasco_Quechua=Santa Ana de Tusi Pasco Quechua -controlledvocabulary.language.Santa_Catarina_Albarradas_Zapotec=Santa Catarina Albarradas Zapotec -controlledvocabulary.language.Santa_In�s_Ahuatempan_Popoloca=Santa In�s Ahuatempan Popoloca -controlledvocabulary.language.Santa_In�s_Yatzechi_Zapotec=Santa In�s Yatzechi Zapotec -controlledvocabulary.language.Santa_Luc�a_Monteverde_Mixtec=Santa Luc�a Monteverde Mixtec -controlledvocabulary.language.Santa_Mar�a_Del_Mar_Huave=Santa Mar�a Del Mar Huave -controlledvocabulary.language.Santa_Mar�a_La_Alta_Nahuatl=Santa Mar�a La Alta Nahuatl -controlledvocabulary.language.Santa_Mar�a_Quiegolani_Zapotec=Santa Mar�a Quiegolani Zapotec -controlledvocabulary.language.Santa_Mar�a_Zacatepec_Mixtec=Santa Mar�a Zacatepec Mixtec -controlledvocabulary.language.Santa_Teresa_Cora=Santa Teresa Cora -controlledvocabulary.language.Santali=Santali -controlledvocabulary.language.Santiago_Xanica_Zapotec=Santiago Xanica Zapotec -controlledvocabulary.language.Santiago_del_Estero_Quichua=Santiago del Estero Quichua -controlledvocabulary.language.Santo_Domingo_Albarradas_Zapotec=Santo Domingo Albarradas Zapotec -controlledvocabulary.language.Sanum�=Sanum� -controlledvocabulary.language.Saparua=Saparua -controlledvocabulary.language.Sapo=Sapo -controlledvocabulary.language.Saponi=Saponi -controlledvocabulary.language.Saposa=Saposa -controlledvocabulary.language.Sapuan=Sapuan -controlledvocabulary.language.Sap�=Sap� -controlledvocabulary.language.Sar=Sar -controlledvocabulary.language.Sara=Sara -controlledvocabulary.language.Sara_Kaba=Sara Kaba -controlledvocabulary.language.Sara_Kaba_Deme=Sara Kaba Deme -controlledvocabulary.language.Sara_Kaba_N��=Sara Kaba N�� -controlledvocabulary.language.Saraiki=Saraiki -controlledvocabulary.language.Saramaccan=Saramaccan -controlledvocabulary.language.Sarangani_Blaan=Sarangani Blaan -controlledvocabulary.language.Sarangani_Manobo=Sarangani Manobo -controlledvocabulary.language.Sarasira=Sarasira -controlledvocabulary.language.Saraveca=Saraveca -controlledvocabulary.language.Sardinian=Sardinian -controlledvocabulary.language.Sari=Sari -controlledvocabulary.language.Sarikoli=Sarikoli -controlledvocabulary.language.Sarli=Sarli -controlledvocabulary.language.Sarsi=Sarsi -controlledvocabulary.language.Sartang=Sartang -controlledvocabulary.language.Sarua=Sarua -controlledvocabulary.language.Sarudu=Sarudu -controlledvocabulary.language.Saruga=Saruga -controlledvocabulary.language.Sasak=Sasak -controlledvocabulary.language.Sasaru=Sasaru -controlledvocabulary.language.Sassarese_Sardinian=Sassarese Sardinian -controlledvocabulary.language.Satawalese=Satawalese -controlledvocabulary.language.Saterfriesisch=Saterfriesisch -controlledvocabulary.language.Sater�-Maw�=Sater�-Maw� -controlledvocabulary.language.Saudi_Arabian_Sign_Language=Saudi Arabian Sign Language -controlledvocabulary.language.Sauraseni_Prkrit=Sauraseni Pr?krit -controlledvocabulary.language.Saurashtra=Saurashtra -controlledvocabulary.language.Sauri=Sauri -controlledvocabulary.language.Sauria_Paharia=Sauria Paharia -controlledvocabulary.language.Sause=Sause -controlledvocabulary.language.Sausi=Sausi -controlledvocabulary.language.Savi=Savi -controlledvocabulary.language.Savosavo=Savosavo -controlledvocabulary.language.Sawai=Sawai -controlledvocabulary.language.Saweru=Saweru -controlledvocabulary.language.Sawi=Sawi -controlledvocabulary.language.Sawila=Sawila -controlledvocabulary.language.Sawknah=Sawknah -controlledvocabulary.language.Saxwe_Gbe=Saxwe Gbe -controlledvocabulary.language.Saya=Saya -controlledvocabulary.language.Sayula_Popoluca=Sayula Popoluca -controlledvocabulary.language.Scots=Scots -controlledvocabulary.language.Scythian=Scythian -controlledvocabulary.language.Sea_Island_Creole_English=Sea Island Creole English -controlledvocabulary.language.Seba=Seba -controlledvocabulary.language.Sebat_Bet_Gurage=Sebat Bet Gurage -controlledvocabulary.language.Seberuang=Seberuang -controlledvocabulary.language.Sebop=Sebop -controlledvocabulary.language.Sechelt=Sechelt -controlledvocabulary.language.Secoya=Secoya -controlledvocabulary.language.Sedang=Sedang -controlledvocabulary.language.Sediq=Sediq -controlledvocabulary.language.Sedoa=Sedoa -controlledvocabulary.language.Seeku=Seeku -controlledvocabulary.language.Segai=Segai -controlledvocabulary.language.Segeju=Segeju -controlledvocabulary.language.Seget=Seget -controlledvocabulary.language.Sehwi=Sehwi -controlledvocabulary.language.Seimat=Seimat -controlledvocabulary.language.Seit-Kaitetu=Seit-Kaitetu -controlledvocabulary.language.Sekani=Sekani -controlledvocabulary.language.Sekapan=Sekapan -controlledvocabulary.language.Sekar=Sekar -controlledvocabulary.language.Seke_(Nepal)=Seke (Nepal) -controlledvocabulary.language.Seke_(Vanuatu)=Seke (Vanuatu) -controlledvocabulary.language.Sekele=Sekele -controlledvocabulary.language.Seki=Seki -controlledvocabulary.language.Seko_Padang=Seko Padang -controlledvocabulary.language.Seko_Tengah=Seko Tengah -controlledvocabulary.language.Sekpele=Sekpele -controlledvocabulary.language.Selangor_Sign_Language=Selangor Sign Language -controlledvocabulary.language.Selaru=Selaru -controlledvocabulary.language.Selayar=Selayar -controlledvocabulary.language.Selee=Selee -controlledvocabulary.language.Selepet=Selepet -controlledvocabulary.language.Selian=Selian -controlledvocabulary.language.Selkup=Selkup -controlledvocabulary.language.Selungai_Murut=Selungai Murut -controlledvocabulary.language.Seluwasan=Seluwasan -controlledvocabulary.language.Semai=Semai -controlledvocabulary.language.Semandang=Semandang -controlledvocabulary.language.Semaq_Beri=Semaq Beri -controlledvocabulary.language.Sembakung_Murut=Sembakung Murut -controlledvocabulary.language.Semelai=Semelai -controlledvocabulary.language.Semimi=Semimi -controlledvocabulary.language.Semnam=Semnam -controlledvocabulary.language.Semnani=Semnani -controlledvocabulary.language.Sempan=Sempan -controlledvocabulary.language.Sena=Sena -controlledvocabulary.language.Senara_S�noufo=Senara S�noufo -controlledvocabulary.language.Senaya=Senaya -controlledvocabulary.language.Sene=Sene -controlledvocabulary.language.Seneca=Seneca -controlledvocabulary.language.Sened=Sened -controlledvocabulary.language.Sengele=Sengele -controlledvocabulary.language.Senggi=Senggi -controlledvocabulary.language.Sengo=Sengo -controlledvocabulary.language.Sengseng=Sengseng -controlledvocabulary.language.Senhaja_De_Srair=Senhaja De Srair -controlledvocabulary.language.Sensi=Sensi -controlledvocabulary.language.Sentani=Sentani -controlledvocabulary.language.Senthang_Chin=Senthang Chin -controlledvocabulary.language.Sentinel=Sentinel -controlledvocabulary.language.Sepa_(Indonesia)=Sepa (Indonesia) -controlledvocabulary.language.Sepa_(Papua_New_Guinea)=Sepa (Papua New Guinea) -controlledvocabulary.language.Sepik_Iwam=Sepik Iwam -controlledvocabulary.language.Sera=Sera -controlledvocabulary.language.Serbian=Serbian -controlledvocabulary.language.Serbo-Croatian=Serbo-Croatian -controlledvocabulary.language.Sere=Sere -controlledvocabulary.language.Serer=Serer -controlledvocabulary.language.Seri=Seri -controlledvocabulary.language.Serili=Serili -controlledvocabulary.language.Seroa=Seroa -controlledvocabulary.language.Serrano=Serrano -controlledvocabulary.language.Serua=Serua -controlledvocabulary.language.Serudung_Murut=Serudung Murut -controlledvocabulary.language.Serui-Laut=Serui-Laut -controlledvocabulary.language.Seselwa_Creole_French=Seselwa Creole French -controlledvocabulary.language.Seta=Seta -controlledvocabulary.language.Setaman=Setaman -controlledvocabulary.language.Seti=Seti -controlledvocabulary.language.Settla=Settla -controlledvocabulary.language.Severn_Ojibwa=Severn Ojibwa -controlledvocabulary.language.Sewa_Bay=Sewa Bay -controlledvocabulary.language.Seychelles_Sign_Language=Seychelles Sign Language -controlledvocabulary.language.Seze=Seze -controlledvocabulary.language.Sha=Sha -controlledvocabulary.language.Shabak=Shabak -controlledvocabulary.language.Shahmirzadi=Shahmirzadi -controlledvocabulary.language.Shahrudi=Shahrudi -controlledvocabulary.language.Shall-Zwall=Shall-Zwall -controlledvocabulary.language.Shama-Sambuga=Shama-Sambuga -controlledvocabulary.language.Shamang=Shamang -controlledvocabulary.language.Shambala=Shambala -controlledvocabulary.language.Shan=Shan -controlledvocabulary.language.Shanenawa=Shanenawa -controlledvocabulary.language.Shanga=Shanga -controlledvocabulary.language.Sharanahua=Sharanahua -controlledvocabulary.language.Shark_Bay=Shark Bay -controlledvocabulary.language.Sharwa=Sharwa -controlledvocabulary.language.Shasta=Shasta -controlledvocabulary.language.Shatt=Shatt -controlledvocabulary.language.Shau=Shau -controlledvocabulary.language.Shawnee=Shawnee -controlledvocabulary.language.She=She -controlledvocabulary.language.Shehri=Shehri -controlledvocabulary.language.Shekhawati=Shekhawati -controlledvocabulary.language.Shekkacho=Shekkacho -controlledvocabulary.language.Sheko=Sheko -controlledvocabulary.language.Shelta=Shelta -controlledvocabulary.language.Shempire_Senoufo=Shempire Senoufo -controlledvocabulary.language.Shendu=Shendu -controlledvocabulary.language.Sheni=Sheni -controlledvocabulary.language.Sherbro=Sherbro -controlledvocabulary.language.Sherdukpen=Sherdukpen -controlledvocabulary.language.Sherpa=Sherpa -controlledvocabulary.language.Sheshi_Kham=Sheshi Kham -controlledvocabulary.language.Shi=Shi -controlledvocabulary.language.Shihhi_Arabic=Shihhi Arabic -controlledvocabulary.language.Shiki=Shiki -controlledvocabulary.language.Shilluk=Shilluk -controlledvocabulary.language.Shina=Shina -controlledvocabulary.language.Shipibo-Conibo=Shipibo-Conibo -controlledvocabulary.language.Sholaga=Sholaga -controlledvocabulary.language.Shom_Peng=Shom Peng -controlledvocabulary.language.Shona=Shona -controlledvocabulary.language.Shoo-Minda-Nye=Shoo-Minda-Nye -controlledvocabulary.language.Shor=Shor -controlledvocabulary.language.Shoshoni=Shoshoni -controlledvocabulary.language.Shua=Shua -controlledvocabulary.language.Shuadit=Shuadit -controlledvocabulary.language.Shuar=Shuar -controlledvocabulary.language.Shubi=Shubi -controlledvocabulary.language.Shughni=Shughni -controlledvocabulary.language.Shuhi=Shuhi -controlledvocabulary.language.Shumashti=Shumashti -controlledvocabulary.language.Shumcho=Shumcho -controlledvocabulary.language.Shuswap=Shuswap -controlledvocabulary.language.Shwai=Shwai -controlledvocabulary.language.Shwe_Palaung=Shwe Palaung -controlledvocabulary.language.Sialum=Sialum -controlledvocabulary.language.Siamou=Siamou -controlledvocabulary.language.Sian=Sian -controlledvocabulary.language.Siane=Siane -controlledvocabulary.language.Siang=Siang -controlledvocabulary.language.Siar-Lak=Siar-Lak -controlledvocabulary.language.Siawi=Siawi -controlledvocabulary.language.Sibe=Sibe -controlledvocabulary.language.Siberian_Tatar=Siberian Tatar -controlledvocabulary.language.Sibu_Melanau=Sibu Melanau -controlledvocabulary.language.Sicanian=Sicanian -controlledvocabulary.language.Sicel=Sicel -controlledvocabulary.language.Sicilian=Sicilian -controlledvocabulary.language.Siculo_Arabic=Siculo Arabic -controlledvocabulary.language.Sidamo=Sidamo -controlledvocabulary.language.Sidetic=Sidetic -controlledvocabulary.language.Sie=Sie -controlledvocabulary.language.Sierra_Leone_Sign_Language=Sierra Leone Sign Language -controlledvocabulary.language.Sierra_Negra_Nahuatl=Sierra Negra Nahuatl -controlledvocabulary.language.Sierra_de_Ju�rez_Zapotec=Sierra de Ju�rez Zapotec -controlledvocabulary.language.Sighu=Sighu -controlledvocabulary.language.Sihan=Sihan -controlledvocabulary.language.Sihuas_Ancash_Quechua=Sihuas Ancash Quechua -controlledvocabulary.language.Sika=Sika -controlledvocabulary.language.Sikaiana=Sikaiana -controlledvocabulary.language.Sikaritai=Sikaritai -controlledvocabulary.language.Sikiana=Sikiana -controlledvocabulary.language.Sikkimese=Sikkimese -controlledvocabulary.language.Siksika=Siksika -controlledvocabulary.language.Sikule=Sikule -controlledvocabulary.language.Sila=Sila -controlledvocabulary.language.Silacayoapan_Mixtec=Silacayoapan Mixtec -controlledvocabulary.language.Sileibi=Sileibi -controlledvocabulary.language.Silesian=Silesian -controlledvocabulary.language.Silimo=Silimo -controlledvocabulary.language.Siliput=Siliput -controlledvocabulary.language.Silopi=Silopi -controlledvocabulary.language.Silt'e=Silt'e -controlledvocabulary.language.Simaa=Simaa -controlledvocabulary.language.Simba=Simba -controlledvocabulary.language.Simbali=Simbali -controlledvocabulary.language.Simbari=Simbari -controlledvocabulary.language.Simbo=Simbo -controlledvocabulary.language.Simeku=Simeku -controlledvocabulary.language.Simeulue=Simeulue -controlledvocabulary.language.Simte=Simte -controlledvocabulary.language.Sinagen=Sinagen -controlledvocabulary.language.Sinasina=Sinasina -controlledvocabulary.language.Sinaugoro=Sinaugoro -controlledvocabulary.language.Sindarin=Sindarin -controlledvocabulary.language.Sindhi=Sindhi -controlledvocabulary.language.Sindhi_Bhil=Sindhi Bhil -controlledvocabulary.language.Sindihui_Mixtec=Sindihui Mixtec -controlledvocabulary.language.Singa=Singa -controlledvocabulary.language.Singapore_Sign_Language=Singapore Sign Language -controlledvocabulary.language.Singpho=Singpho -controlledvocabulary.language.Sinhala,_Sinhalese=Sinhala, Sinhalese -controlledvocabulary.language.Sinicahua_Mixtec=Sinicahua Mixtec -controlledvocabulary.language.Sininkere=Sininkere -controlledvocabulary.language.Sinte_Romani=Sinte Romani -controlledvocabulary.language.Sinyar=Sinyar -controlledvocabulary.language.Sio=Sio -controlledvocabulary.language.Siona=Siona -controlledvocabulary.language.Sipacapense=Sipacapense -controlledvocabulary.language.Sira=Sira -controlledvocabulary.language.Siraya=Siraya -controlledvocabulary.language.Sirenik_Yupik=Sirenik Yupik -controlledvocabulary.language.Siri=Siri -controlledvocabulary.language.Siriano=Siriano -controlledvocabulary.language.Sirion�=Sirion� -controlledvocabulary.language.Sirmauri=Sirmauri -controlledvocabulary.language.Siroi=Siroi -controlledvocabulary.language.Sissala=Sissala -controlledvocabulary.language.Sissano=Sissano -controlledvocabulary.language.Siuslaw=Siuslaw -controlledvocabulary.language.Sivandi=Sivandi -controlledvocabulary.language.Sivia_Sign_Language=Sivia Sign Language -controlledvocabulary.language.Siwai=Siwai -controlledvocabulary.language.Siwi=Siwi -controlledvocabulary.language.Siwu=Siwu -controlledvocabulary.language.Siyin_Chin=Siyin Chin -controlledvocabulary.language.Skagit=Skagit -controlledvocabulary.language.Skalvian=Skalvian -controlledvocabulary.language.Skepi_Creole_Dutch=Skepi Creole Dutch -controlledvocabulary.language.Skolt_Sami=Skolt Sami -controlledvocabulary.language.Skou=Skou -controlledvocabulary.language.Slave_(Athapascan)=Slave (Athapascan) -controlledvocabulary.language.Slavomolisano=Slavomolisano -controlledvocabulary.language.Slovak=Slovak -controlledvocabulary.language.Slovakian_Sign_Language=Slovakian Sign Language -controlledvocabulary.language.Slovenian=Slovenian -controlledvocabulary.language.Small_Flowery_Miao=Small Flowery Miao -controlledvocabulary.language.Sm�rky_Kanum=Sm�rky Kanum -controlledvocabulary.language.Snohomish=Snohomish -controlledvocabulary.language.So_(Democratic_Republic_of_Congo)=So (Democratic Republic of Congo) -controlledvocabulary.language.So'a=So'a -controlledvocabulary.language.Sobei=Sobei -controlledvocabulary.language.Sochiapam_Chinantec=Sochiapam Chinantec -controlledvocabulary.language.Soga=Soga -controlledvocabulary.language.Sogdian=Sogdian -controlledvocabulary.language.Soi=Soi -controlledvocabulary.language.Sokoro=Sokoro -controlledvocabulary.language.Solano=Solano -controlledvocabulary.language.Soli=Soli -controlledvocabulary.language.Solomon_Islands_Sign_Language=Solomon Islands Sign Language -controlledvocabulary.language.Solong=Solong -controlledvocabulary.language.Solos=Solos -controlledvocabulary.language.Som=Som -controlledvocabulary.language.Somali=Somali -controlledvocabulary.language.Somba-Siawari=Somba-Siawari -controlledvocabulary.language.Somrai=Somrai -controlledvocabulary.language.Somray=Somray -controlledvocabulary.language.Somyev=Somyev -controlledvocabulary.language.Sonaga=Sonaga -controlledvocabulary.language.Sonde=Sonde -controlledvocabulary.language.Songe=Songe -controlledvocabulary.language.Songlai_Chin=Songlai Chin -controlledvocabulary.language.Songo=Songo -controlledvocabulary.language.Songomeno=Songomeno -controlledvocabulary.language.Songoora=Songoora -controlledvocabulary.language.Sonha=Sonha -controlledvocabulary.language.Sonia=Sonia -controlledvocabulary.language.Soninke=Soninke -controlledvocabulary.language.Sonsorol=Sonsorol -controlledvocabulary.language.Soo=Soo -controlledvocabulary.language.Sop=Sop -controlledvocabulary.language.Soqotri=Soqotri -controlledvocabulary.language.Sora=Sora -controlledvocabulary.language.Sori-Harengan=Sori-Harengan -controlledvocabulary.language.Sorkhei=Sorkhei -controlledvocabulary.language.Sorothaptic=Sorothaptic -controlledvocabulary.language.Sorsogon_Ayta=Sorsogon Ayta -controlledvocabulary.language.Sos_Kundi=Sos Kundi -controlledvocabulary.language.Sota_Kanum=Sota Kanum -controlledvocabulary.language.Sou=Sou -controlledvocabulary.language.Sou_Nama=Sou Nama -controlledvocabulary.language.Sou_Upaa=Sou Upaa -controlledvocabulary.language.South_African_Sign_Language=South African Sign Language -controlledvocabulary.language.South_Awyu=South Awyu -controlledvocabulary.language.South_Azerbaijani=South Azerbaijani -controlledvocabulary.language.South_Bolivian_Quechua=South Bolivian Quechua -controlledvocabulary.language.South_Central_Banda=South Central Banda -controlledvocabulary.language.South_Central_Dinka=South Central Dinka -controlledvocabulary.language.South_Efate=South Efate -controlledvocabulary.language.South_Fali=South Fali -controlledvocabulary.language.South_Giziga=South Giziga -controlledvocabulary.language.South_Lembata=South Lembata -controlledvocabulary.language.South_Marquesan=South Marquesan -controlledvocabulary.language.South_Muyu=South Muyu -controlledvocabulary.language.South_Nuaulu=South Nuaulu -controlledvocabulary.language.South_Picene=South Picene -controlledvocabulary.language.South_Slavey=South Slavey -controlledvocabulary.language.South_Tairora=South Tairora -controlledvocabulary.language.South_Ucayali_Ash�ninka=South Ucayali Ash�ninka -controlledvocabulary.language.South_Watut=South Watut -controlledvocabulary.language.South_West_Bay=South West Bay -controlledvocabulary.language.Southeast_Ambrym=Southeast Ambrym -controlledvocabulary.language.Southeast_Babar=Southeast Babar -controlledvocabulary.language.Southeast_Ijo=Southeast Ijo -controlledvocabulary.language.Southeast_Pashai=Southeast Pashai -controlledvocabulary.language.Southeast_Tasmanian=Southeast Tasmanian -controlledvocabulary.language.Southeastern_Dinka=Southeastern Dinka -controlledvocabulary.language.Southeastern_Ixtl�n_Zapotec=Southeastern Ixtl�n Zapotec -controlledvocabulary.language.Southeastern_Kolami=Southeastern Kolami -controlledvocabulary.language.Southeastern_Nochixtl�n_Mixtec=Southeastern Nochixtl�n Mixtec -controlledvocabulary.language.Southeastern_Pomo=Southeastern Pomo -controlledvocabulary.language.Southeastern_Puebla_Nahuatl=Southeastern Puebla Nahuatl -controlledvocabulary.language.Southeastern_Tarahumara=Southeastern Tarahumara -controlledvocabulary.language.Southeastern_Tepehuan=Southeastern Tepehuan -controlledvocabulary.language.Southern_Alta=Southern Alta -controlledvocabulary.language.Southern_Altai=Southern Altai -controlledvocabulary.language.Southern_Amami-Oshima=Southern Amami-Oshima -controlledvocabulary.language.Southern_Aymara=Southern Aymara -controlledvocabulary.language.Southern_Bai=Southern Bai -controlledvocabulary.language.Southern_Balochi=Southern Balochi -controlledvocabulary.language.Southern_Betsimisaraka_Malagasy=Southern Betsimisaraka Malagasy -controlledvocabulary.language.Southern_Binukidnon=Southern Binukidnon -controlledvocabulary.language.Southern_Birifor=Southern Birifor -controlledvocabulary.language.Southern_Bobo_Madar�=Southern Bobo Madar� -controlledvocabulary.language.Southern_Bontok=Southern Bontok -controlledvocabulary.language.Southern_Carrier=Southern Carrier -controlledvocabulary.language.Southern_Catanduanes_Bikol=Southern Catanduanes Bikol -controlledvocabulary.language.Southern_Conchucos_Ancash_Quechua=Southern Conchucos Ancash Quechua -controlledvocabulary.language.Southern_Dagaare=Southern Dagaare -controlledvocabulary.language.Southern_Dong=Southern Dong -controlledvocabulary.language.Southern_East_Cree=Southern East Cree -controlledvocabulary.language.Southern_Ghale=Southern Ghale -controlledvocabulary.language.Southern_Grebo=Southern Grebo -controlledvocabulary.language.Southern_Guiyang_Hmong=Southern Guiyang Hmong -controlledvocabulary.language.Southern_Haida=Southern Haida -controlledvocabulary.language.Southern_Hindko=Southern Hindko -controlledvocabulary.language.Southern_Kalapuya=Southern Kalapuya -controlledvocabulary.language.Southern_Kalinga=Southern Kalinga -controlledvocabulary.language.Southern_Katang=Southern Katang -controlledvocabulary.language.Southern_Kisi=Southern Kisi -controlledvocabulary.language.Southern_Kiwai=Southern Kiwai -controlledvocabulary.language.Southern_Kurdish=Southern Kurdish -controlledvocabulary.language.Southern_Lolopo=Southern Lolopo -controlledvocabulary.language.Southern_Luri=Southern Luri -controlledvocabulary.language.Southern_Ma'di=Southern Ma'di -controlledvocabulary.language.Southern_Mashan_Hmong=Southern Mashan Hmong -controlledvocabulary.language.Southern_Mnong=Southern Mnong -controlledvocabulary.language.Southern_Muji=Southern Muji -controlledvocabulary.language.Southern_Nago=Southern Nago -controlledvocabulary.language.Southern_Nambiku�ra=Southern Nambiku�ra -controlledvocabulary.language.Southern_Ndebele=Southern Ndebele -controlledvocabulary.language.Southern_Ngbandi=Southern Ngbandi -controlledvocabulary.language.Southern_Nicobarese=Southern Nicobarese -controlledvocabulary.language.Southern_Nisu=Southern Nisu -controlledvocabulary.language.Southern_Nuni=Southern Nuni -controlledvocabulary.language.Southern_Ohlone=Southern Ohlone -controlledvocabulary.language.Southern_One=Southern One -controlledvocabulary.language.Southern_Pame=Southern Pame -controlledvocabulary.language.Southern_Pashto=Southern Pashto -controlledvocabulary.language.Southern_Pastaza_Quechua=Southern Pastaza Quechua -controlledvocabulary.language.Southern_Ping_Chinese=Southern Ping Chinese -controlledvocabulary.language.Southern_Pomo=Southern Pomo -controlledvocabulary.language.Southern_Puebla_Mixtec=Southern Puebla Mixtec -controlledvocabulary.language.Southern_Puget_Sound_Salish=Southern Puget Sound Salish -controlledvocabulary.language.Southern_Pumi=Southern Pumi -controlledvocabulary.language.Southern_Qiandong_Miao=Southern Qiandong Miao -controlledvocabulary.language.Southern_Qiang=Southern Qiang -controlledvocabulary.language.Southern_Rengma_Naga=Southern Rengma Naga -controlledvocabulary.language.Southern_Rincon_Zapotec=Southern Rincon Zapotec -controlledvocabulary.language.Southern_Roglai=Southern Roglai -controlledvocabulary.language.Southern_Sama=Southern Sama -controlledvocabulary.language.Southern_Sami=Southern Sami -controlledvocabulary.language.Southern_Samo=Southern Samo -controlledvocabulary.language.Southern_Sierra_Miwok=Southern Sierra Miwok -controlledvocabulary.language.Southern_Sorsoganon=Southern Sorsoganon -controlledvocabulary.language.Southern_Sotho=Southern Sotho -controlledvocabulary.language.Southern_Subanen=Southern Subanen -controlledvocabulary.language.Southern_Thai=Southern Thai -controlledvocabulary.language.Southern_Tidung=Southern Tidung -controlledvocabulary.language.Southern_Tiwa=Southern Tiwa -controlledvocabulary.language.Southern_Toussian=Southern Toussian -controlledvocabulary.language.Southern_Tujia=Southern Tujia -controlledvocabulary.language.Southern_Tutchone=Southern Tutchone -controlledvocabulary.language.Southern_Uzbek=Southern Uzbek -controlledvocabulary.language.Southern_Yamphu=Southern Yamphu -controlledvocabulary.language.Southern_Yukaghir=Southern Yukaghir -controlledvocabulary.language.Southwest_Gbaya=Southwest Gbaya -controlledvocabulary.language.Southwest_Palawano=Southwest Palawano -controlledvocabulary.language.Southwest_Pashai=Southwest Pashai -controlledvocabulary.language.Southwest_Tanna=Southwest Tanna -controlledvocabulary.language.Southwestern_Bontok=Southwestern Bontok -controlledvocabulary.language.Southwestern_Dinka=Southwestern Dinka -controlledvocabulary.language.Southwestern_Fars=Southwestern Fars -controlledvocabulary.language.Southwestern_Guiyang_Hmong=Southwestern Guiyang Hmong -controlledvocabulary.language.Southwestern_Huishui_Hmong=Southwestern Huishui Hmong -controlledvocabulary.language.Southwestern_Nisu=Southwestern Nisu -controlledvocabulary.language.Southwestern_Tarahumara=Southwestern Tarahumara -controlledvocabulary.language.Southwestern_Tasmanian=Southwestern Tasmanian -controlledvocabulary.language.Southwestern_Tepehuan=Southwestern Tepehuan -controlledvocabulary.language.Southwestern_Tlaxiaco_Mixtec=Southwestern Tlaxiaco Mixtec -controlledvocabulary.language.Sowa=Sowa -controlledvocabulary.language.Sowanda=Sowanda -controlledvocabulary.language.Soyaltepec_Mazatec=Soyaltepec Mazatec -controlledvocabulary.language.Soyaltepec_Mixtec=Soyaltepec Mixtec -controlledvocabulary.language.Spanish_Sign_Language=Spanish Sign Language -controlledvocabulary.language.Spanish,_Castilian=Spanish, Castilian -controlledvocabulary.language.Spiti_Bhoti=Spiti Bhoti -controlledvocabulary.language.Spokane=Spokane -controlledvocabulary.language.Squamish=Squamish -controlledvocabulary.language.Sranan_Tongo=Sranan Tongo -controlledvocabulary.language.Sri_Lankan_Creole_Malay=Sri Lankan Creole Malay -controlledvocabulary.language.Sri_Lankan_Sign_Language=Sri Lankan Sign Language -controlledvocabulary.language.Standard_Arabic=Standard Arabic -controlledvocabulary.language.Standard_Estonian=Standard Estonian -controlledvocabulary.language.Standard_Latvian=Standard Latvian -controlledvocabulary.language.Standard_Malay=Standard Malay -controlledvocabulary.language.Standard_Moroccan_Tamazight=Standard Moroccan Tamazight -controlledvocabulary.language.Stellingwerfs=Stellingwerfs -controlledvocabulary.language.Stod_Bhoti=Stod Bhoti -controlledvocabulary.language.Stoney=Stoney -controlledvocabulary.language.Straits_Salish=Straits Salish -controlledvocabulary.language.Suabo=Suabo -controlledvocabulary.language.Suarmin=Suarmin -controlledvocabulary.language.Suau=Suau -controlledvocabulary.language.Suba=Suba -controlledvocabulary.language.Suba-Simbiti=Suba-Simbiti -controlledvocabulary.language.Subi=Subi -controlledvocabulary.language.Subiya=Subiya -controlledvocabulary.language.Subtiaba=Subtiaba -controlledvocabulary.language.Sudanese_Arabic=Sudanese Arabic -controlledvocabulary.language.Sudanese_Creole_Arabic=Sudanese Creole Arabic -controlledvocabulary.language.Sudest=Sudest -controlledvocabulary.language.Sudovian=Sudovian -controlledvocabulary.language.Suena=Suena -controlledvocabulary.language.Suga=Suga -controlledvocabulary.language.Suganga=Suganga -controlledvocabulary.language.Sugut_Dusun=Sugut Dusun -controlledvocabulary.language.Sui=Sui -controlledvocabulary.language.Suki=Suki -controlledvocabulary.language.Suku=Suku -controlledvocabulary.language.Sukuma=Sukuma -controlledvocabulary.language.Sukur=Sukur -controlledvocabulary.language.Sukurum=Sukurum -controlledvocabulary.language.Sula=Sula -controlledvocabulary.language.Sulka=Sulka -controlledvocabulary.language.Sulod=Sulod -controlledvocabulary.language.Suma=Suma -controlledvocabulary.language.Sumariup=Sumariup -controlledvocabulary.language.Sumau=Sumau -controlledvocabulary.language.Sumbawa=Sumbawa -controlledvocabulary.language.Sumbwa=Sumbwa -controlledvocabulary.language.Sumerian=Sumerian -controlledvocabulary.language.Sumi_Naga=Sumi Naga -controlledvocabulary.language.Sumtu_Chin=Sumtu Chin -controlledvocabulary.language.Sunam=Sunam -controlledvocabulary.language.Sundanese=Sundanese -controlledvocabulary.language.Sunwar=Sunwar -controlledvocabulary.language.Suoy=Suoy -controlledvocabulary.language.Supyire_Senoufo=Supyire Senoufo -controlledvocabulary.language.Sur=Sur -controlledvocabulary.language.Surbakhal=Surbakhal -controlledvocabulary.language.Surgujia=Surgujia -controlledvocabulary.language.Surigaonon=Surigaonon -controlledvocabulary.language.Surjapuri=Surjapuri -controlledvocabulary.language.Sursurunga=Sursurunga -controlledvocabulary.language.Suruah�=Suruah� -controlledvocabulary.language.Surubu=Surubu -controlledvocabulary.language.Suru�=Suru� -controlledvocabulary.language.Suru�_Do_Par�=Suru� Do Par� -controlledvocabulary.language.Susquehannock=Susquehannock -controlledvocabulary.language.Susu=Susu -controlledvocabulary.language.Susuami=Susuami -controlledvocabulary.language.Suundi=Suundi -controlledvocabulary.language.Suwawa=Suwawa -controlledvocabulary.language.Suy�=Suy� -controlledvocabulary.language.Svan=Svan -controlledvocabulary.language.Swabian=Swabian -controlledvocabulary.language.Swahili=Swahili -controlledvocabulary.language.Swahili_(individual_language)=Swahili (individual language) -controlledvocabulary.language.Swampy_Cree=Swampy Cree -controlledvocabulary.language.Swati=Swati -controlledvocabulary.language.Swedish=Swedish -controlledvocabulary.language.Swedish_Sign_Language=Swedish Sign Language -controlledvocabulary.language.Swiss_German=Swiss German -controlledvocabulary.language.Swiss-French_Sign_Language=Swiss-French Sign Language -controlledvocabulary.language.Swiss-German_Sign_Language=Swiss-German Sign Language -controlledvocabulary.language.Swiss-Italian_Sign_Language=Swiss-Italian Sign Language -controlledvocabulary.language.Swo=Swo -controlledvocabulary.language.Syenara_Senoufo=Syenara Senoufo -controlledvocabulary.language.Sylheti=Sylheti -controlledvocabulary.language.Syriac=Syriac -controlledvocabulary.language.S�liba=S�liba -controlledvocabulary.language.S�o_Paulo_Kaing�ng=S�o Paulo Kaing�ng -controlledvocabulary.language.S�otomense=S�otomense -controlledvocabulary.language.S�c�t�_S�noufo=S�c�t� S�noufo -controlledvocabulary.language.S�=S� -controlledvocabulary.language.T'apo=T'apo -controlledvocabulary.language.T'en=T'en -controlledvocabulary.language.Ta'izzi-Adeni_Arabic=Ta'izzi-Adeni Arabic -controlledvocabulary.language.Taabwa=Taabwa -controlledvocabulary.language.Tabaa_Zapotec=Tabaa Zapotec -controlledvocabulary.language.Tabaru=Tabaru -controlledvocabulary.language.Tabasco_Chontal=Tabasco Chontal -controlledvocabulary.language.Tabasco_Nahuatl=Tabasco Nahuatl -controlledvocabulary.language.Tabasco_Zoque=Tabasco Zoque -controlledvocabulary.language.Tabassaran=Tabassaran -controlledvocabulary.language.Tabla=Tabla -controlledvocabulary.language.Tabo=Tabo -controlledvocabulary.language.Tabriak=Tabriak -controlledvocabulary.language.Tacahua_Mixtec=Tacahua Mixtec -controlledvocabulary.language.Tacana=Tacana -controlledvocabulary.language.Tachawit=Tachawit -controlledvocabulary.language.Tachelhit=Tachelhit -controlledvocabulary.language.Tachoni=Tachoni -controlledvocabulary.language.Tadaksahak=Tadaksahak -controlledvocabulary.language.Tado=Tado -controlledvocabulary.language.Tadyawan=Tadyawan -controlledvocabulary.language.Tae'=Tae' -controlledvocabulary.language.Tafi=Tafi -controlledvocabulary.language.Tagabawa=Tagabawa -controlledvocabulary.language.Tagakaulo=Tagakaulo -controlledvocabulary.language.Tagal_Murut=Tagal Murut -controlledvocabulary.language.Tagalaka=Tagalaka -controlledvocabulary.language.Tagalog=Tagalog -controlledvocabulary.language.Tagargrent=Tagargrent -controlledvocabulary.language.Tagbanwa=Tagbanwa -controlledvocabulary.language.Tagbu=Tagbu -controlledvocabulary.language.Tagdal=Tagdal -controlledvocabulary.language.Tagin=Tagin -controlledvocabulary.language.Tagish=Tagish -controlledvocabulary.language.Tagoi=Tagoi -controlledvocabulary.language.Tagwana_Senoufo=Tagwana Senoufo -controlledvocabulary.language.Tahaggart_Tamahaq=Tahaggart Tamahaq -controlledvocabulary.language.Tahitian=Tahitian -controlledvocabulary.language.Tahltan=Tahltan -controlledvocabulary.language.Tai=Tai -controlledvocabulary.language.Tai_Daeng=Tai Daeng -controlledvocabulary.language.Tai_Dam=Tai Dam -controlledvocabulary.language.Tai_Do=Tai Do -controlledvocabulary.language.Tai_D�n=Tai D�n -controlledvocabulary.language.Tai_Hongjin=Tai Hongjin -controlledvocabulary.language.Tai_Laing=Tai Laing -controlledvocabulary.language.Tai_Loi=Tai Loi -controlledvocabulary.language.Tai_Long=Tai Long -controlledvocabulary.language.Tai_N�a=Tai N�a -controlledvocabulary.language.Tai_Pao=Tai Pao -controlledvocabulary.language.Tai_Thanh=Tai Thanh -controlledvocabulary.language.Tai_Ya=Tai Ya -controlledvocabulary.language.Taiap=Taiap -controlledvocabulary.language.Taikat=Taikat -controlledvocabulary.language.Tainae=Tainae -controlledvocabulary.language.Taino=Taino -controlledvocabulary.language.Tairaha=Tairaha -controlledvocabulary.language.Tairuma=Tairuma -controlledvocabulary.language.Taita=Taita -controlledvocabulary.language.Taivoan=Taivoan -controlledvocabulary.language.Taiwan_Sign_Language=Taiwan Sign Language -controlledvocabulary.language.Taje=Taje -controlledvocabulary.language.Tajik=Tajik -controlledvocabulary.language.Tajiki_Arabic=Tajiki Arabic -controlledvocabulary.language.Tajio=Tajio -controlledvocabulary.language.Tajuasohn=Tajuasohn -controlledvocabulary.language.Takelma=Takelma -controlledvocabulary.language.Takestani=Takestani -controlledvocabulary.language.Takia=Takia -controlledvocabulary.language.Takua=Takua -controlledvocabulary.language.Takuu=Takuu -controlledvocabulary.language.Takwane=Takwane -controlledvocabulary.language.Tal=Tal -controlledvocabulary.language.Tala=Tala -controlledvocabulary.language.Talaud=Talaud -controlledvocabulary.language.Taliabu=Taliabu -controlledvocabulary.language.Talieng=Talieng -controlledvocabulary.language.Talinga-Bwisi=Talinga-Bwisi -controlledvocabulary.language.Talise=Talise -controlledvocabulary.language.Talodi=Talodi -controlledvocabulary.language.Taloki=Taloki -controlledvocabulary.language.Talondo'=Talondo' -controlledvocabulary.language.Talossan=Talossan -controlledvocabulary.language.Talu=Talu -controlledvocabulary.language.Talysh=Talysh -controlledvocabulary.language.Tama_(Chad)=Tama (Chad) -controlledvocabulary.language.Tama_(Colombia)=Tama (Colombia) -controlledvocabulary.language.Tamagario=Tamagario -controlledvocabulary.language.Taman_(Indonesia)=Taman (Indonesia) -controlledvocabulary.language.Taman_(Myanmar)=Taman (Myanmar) -controlledvocabulary.language.Tamanaku=Tamanaku -controlledvocabulary.language.Tamashek=Tamashek -controlledvocabulary.language.Tamasheq=Tamasheq -controlledvocabulary.language.Tamazola_Mixtec=Tamazola Mixtec -controlledvocabulary.language.Tambas=Tambas -controlledvocabulary.language.Tambora=Tambora -controlledvocabulary.language.Tambotalo=Tambotalo -controlledvocabulary.language.Tami=Tami -controlledvocabulary.language.Tamil=Tamil -controlledvocabulary.language.Tamki=Tamki -controlledvocabulary.language.Tamnim_Citak=Tamnim Citak -controlledvocabulary.language.Tampias_Lobu=Tampias Lobu -controlledvocabulary.language.Tampuan=Tampuan -controlledvocabulary.language.Tampulma=Tampulma -controlledvocabulary.language.Tanacross=Tanacross -controlledvocabulary.language.Tanahmerah=Tanahmerah -controlledvocabulary.language.Tanaina=Tanaina -controlledvocabulary.language.Tanapag=Tanapag -controlledvocabulary.language.Tandaganon=Tandaganon -controlledvocabulary.language.Tandia=Tandia -controlledvocabulary.language.Tandroy-Mahafaly_Malagasy=Tandroy-Mahafaly Malagasy -controlledvocabulary.language.Tanema=Tanema -controlledvocabulary.language.Tangale=Tangale -controlledvocabulary.language.Tangchangya=Tangchangya -controlledvocabulary.language.Tanggu=Tanggu -controlledvocabulary.language.Tangkhul_Naga_(India)=Tangkhul Naga (India) -controlledvocabulary.language.Tangkhul_Naga_(Myanmar)=Tangkhul Naga (Myanmar) -controlledvocabulary.language.Tangko=Tangko -controlledvocabulary.language.Tanglang=Tanglang -controlledvocabulary.language.Tangoa=Tangoa -controlledvocabulary.language.Tanguat=Tanguat -controlledvocabulary.language.Tangut=Tangut -controlledvocabulary.language.Tanimbili=Tanimbili -controlledvocabulary.language.Tanimuca-Retuar�=Tanimuca-Retuar� -controlledvocabulary.language.Tanjijili=Tanjijili -controlledvocabulary.language.Tanosy_Malagasy=Tanosy Malagasy -controlledvocabulary.language.Tanudan_Kalinga=Tanudan Kalinga -controlledvocabulary.language.Tanzanian_Sign_Language=Tanzanian Sign Language -controlledvocabulary.language.Tapei=Tapei -controlledvocabulary.language.Tapiet�=Tapiet� -controlledvocabulary.language.Tapirap�=Tapirap� -controlledvocabulary.language.Tarao_Naga=Tarao Naga -controlledvocabulary.language.Tareng=Tareng -controlledvocabulary.language.Tariana=Tariana -controlledvocabulary.language.Tarifit=Tarifit -controlledvocabulary.language.Tarjumo=Tarjumo -controlledvocabulary.language.Tarok=Tarok -controlledvocabulary.language.Tarpia=Tarpia -controlledvocabulary.language.Tartessian=Tartessian -controlledvocabulary.language.Taruma=Taruma -controlledvocabulary.language.Tasawaq=Tasawaq -controlledvocabulary.language.Tase_Naga=Tase Naga -controlledvocabulary.language.Tasmate=Tasmate -controlledvocabulary.language.Tataltepec_Chatino=Tataltepec Chatino -controlledvocabulary.language.Tatana=Tatana -controlledvocabulary.language.Tatar=Tatar -controlledvocabulary.language.Tatuyo=Tatuyo -controlledvocabulary.language.Tauade=Tauade -controlledvocabulary.language.Taulil=Taulil -controlledvocabulary.language.Taungyo=Taungyo -controlledvocabulary.language.Taupota=Taupota -controlledvocabulary.language.Tause=Tause -controlledvocabulary.language.Taushiro=Taushiro -controlledvocabulary.language.Tausug=Tausug -controlledvocabulary.language.Tauya=Tauya -controlledvocabulary.language.Taveta=Taveta -controlledvocabulary.language.Tavoyan=Tavoyan -controlledvocabulary.language.Tavringer_Romani=Tavringer Romani -controlledvocabulary.language.Tawala=Tawala -controlledvocabulary.language.Tawallammat_Tamajaq=Tawallammat Tamajaq -controlledvocabulary.language.Tawand�=Tawand� -controlledvocabulary.language.Tawang_Monpa=Tawang Monpa -controlledvocabulary.language.Tawara=Tawara -controlledvocabulary.language.Taworta=Taworta -controlledvocabulary.language.Tawoyan=Tawoyan -controlledvocabulary.language.Tawr_Chin=Tawr Chin -controlledvocabulary.language.Tay_Boi=Tay Boi -controlledvocabulary.language.Tay_Khang=Tay Khang -controlledvocabulary.language.Tayart_Tamajeq=Tayart Tamajeq -controlledvocabulary.language.Tayo=Tayo -controlledvocabulary.language.Taznatit=Taznatit -controlledvocabulary.language.Tboli=Tboli -controlledvocabulary.language.Tchitchege=Tchitchege -controlledvocabulary.language.Tchumbuli=Tchumbuli -controlledvocabulary.language.Te'un=Te'un -controlledvocabulary.language.Teanu=Teanu -controlledvocabulary.language.Tebul_Sign_Language=Tebul Sign Language -controlledvocabulary.language.Tebul_Ure_Dogon=Tebul Ure Dogon -controlledvocabulary.language.Tecpatl�n_Totonac=Tecpatl�n Totonac -controlledvocabulary.language.Tedaga=Tedaga -controlledvocabulary.language.Tedim_Chin=Tedim Chin -controlledvocabulary.language.Tee=Tee -controlledvocabulary.language.Tefaro=Tefaro -controlledvocabulary.language.Tegali=Tegali -controlledvocabulary.language.Tehit=Tehit -controlledvocabulary.language.Tehuelche=Tehuelche -controlledvocabulary.language.Tejalapan_Zapotec=Tejalapan Zapotec -controlledvocabulary.language.Teke-Ebo=Teke-Ebo -controlledvocabulary.language.Teke-Fuumu=Teke-Fuumu -controlledvocabulary.language.Teke-Kukuya=Teke-Kukuya -controlledvocabulary.language.Teke-Laali=Teke-Laali -controlledvocabulary.language.Teke-Nzikou=Teke-Nzikou -controlledvocabulary.language.Teke-Tege=Teke-Tege -controlledvocabulary.language.Teke-Tsaayi=Teke-Tsaayi -controlledvocabulary.language.Teke-Tyee=Teke-Tyee -controlledvocabulary.language.Tektiteko=Tektiteko -controlledvocabulary.language.Tela-Masbuar=Tela-Masbuar -controlledvocabulary.language.Telefol=Telefol -controlledvocabulary.language.Telugu=Telugu -controlledvocabulary.language.Tem=Tem -controlledvocabulary.language.Temacine_Tamazight=Temacine Tamazight -controlledvocabulary.language.Temascaltepec_Nahuatl=Temascaltepec Nahuatl -controlledvocabulary.language.Tembo_(Kitembo)=Tembo (Kitembo) -controlledvocabulary.language.Tembo_(Motembo)=Tembo (Motembo) -controlledvocabulary.language.Temb�=Temb� -controlledvocabulary.language.Teme=Teme -controlledvocabulary.language.Temein=Temein -controlledvocabulary.language.Temi=Temi -controlledvocabulary.language.Temiar=Temiar -controlledvocabulary.language.Temoaya_Otomi=Temoaya Otomi -controlledvocabulary.language.Temoq=Temoq -controlledvocabulary.language.Temuan=Temuan -controlledvocabulary.language.Ten'edn=Ten'edn -controlledvocabulary.language.Tena_Lowland_Quichua=Tena Lowland Quichua -controlledvocabulary.language.Tenango_Otomi=Tenango Otomi -controlledvocabulary.language.Tene_Kan_Dogon=Tene Kan Dogon -controlledvocabulary.language.Tenggarong_Kutai_Malay=Tenggarong Kutai Malay -controlledvocabulary.language.Tengger=Tengger -controlledvocabulary.language.Tenharim=Tenharim -controlledvocabulary.language.Tenino=Tenino -controlledvocabulary.language.Tenis=Tenis -controlledvocabulary.language.Tennet=Tennet -controlledvocabulary.language.Teop=Teop -controlledvocabulary.language.Teor=Teor -controlledvocabulary.language.Tepecano=Tepecano -controlledvocabulary.language.Tepetotutla_Chinantec=Tepetotutla Chinantec -controlledvocabulary.language.Tepeuxila_Cuicatec=Tepeuxila Cuicatec -controlledvocabulary.language.Tepinapa_Chinantec=Tepinapa Chinantec -controlledvocabulary.language.Tepo_Krumen=Tepo Krumen -controlledvocabulary.language.Ter_Sami=Ter Sami -controlledvocabulary.language.Tera=Tera -controlledvocabulary.language.Terebu=Terebu -controlledvocabulary.language.Terei=Terei -controlledvocabulary.language.Tereno=Tereno -controlledvocabulary.language.Teressa=Teressa -controlledvocabulary.language.Tereweng=Tereweng -controlledvocabulary.language.Teribe=Teribe -controlledvocabulary.language.Terik=Terik -controlledvocabulary.language.Termanu=Termanu -controlledvocabulary.language.Ternate=Ternate -controlledvocabulary.language.Ternate�o=Ternate�o -controlledvocabulary.language.Tesaka_Malagasy=Tesaka Malagasy -controlledvocabulary.language.Tese=Tese -controlledvocabulary.language.Teshenawa=Teshenawa -controlledvocabulary.language.Teso=Teso -controlledvocabulary.language.Tetela=Tetela -controlledvocabulary.language.Tetelcingo_Nahuatl=Tetelcingo Nahuatl -controlledvocabulary.language.Tetete=Tetete -controlledvocabulary.language.Tetserret=Tetserret -controlledvocabulary.language.Tetum=Tetum -controlledvocabulary.language.Tetun_Dili=Tetun Dili -controlledvocabulary.language.Teutila_Cuicatec=Teutila Cuicatec -controlledvocabulary.language.Tewa_(Indonesia)=Tewa (Indonesia) -controlledvocabulary.language.Tewa_(USA)=Tewa (USA) -controlledvocabulary.language.Tewe=Tewe -controlledvocabulary.language.Texcatepec_Otomi=Texcatepec Otomi -controlledvocabulary.language.Texistepec_Popoluca=Texistepec Popoluca -controlledvocabulary.language.Texmelucan_Zapotec=Texmelucan Zapotec -controlledvocabulary.language.Tezoatl�n_Mixtec=Tezoatl�n Mixtec -controlledvocabulary.language.Tha=Tha -controlledvocabulary.language.Thachanadan=Thachanadan -controlledvocabulary.language.Thado_Chin=Thado Chin -controlledvocabulary.language.Thai=Thai -controlledvocabulary.language.Thai_Sign_Language=Thai Sign Language -controlledvocabulary.language.Thai_Song=Thai Song -controlledvocabulary.language.Thaiphum_Chin=Thaiphum Chin -controlledvocabulary.language.Thakali=Thakali -controlledvocabulary.language.Thangal_Naga=Thangal Naga -controlledvocabulary.language.Thangmi=Thangmi -controlledvocabulary.language.Thao=Thao -controlledvocabulary.language.Tharaka=Tharaka -controlledvocabulary.language.Thawa=Thawa -controlledvocabulary.language.Thaypan=Thaypan -controlledvocabulary.language.Thiin=Thiin -controlledvocabulary.language.Tho=Tho -controlledvocabulary.language.Thompson=Thompson -controlledvocabulary.language.Thopho=Thopho -controlledvocabulary.language.Thracian=Thracian -controlledvocabulary.language.Thu_Lao=Thu Lao -controlledvocabulary.language.Thulung=Thulung -controlledvocabulary.language.Thur=Thur -controlledvocabulary.language.Thuri=Thuri -controlledvocabulary.language.Tiagbamrin_Aizi=Tiagbamrin Aizi -controlledvocabulary.language.Tiale=Tiale -controlledvocabulary.language.Tiang=Tiang -controlledvocabulary.language.Tibea=Tibea -controlledvocabulary.language.Tibetan_Sign_Language=Tibetan Sign Language -controlledvocabulary.language.Tibetan,_Tibetan_Standard,_Central=Tibetan, Tibetan Standard, Central -controlledvocabulary.language.Tichurong=Tichurong -controlledvocabulary.language.Ticuna=Ticuna -controlledvocabulary.language.Tida�_Mixtec=Tida� Mixtec -controlledvocabulary.language.Tidikelt_Tamazight=Tidikelt Tamazight -controlledvocabulary.language.Tidore=Tidore -controlledvocabulary.language.Tiemac�w�_Bozo=Tiemac�w� Bozo -controlledvocabulary.language.Tiene=Tiene -controlledvocabulary.language.Tifal=Tifal -controlledvocabulary.language.Tigak=Tigak -controlledvocabulary.language.Tigon_Mbembe=Tigon Mbembe -controlledvocabulary.language.Tigre=Tigre -controlledvocabulary.language.Tigrinya=Tigrinya -controlledvocabulary.language.Tii=Tii -controlledvocabulary.language.Tijaltepec_Mixtec=Tijaltepec Mixtec -controlledvocabulary.language.Tikar=Tikar -controlledvocabulary.language.Tikopia=Tikopia -controlledvocabulary.language.Tilapa_Otomi=Tilapa Otomi -controlledvocabulary.language.Tillamook=Tillamook -controlledvocabulary.language.Tilquiapan_Zapotec=Tilquiapan Zapotec -controlledvocabulary.language.Tilung=Tilung -controlledvocabulary.language.Tima=Tima -controlledvocabulary.language.Timbe=Timbe -controlledvocabulary.language.Timne=Timne -controlledvocabulary.language.Timor_Pidgin=Timor Pidgin -controlledvocabulary.language.Timucua=Timucua -controlledvocabulary.language.Timugon_Murut=Timugon Murut -controlledvocabulary.language.Tinani=Tinani -controlledvocabulary.language.Tindi=Tindi -controlledvocabulary.language.Tingui-Boto=Tingui-Boto -controlledvocabulary.language.Tinigua=Tinigua -controlledvocabulary.language.Tinputz=Tinputz -controlledvocabulary.language.Tippera=Tippera -controlledvocabulary.language.Tira=Tira -controlledvocabulary.language.Tirahi=Tirahi -controlledvocabulary.language.Tiranige_Diga_Dogon=Tiranige Diga Dogon -controlledvocabulary.language.Tiri=Tiri -controlledvocabulary.language.Tirmaga-Chai_Suri=Tirmaga-Chai Suri -controlledvocabulary.language.Tiruray=Tiruray -controlledvocabulary.language.Tita=Tita -controlledvocabulary.language.Titan=Titan -controlledvocabulary.language.Tiv=Tiv -controlledvocabulary.language.Tiwa=Tiwa -controlledvocabulary.language.Tiwi=Tiwi -controlledvocabulary.language.Tiyaa=Tiyaa -controlledvocabulary.language.Ti�fo=Ti�fo -controlledvocabulary.language.Ti�yaxo_Bozo=Ti�yaxo Bozo -controlledvocabulary.language.Tjungundji=Tjungundji -controlledvocabulary.language.Tjupany=Tjupany -controlledvocabulary.language.Tjurruru=Tjurruru -controlledvocabulary.language.Tlachichilco_Tepehua=Tlachichilco Tepehua -controlledvocabulary.language.Tlacoapa_Me'phaa=Tlacoapa Me'phaa -controlledvocabulary.language.Tlacoatzintepec_Chinantec=Tlacoatzintepec Chinantec -controlledvocabulary.language.Tlacolulita_Zapotec=Tlacolulita Zapotec -controlledvocabulary.language.Tlahuitoltepec_Mixe=Tlahuitoltepec Mixe -controlledvocabulary.language.Tlamacazapa_Nahuatl=Tlamacazapa Nahuatl -controlledvocabulary.language.Tlazoyaltepec_Mixtec=Tlazoyaltepec Mixtec -controlledvocabulary.language.Tlicho=Tlicho -controlledvocabulary.language.Tlingit=Tlingit -controlledvocabulary.language.To=To -controlledvocabulary.language.To'abaita=To'abaita -controlledvocabulary.language.Toaripi=Toaripi -controlledvocabulary.language.Toba=Toba -controlledvocabulary.language.Toba-Maskoy=Toba-Maskoy -controlledvocabulary.language.Tobagonian_Creole_English=Tobagonian Creole English -controlledvocabulary.language.Tobanga=Tobanga -controlledvocabulary.language.Tobati=Tobati -controlledvocabulary.language.Tobelo=Tobelo -controlledvocabulary.language.Tobian=Tobian -controlledvocabulary.language.Tobilung=Tobilung -controlledvocabulary.language.Tobo=Tobo -controlledvocabulary.language.Tocantins_Asurini=Tocantins Asurini -controlledvocabulary.language.Tocho=Tocho -controlledvocabulary.language.Toda=Toda -controlledvocabulary.language.Todrah=Todrah -controlledvocabulary.language.Tofanma=Tofanma -controlledvocabulary.language.Tofin_Gbe=Tofin Gbe -controlledvocabulary.language.Togbo-Vara_Banda=Togbo-Vara Banda -controlledvocabulary.language.Togoyo=Togoyo -controlledvocabulary.language.Tohono_O'odham=Tohono O'odham -controlledvocabulary.language.Tojolabal=Tojolabal -controlledvocabulary.language.Tok_Pisin=Tok Pisin -controlledvocabulary.language.Tokano=Tokano -controlledvocabulary.language.Tokelau=Tokelau -controlledvocabulary.language.Tokharian_A=Tokharian A -controlledvocabulary.language.Tokharian_B=Tokharian B -controlledvocabulary.language.Toki_Pona=Toki Pona -controlledvocabulary.language.Toku-No-Shima=Toku-No-Shima -controlledvocabulary.language.Tol=Tol -controlledvocabulary.language.Tolaki=Tolaki -controlledvocabulary.language.Tolomako=Tolomako -controlledvocabulary.language.Tolowa=Tolowa -controlledvocabulary.language.Toma=Toma -controlledvocabulary.language.Tomadino=Tomadino -controlledvocabulary.language.Tombelala=Tombelala -controlledvocabulary.language.Tombonuo=Tombonuo -controlledvocabulary.language.Tombulu=Tombulu -controlledvocabulary.language.Tomini=Tomini -controlledvocabulary.language.Tommo_So_Dogon=Tommo So Dogon -controlledvocabulary.language.Tomo_Kan_Dogon=Tomo Kan Dogon -controlledvocabulary.language.Tomoip=Tomoip -controlledvocabulary.language.Tondano=Tondano -controlledvocabulary.language.Tondi_Songway_Kiini=Tondi Songway Kiini -controlledvocabulary.language.Tonga_(Nyasa)=Tonga (Nyasa) -controlledvocabulary.language.Tonga_(Tonga_Islands)=Tonga (Tonga Islands) -controlledvocabulary.language.Tonga_(Zambia)=Tonga (Zambia) -controlledvocabulary.language.Tongwe=Tongwe -controlledvocabulary.language.Tonjon=Tonjon -controlledvocabulary.language.Tonkawa=Tonkawa -controlledvocabulary.language.Tonsawang=Tonsawang -controlledvocabulary.language.Tonsea=Tonsea -controlledvocabulary.language.Tontemboan=Tontemboan -controlledvocabulary.language.Tooro=Tooro -controlledvocabulary.language.Topoiyo=Topoiyo -controlledvocabulary.language.Toposa=Toposa -controlledvocabulary.language.Toraja-Sa'dan=Toraja-Sa'dan -controlledvocabulary.language.Toram=Toram -controlledvocabulary.language.Torau=Torau -controlledvocabulary.language.Tornedalen_Finnish=Tornedalen Finnish -controlledvocabulary.language.Toro=Toro -controlledvocabulary.language.Toro_So_Dogon=Toro So Dogon -controlledvocabulary.language.Toro_Tegu_Dogon=Toro Tegu Dogon -controlledvocabulary.language.Toromono=Toromono -controlledvocabulary.language.Torona=Torona -controlledvocabulary.language.Torres_Strait_Creole=Torres Strait Creole -controlledvocabulary.language.Torricelli=Torricelli -controlledvocabulary.language.Torwali=Torwali -controlledvocabulary.language.Tor�=Tor� -controlledvocabulary.language.Tosk_Albanian=Tosk Albanian -controlledvocabulary.language.Totela=Totela -controlledvocabulary.language.Toto=Toto -controlledvocabulary.language.Totoli=Totoli -controlledvocabulary.language.Totomachapan_Zapotec=Totomachapan Zapotec -controlledvocabulary.language.Totontepec_Mixe=Totontepec Mixe -controlledvocabulary.language.Totoro=Totoro -controlledvocabulary.language.Touo=Touo -controlledvocabulary.language.Toura_(C�te_d'Ivoire)=Toura (C�te d'Ivoire) -controlledvocabulary.language.Toura_(Papua_New_Guinea)=Toura (Papua New Guinea) -controlledvocabulary.language.Towei=Towei -controlledvocabulary.language.Transalpine_Gaulish=Transalpine Gaulish -controlledvocabulary.language.Traveller_Danish=Traveller Danish -controlledvocabulary.language.Traveller_Norwegian=Traveller Norwegian -controlledvocabulary.language.Traveller_Scottish=Traveller Scottish -controlledvocabulary.language.Tregami=Tregami -controlledvocabulary.language.Trememb�=Trememb� -controlledvocabulary.language.Trieng=Trieng -controlledvocabulary.language.Trimuris=Trimuris -controlledvocabulary.language.Tring=Tring -controlledvocabulary.language.Tringgus-Sembaan_Bidayuh=Tringgus-Sembaan Bidayuh -controlledvocabulary.language.Trinidad_and_Tobago_Sign_Language=Trinidad and Tobago Sign Language -controlledvocabulary.language.Trinidadian_Creole_English=Trinidadian Creole English -controlledvocabulary.language.Trinitario=Trinitario -controlledvocabulary.language.Tri�=Tri� -controlledvocabulary.language.Truk�=Truk� -controlledvocabulary.language.Trumai=Trumai -controlledvocabulary.language.Ts'�n-Lao=Ts'�n-Lao -controlledvocabulary.language.Tsaangi=Tsaangi -controlledvocabulary.language.Tsakhur=Tsakhur -controlledvocabulary.language.Tsakonian=Tsakonian -controlledvocabulary.language.Tsakwambo=Tsakwambo -controlledvocabulary.language.Tsamai=Tsamai -controlledvocabulary.language.Tsat=Tsat -controlledvocabulary.language.Tseku=Tseku -controlledvocabulary.language.Tsetsaut=Tsetsaut -controlledvocabulary.language.Tshangla=Tshangla -controlledvocabulary.language.Tsikimba=Tsikimba -controlledvocabulary.language.Tsiman�=Tsiman� -controlledvocabulary.language.Tsimihety_Malagasy=Tsimihety Malagasy -controlledvocabulary.language.Tsimshian=Tsimshian -controlledvocabulary.language.Tsishingini=Tsishingini -controlledvocabulary.language.Tso=Tso -controlledvocabulary.language.Tsoa=Tsoa -controlledvocabulary.language.Tsogo=Tsogo -controlledvocabulary.language.Tsonga=Tsonga -controlledvocabulary.language.Tsotso=Tsotso -controlledvocabulary.language.Tsou=Tsou -controlledvocabulary.language.Tsucuba=Tsucuba -controlledvocabulary.language.Tsum=Tsum -controlledvocabulary.language.Tsuvadi=Tsuvadi -controlledvocabulary.language.Tsuvan=Tsuvan -controlledvocabulary.language.Tswa=Tswa -controlledvocabulary.language.Tswana=Tswana -controlledvocabulary.language.Tswapong=Tswapong -controlledvocabulary.language.Tu=Tu -controlledvocabulary.language.Tuamotuan=Tuamotuan -controlledvocabulary.language.Tubar=Tubar -controlledvocabulary.language.Tucano=Tucano -controlledvocabulary.language.Tugen=Tugen -controlledvocabulary.language.Tugun=Tugun -controlledvocabulary.language.Tugutil=Tugutil -controlledvocabulary.language.Tukang_Besi_North=Tukang Besi North -controlledvocabulary.language.Tukang_Besi_South=Tukang Besi South -controlledvocabulary.language.Tuki=Tuki -controlledvocabulary.language.Tukpa=Tukpa -controlledvocabulary.language.Tukudede=Tukudede -controlledvocabulary.language.Tukumanf�d=Tukumanf�d -controlledvocabulary.language.Tula=Tula -controlledvocabulary.language.Tulai=Tulai -controlledvocabulary.language.Tulehu=Tulehu -controlledvocabulary.language.Tulishi=Tulishi -controlledvocabulary.language.Tulu=Tulu -controlledvocabulary.language.Tulu-Bohuai=Tulu-Bohuai -controlledvocabulary.language.Tuma-Irumu=Tuma-Irumu -controlledvocabulary.language.Tumak=Tumak -controlledvocabulary.language.Tumari_Kanuri=Tumari Kanuri -controlledvocabulary.language.Tumbuka=Tumbuka -controlledvocabulary.language.Tumi=Tumi -controlledvocabulary.language.Tumleo=Tumleo -controlledvocabulary.language.Tumshuqese=Tumshuqese -controlledvocabulary.language.Tumtum=Tumtum -controlledvocabulary.language.Tumulung_Sisaala=Tumulung Sisaala -controlledvocabulary.language.Tumzabt=Tumzabt -controlledvocabulary.language.Tundra_Enets=Tundra Enets -controlledvocabulary.language.Tunen=Tunen -controlledvocabulary.language.Tungag=Tungag -controlledvocabulary.language.Tunggare=Tunggare -controlledvocabulary.language.Tunia=Tunia -controlledvocabulary.language.Tunica=Tunica -controlledvocabulary.language.Tunisian_Arabic=Tunisian Arabic -controlledvocabulary.language.Tunisian_Sign_Language=Tunisian Sign Language -controlledvocabulary.language.Tunjung=Tunjung -controlledvocabulary.language.Tunni=Tunni -controlledvocabulary.language.Tunzu=Tunzu -controlledvocabulary.language.Tuotomb=Tuotomb -controlledvocabulary.language.Tupar�=Tupar� -controlledvocabulary.language.Tupinamb�=Tupinamb� -controlledvocabulary.language.Tupinikin=Tupinikin -controlledvocabulary.language.Tupuri=Tupuri -controlledvocabulary.language.Turaka=Turaka -controlledvocabulary.language.Turi=Turi -controlledvocabulary.language.Turiw�ra=Turiw�ra -controlledvocabulary.language.Turka=Turka -controlledvocabulary.language.Turkana=Turkana -controlledvocabulary.language.Turkish=Turkish -controlledvocabulary.language.Turkish_Sign_Language=Turkish Sign Language -controlledvocabulary.language.Turkmen=Turkmen -controlledvocabulary.language.Turks_And_Caicos_Creole_English=Turks And Caicos Creole English -controlledvocabulary.language.Turoyo=Turoyo -controlledvocabulary.language.Turumsa=Turumsa -controlledvocabulary.language.Turung=Turung -controlledvocabulary.language.Tuscarora=Tuscarora -controlledvocabulary.language.Tutelo=Tutelo -controlledvocabulary.language.Tutong=Tutong -controlledvocabulary.language.Tutsa_Naga=Tutsa Naga -controlledvocabulary.language.Tutuba=Tutuba -controlledvocabulary.language.Tututepec_Mixtec=Tututepec Mixtec -controlledvocabulary.language.Tututni=Tututni -controlledvocabulary.language.Tuvalu=Tuvalu -controlledvocabulary.language.Tuvinian=Tuvinian -controlledvocabulary.language.Tuwali_Ifugao=Tuwali Ifugao -controlledvocabulary.language.Tuwari=Tuwari -controlledvocabulary.language.Tuwuli=Tuwuli -controlledvocabulary.language.Tuxin�wa=Tuxin�wa -controlledvocabulary.language.Tux�=Tux� -controlledvocabulary.language.Tuyuca=Tuyuca -controlledvocabulary.language.Twana=Twana -controlledvocabulary.language.Twendi=Twendi -controlledvocabulary.language.Twents=Twents -controlledvocabulary.language.Twi=Twi -controlledvocabulary.language.Tyap=Tyap -controlledvocabulary.language.Tz'utujil=Tz'utujil -controlledvocabulary.language.Tzeltal=Tzeltal -controlledvocabulary.language.Tzotzil=Tzotzil -controlledvocabulary.language.T�y=T�y -controlledvocabulary.language.T�y_Sa_Pa=T�y Sa Pa -controlledvocabulary.language.T�y_Tac=T�y Tac -controlledvocabulary.language.T��n=T��n -controlledvocabulary.language.T�batulabal=T�batulabal -controlledvocabulary.language.U=U -controlledvocabulary.language.Uab_Meto=Uab Meto -controlledvocabulary.language.Uamu�=Uamu� -controlledvocabulary.language.Uare=Uare -controlledvocabulary.language.Ubaghara=Ubaghara -controlledvocabulary.language.Ubang=Ubang -controlledvocabulary.language.Ubi=Ubi -controlledvocabulary.language.Ubir=Ubir -controlledvocabulary.language.Ubykh=Ubykh -controlledvocabulary.language.Ucayali-Yur�a_Ash�ninka=Ucayali-Yur�a Ash�ninka -controlledvocabulary.language.Uda=Uda -controlledvocabulary.language.Udi=Udi -controlledvocabulary.language.Udihe=Udihe -controlledvocabulary.language.Udmurt=Udmurt -controlledvocabulary.language.Uduk=Uduk -controlledvocabulary.language.Ufim=Ufim -controlledvocabulary.language.Ugandan_Sign_Language=Ugandan Sign Language -controlledvocabulary.language.Ugaritic=Ugaritic -controlledvocabulary.language.Ughele=Ughele -controlledvocabulary.language.Ugong=Ugong -controlledvocabulary.language.Uhami=Uhami -controlledvocabulary.language.Uighur,_Uyghur=Uighur, Uyghur -controlledvocabulary.language.Uisai=Uisai -controlledvocabulary.language.Ujir=Ujir -controlledvocabulary.language.Ukaan=Ukaan -controlledvocabulary.language.Ukhwejo=Ukhwejo -controlledvocabulary.language.Ukit=Ukit -controlledvocabulary.language.Ukpe-Bayobiri=Ukpe-Bayobiri -controlledvocabulary.language.Ukpet-Ehom=Ukpet-Ehom -controlledvocabulary.language.Ukrainian=Ukrainian -controlledvocabulary.language.Ukrainian_Sign_Language=Ukrainian Sign Language -controlledvocabulary.language.Ukue=Ukue -controlledvocabulary.language.Ukuriguma=Ukuriguma -controlledvocabulary.language.Ukwa=Ukwa -controlledvocabulary.language.Ukwuani-Aboh-Ndoni=Ukwuani-Aboh-Ndoni -controlledvocabulary.language.Ulau-Suain=Ulau-Suain -controlledvocabulary.language.Ulch=Ulch -controlledvocabulary.language.Ulithian=Ulithian -controlledvocabulary.language.Ullatan=Ullatan -controlledvocabulary.language.Ulukwumi=Ulukwumi -controlledvocabulary.language.Ulumanda'=Ulumanda' -controlledvocabulary.language.Ulwa=Ulwa -controlledvocabulary.language.Uma=Uma -controlledvocabulary.language.Uma'_Lasan=Uma' Lasan -controlledvocabulary.language.Uma'_Lung=Uma' Lung -controlledvocabulary.language.Umanakaina=Umanakaina -controlledvocabulary.language.Umatilla=Umatilla -controlledvocabulary.language.Umbindhamu=Umbindhamu -controlledvocabulary.language.Umbrian=Umbrian -controlledvocabulary.language.Umbu-Ungu=Umbu-Ungu -controlledvocabulary.language.Umbugarla=Umbugarla -controlledvocabulary.language.Umbundu=Umbundu -controlledvocabulary.language.Ume_Sami=Ume Sami -controlledvocabulary.language.Umeda=Umeda -controlledvocabulary.language.Umiida=Umiida -controlledvocabulary.language.Umiray_Dumaget_Agta=Umiray Dumaget Agta -controlledvocabulary.language.Umon=Umon -controlledvocabulary.language.Umot�na=Umot�na -controlledvocabulary.language.Umpila=Umpila -controlledvocabulary.language.Una=Una -controlledvocabulary.language.Unami=Unami -controlledvocabulary.language.Uncoded_languages=Uncoded languages -controlledvocabulary.language.Unde_Kaili=Unde Kaili -controlledvocabulary.language.Undetermined=Undetermined -controlledvocabulary.language.Uneapa=Uneapa -controlledvocabulary.language.Uneme=Uneme -controlledvocabulary.language.Unggaranggu=Unggaranggu -controlledvocabulary.language.Unggumi=Unggumi -controlledvocabulary.language.Uni=Uni -controlledvocabulary.language.Unserdeutsch=Unserdeutsch -controlledvocabulary.language.Unua=Unua -controlledvocabulary.language.Unubahe=Unubahe -controlledvocabulary.language.Upper_Chehalis=Upper Chehalis -controlledvocabulary.language.Upper_Grand_Valley_Dani=Upper Grand Valley Dani -controlledvocabulary.language.Upper_Guinea_Crioulo=Upper Guinea Crioulo -controlledvocabulary.language.Upper_Kinabatangan=Upper Kinabatangan -controlledvocabulary.language.Upper_Kuskokwim=Upper Kuskokwim -controlledvocabulary.language.Upper_Necaxa_Totonac=Upper Necaxa Totonac -controlledvocabulary.language.Upper_Saxon=Upper Saxon -controlledvocabulary.language.Upper_Sorbian=Upper Sorbian -controlledvocabulary.language.Upper_Ta'oih=Upper Ta'oih -controlledvocabulary.language.Upper_Tanana=Upper Tanana -controlledvocabulary.language.Upper_Taromi=Upper Taromi -controlledvocabulary.language.Upper_Umpqua=Upper Umpqua -controlledvocabulary.language.Ura_(Papua_New_Guinea)=Ura (Papua New Guinea) -controlledvocabulary.language.Ura_(Vanuatu)=Ura (Vanuatu) -controlledvocabulary.language.Uradhi=Uradhi -controlledvocabulary.language.Urak_Lawoi'=Urak Lawoi' -controlledvocabulary.language.Urali=Urali -controlledvocabulary.language.Urapmin=Urapmin -controlledvocabulary.language.Urarina=Urarina -controlledvocabulary.language.Urartian=Urartian -controlledvocabulary.language.Urat=Urat -controlledvocabulary.language.Urdu=Urdu -controlledvocabulary.language.Urhobo=Urhobo -controlledvocabulary.language.Uri=Uri -controlledvocabulary.language.Urigina=Urigina -controlledvocabulary.language.Urim=Urim -controlledvocabulary.language.Urimo=Urimo -controlledvocabulary.language.Uripiv-Wala-Rano-Atchin=Uripiv-Wala-Rano-Atchin -controlledvocabulary.language.Urningangg=Urningangg -controlledvocabulary.language.Uru=Uru -controlledvocabulary.language.Uru-Eu-Wau-Wau=Uru-Eu-Wau-Wau -controlledvocabulary.language.Uru-Pa-In=Uru-Pa-In -controlledvocabulary.language.Uruangnirin=Uruangnirin -controlledvocabulary.language.Uruava=Uruava -controlledvocabulary.language.Urub�-Kaapor=Urub�-Kaapor -controlledvocabulary.language.Urub�-Kaapor_Sign_Language=Urub�-Kaapor Sign Language -controlledvocabulary.language.Uruguayan_Sign_Language=Uruguayan Sign Language -controlledvocabulary.language.Urum=Urum -controlledvocabulary.language.Urumi=Urumi -controlledvocabulary.language.Usaghade=Usaghade -controlledvocabulary.language.Usan=Usan -controlledvocabulary.language.Usarufa=Usarufa -controlledvocabulary.language.Ushojo=Ushojo -controlledvocabulary.language.Usila_Chinantec=Usila Chinantec -controlledvocabulary.language.Usku=Usku -controlledvocabulary.language.Uspanteco=Uspanteco -controlledvocabulary.language.Usui=Usui -controlledvocabulary.language.Utarmbung=Utarmbung -controlledvocabulary.language.Ute-Southern_Paiute=Ute-Southern Paiute -controlledvocabulary.language.Utu=Utu -controlledvocabulary.language.Uvbie=Uvbie -controlledvocabulary.language.Uya=Uya -controlledvocabulary.language.Uyajitaya=Uyajitaya -controlledvocabulary.language.Uzbek=Uzbek -controlledvocabulary.language.Uzbeki_Arabic=Uzbeki Arabic -controlledvocabulary.language.Uzekwe=Uzekwe -controlledvocabulary.language.Vaagri_Booli=Vaagri Booli -controlledvocabulary.language.Vafsi=Vafsi -controlledvocabulary.language.Vaghri=Vaghri -controlledvocabulary.language.Vaghua=Vaghua -controlledvocabulary.language.Vagla=Vagla -controlledvocabulary.language.Vai=Vai -controlledvocabulary.language.Vaiphei=Vaiphei -controlledvocabulary.language.Vale=Vale -controlledvocabulary.language.Valencian_Sign_Language=Valencian Sign Language -controlledvocabulary.language.Valle_Nacional_Chinantec=Valle Nacional Chinantec -controlledvocabulary.language.Valley_Maidu=Valley Maidu -controlledvocabulary.language.Valman=Valman -controlledvocabulary.language.Valpei=Valpei -controlledvocabulary.language.Vamale=Vamale -controlledvocabulary.language.Vame=Vame -controlledvocabulary.language.Vandalic=Vandalic -controlledvocabulary.language.Vangunu=Vangunu -controlledvocabulary.language.Vanimo=Vanimo -controlledvocabulary.language.Vano=Vano -controlledvocabulary.language.Vanuma=Vanuma -controlledvocabulary.language.Vao=Vao -controlledvocabulary.language.Varhadi-Nagpuri=Varhadi-Nagpuri -controlledvocabulary.language.Varisi=Varisi -controlledvocabulary.language.Varli=Varli -controlledvocabulary.language.Vasavi=Vasavi -controlledvocabulary.language.Veddah=Veddah -controlledvocabulary.language.Vedic_Sanskrit=Vedic Sanskrit -controlledvocabulary.language.Vehes=Vehes -controlledvocabulary.language.Veluws=Veluws -controlledvocabulary.language.Vemgo-Mabas=Vemgo-Mabas -controlledvocabulary.language.Venda=Venda -controlledvocabulary.language.Venetian=Venetian -controlledvocabulary.language.Venetic=Venetic -controlledvocabulary.language.Venezuelan_Sign_Language=Venezuelan Sign Language -controlledvocabulary.language.Vengo=Vengo -controlledvocabulary.language.Venture�o=Venture�o -controlledvocabulary.language.Veps=Veps -controlledvocabulary.language.Vera'a=Vera'a -controlledvocabulary.language.Vestinian=Vestinian -controlledvocabulary.language.Vidunda=Vidunda -controlledvocabulary.language.Viemo=Viemo -controlledvocabulary.language.Vietnamese=Vietnamese -controlledvocabulary.language.Vilela=Vilela -controlledvocabulary.language.Vili=Vili -controlledvocabulary.language.Villa_Viciosa_Agta=Villa Viciosa Agta -controlledvocabulary.language.Vincentian_Creole_English=Vincentian Creole English -controlledvocabulary.language.Vinmavis=Vinmavis -controlledvocabulary.language.Vinza=Vinza -controlledvocabulary.language.Virgin_Islands_Creole_English=Virgin Islands Creole English -controlledvocabulary.language.Vishavan=Vishavan -controlledvocabulary.language.Viti=Viti -controlledvocabulary.language.Vitou=Vitou -controlledvocabulary.language.Vitu=Vitu -controlledvocabulary.language.Vlaams=Vlaams -controlledvocabulary.language.Vlaamse_Gebarentaal=Vlaamse Gebarentaal -controlledvocabulary.language.Vlax_Romani=Vlax Romani -controlledvocabulary.language.Volap�k=Volap�k -controlledvocabulary.language.Volscian=Volscian -controlledvocabulary.language.Vono=Vono -controlledvocabulary.language.Voro=Voro -controlledvocabulary.language.Votic=Votic -controlledvocabulary.language.Vumbu=Vumbu -controlledvocabulary.language.Vunapu=Vunapu -controlledvocabulary.language.Vunjo=Vunjo -controlledvocabulary.language.Vur�s=Vur�s -controlledvocabulary.language.Vute=Vute -controlledvocabulary.language.Vwanji=Vwanji -controlledvocabulary.language.V�ro=V�ro -controlledvocabulary.language.Wa=Wa -controlledvocabulary.language.Wa'ema=Wa'ema -controlledvocabulary.language.Waama=Waama -controlledvocabulary.language.Waamwang=Waamwang -controlledvocabulary.language.Waata=Waata -controlledvocabulary.language.Wab=Wab -controlledvocabulary.language.Wabo=Wabo -controlledvocabulary.language.Waboda=Waboda -controlledvocabulary.language.Waci_Gbe=Waci Gbe -controlledvocabulary.language.Wadaginam=Wadaginam -controlledvocabulary.language.Waddar=Waddar -controlledvocabulary.language.Wadi_Wadi=Wadi Wadi -controlledvocabulary.language.Wadikali=Wadikali -controlledvocabulary.language.Wadiyara_Koli=Wadiyara Koli -controlledvocabulary.language.Wadjabangayi=Wadjabangayi -controlledvocabulary.language.Wadjiginy=Wadjiginy -controlledvocabulary.language.Wadjigu=Wadjigu -controlledvocabulary.language.Wae_Rana=Wae Rana -controlledvocabulary.language.Waffa=Waffa -controlledvocabulary.language.Wagawaga=Wagawaga -controlledvocabulary.language.Wagaya=Wagaya -controlledvocabulary.language.Wagdi=Wagdi -controlledvocabulary.language.Wagi=Wagi -controlledvocabulary.language.Wagiman=Wagiman -controlledvocabulary.language.Wahau_Kayan=Wahau Kayan -controlledvocabulary.language.Wahau_Kenyah=Wahau Kenyah -controlledvocabulary.language.Wahgi=Wahgi -controlledvocabulary.language.Waigali=Waigali -controlledvocabulary.language.Waigeo=Waigeo -controlledvocabulary.language.Wailaki=Wailaki -controlledvocabulary.language.Wailapa=Wailapa -controlledvocabulary.language.Waima=Waima -controlledvocabulary.language.Waima'a=Waima'a -controlledvocabulary.language.Waimaha=Waimaha -controlledvocabulary.language.Waimiri-Atroari=Waimiri-Atroari -controlledvocabulary.language.Waioli=Waioli -controlledvocabulary.language.Waiwai=Waiwai -controlledvocabulary.language.Waja=Waja -controlledvocabulary.language.Wajarri=Wajarri -controlledvocabulary.language.Wajuk=Wajuk -controlledvocabulary.language.Waka=Waka -controlledvocabulary.language.Wakabunga=Wakabunga -controlledvocabulary.language.Wakawaka=Wakawaka -controlledvocabulary.language.Wakde=Wakde -controlledvocabulary.language.Wakhi=Wakhi -controlledvocabulary.language.Wakon�=Wakon� -controlledvocabulary.language.Wala=Wala -controlledvocabulary.language.Walak=Walak -controlledvocabulary.language.Walangama=Walangama -controlledvocabulary.language.Wali_(Ghana)=Wali (Ghana) -controlledvocabulary.language.Wali_(Sudan)=Wali (Sudan) -controlledvocabulary.language.Waling=Waling -controlledvocabulary.language.Walio=Walio -controlledvocabulary.language.Walla_Walla=Walla Walla -controlledvocabulary.language.Wallisian=Wallisian -controlledvocabulary.language.Walloon=Walloon -controlledvocabulary.language.Walmajarri=Walmajarri -controlledvocabulary.language.Walser=Walser -controlledvocabulary.language.Walungge=Walungge -controlledvocabulary.language.Waluwarra=Waluwarra -controlledvocabulary.language.Wamas=Wamas -controlledvocabulary.language.Wambaya=Wambaya -controlledvocabulary.language.Wambon=Wambon -controlledvocabulary.language.Wambule=Wambule -controlledvocabulary.language.Wamesa=Wamesa -controlledvocabulary.language.Wamey=Wamey -controlledvocabulary.language.Wamin=Wamin -controlledvocabulary.language.Wampanoag=Wampanoag -controlledvocabulary.language.Wampar=Wampar -controlledvocabulary.language.Wampur=Wampur -controlledvocabulary.language.Wan=Wan -controlledvocabulary.language.Wanap=Wanap -controlledvocabulary.language.Wancho_Naga=Wancho Naga -controlledvocabulary.language.Wanda=Wanda -controlledvocabulary.language.Wandala=Wandala -controlledvocabulary.language.Wandarang=Wandarang -controlledvocabulary.language.Wandji=Wandji -controlledvocabulary.language.Waneci=Waneci -controlledvocabulary.language.Wanga=Wanga -controlledvocabulary.language.Wangaaybuwan-Ngiyambaa=Wangaaybuwan-Ngiyambaa -controlledvocabulary.language.Wanggamala=Wanggamala -controlledvocabulary.language.Wanggom=Wanggom -controlledvocabulary.language.Wangkangurru=Wangkangurru -controlledvocabulary.language.Wangkayutyuru=Wangkayutyuru -controlledvocabulary.language.Wangkumara=Wangkumara -controlledvocabulary.language.Wannu=Wannu -controlledvocabulary.language.Wano=Wano -controlledvocabulary.language.Wantoat=Wantoat -controlledvocabulary.language.Wanukaka=Wanukaka -controlledvocabulary.language.Wanyi=Wanyi -controlledvocabulary.language.Wan�=Wan� -controlledvocabulary.language.Waorani=Waorani -controlledvocabulary.language.Wapan=Wapan -controlledvocabulary.language.Wapishana=Wapishana -controlledvocabulary.language.Wappo=Wappo -controlledvocabulary.language.War-Jaintia=War-Jaintia -controlledvocabulary.language.Wara=Wara -controlledvocabulary.language.Warao=Warao -controlledvocabulary.language.Waray_(Australia)=Waray (Australia) -controlledvocabulary.language.Waray_(Philippines)=Waray (Philippines) -controlledvocabulary.language.Wardaman=Wardaman -controlledvocabulary.language.Wardandi=Wardandi -controlledvocabulary.language.Warembori=Warembori -controlledvocabulary.language.Wares=Wares -controlledvocabulary.language.Waris=Waris -controlledvocabulary.language.Waritai=Waritai -controlledvocabulary.language.Wariyangga=Wariyangga -controlledvocabulary.language.Warji=Warji -controlledvocabulary.language.Warkay-Bipim=Warkay-Bipim -controlledvocabulary.language.Warlmanpa=Warlmanpa -controlledvocabulary.language.Warlpiri=Warlpiri -controlledvocabulary.language.Warnang=Warnang -controlledvocabulary.language.Warnman=Warnman -controlledvocabulary.language.Waropen=Waropen -controlledvocabulary.language.Warrgamay=Warrgamay -controlledvocabulary.language.Warrwa=Warrwa -controlledvocabulary.language.Waru=Waru -controlledvocabulary.language.Warumungu=Warumungu -controlledvocabulary.language.Waruna=Waruna -controlledvocabulary.language.Warungu=Warungu -controlledvocabulary.language.Warwar_Feni=Warwar Feni -controlledvocabulary.language.Wasa=Wasa -controlledvocabulary.language.Wasco-Wishram=Wasco-Wishram -controlledvocabulary.language.Wasembo=Wasembo -controlledvocabulary.language.Washo=Washo -controlledvocabulary.language.Waskia=Waskia -controlledvocabulary.language.Wasu=Wasu -controlledvocabulary.language.Watakataui=Watakataui -controlledvocabulary.language.Watam=Watam -controlledvocabulary.language.Wathawurrung=Wathawurrung -controlledvocabulary.language.Watiwa=Watiwa -controlledvocabulary.language.Watubela=Watubela -controlledvocabulary.language.Waube=Waube -controlledvocabulary.language.Waur�=Waur� -controlledvocabulary.language.Wauyai=Wauyai -controlledvocabulary.language.Wawa=Wawa -controlledvocabulary.language.Wawonii=Wawonii -controlledvocabulary.language.Waxianghua=Waxianghua -controlledvocabulary.language.Wayampi=Wayampi -controlledvocabulary.language.Wayana=Wayana -controlledvocabulary.language.Wayanad_Chetti=Wayanad Chetti -controlledvocabulary.language.Wayor�=Wayor� -controlledvocabulary.language.Wayu=Wayu -controlledvocabulary.language.Wayuu=Wayuu -controlledvocabulary.language.Wedau=Wedau -controlledvocabulary.language.Weh=Weh -controlledvocabulary.language.Wejewa=Wejewa -controlledvocabulary.language.Welaun=Welaun -controlledvocabulary.language.Weliki=Weliki -controlledvocabulary.language.Welsh=Welsh -controlledvocabulary.language.Welsh_Romani=Welsh Romani -controlledvocabulary.language.Wemale=Wemale -controlledvocabulary.language.Wemba_Wemba=Wemba Wemba -controlledvocabulary.language.Weme_Gbe=Weme Gbe -controlledvocabulary.language.Wendat=Wendat -controlledvocabulary.language.Wergaia=Wergaia -controlledvocabulary.language.Weri=Weri -controlledvocabulary.language.Wersing=Wersing -controlledvocabulary.language.West_Albay_Bikol=West Albay Bikol -controlledvocabulary.language.West_Ambae=West Ambae -controlledvocabulary.language.West_Bengal_Sign_Language=West Bengal Sign Language -controlledvocabulary.language.West_Berawan=West Berawan -controlledvocabulary.language.West_Central_Banda=West Central Banda -controlledvocabulary.language.West_Central_Oromo=West Central Oromo -controlledvocabulary.language.West_Coast_Bajau=West Coast Bajau -controlledvocabulary.language.West_Damar=West Damar -controlledvocabulary.language.West_Goodenough=West Goodenough -controlledvocabulary.language.West_Kewa=West Kewa -controlledvocabulary.language.West_Lembata=West Lembata -controlledvocabulary.language.West_Makian=West Makian -controlledvocabulary.language.West_Masela=West Masela -controlledvocabulary.language.West_Tarangan=West Tarangan -controlledvocabulary.language.West_Uvean=West Uvean -controlledvocabulary.language.West_Yugur=West Yugur -controlledvocabulary.language.West-Central_Limba=West-Central Limba -controlledvocabulary.language.Western_Abnaki=Western Abnaki -controlledvocabulary.language.Western_Apache=Western Apache -controlledvocabulary.language.Western_Armenian=Western Armenian -controlledvocabulary.language.Western_Arrarnta=Western Arrarnta -controlledvocabulary.language.Western_Balochi=Western Balochi -controlledvocabulary.language.Western_Bolivian_Guaran�=Western Bolivian Guaran� -controlledvocabulary.language.Western_Bru=Western Bru -controlledvocabulary.language.Western_Bukidnon_Manobo=Western Bukidnon Manobo -controlledvocabulary.language.Western_Cham=Western Cham -controlledvocabulary.language.Western_Dani=Western Dani -controlledvocabulary.language.Western_Durango_Nahuatl=Western Durango Nahuatl -controlledvocabulary.language.Western_Fijian=Western Fijian -controlledvocabulary.language.Western_Frisian=Western Frisian -controlledvocabulary.language.Western_Highland_Chatino=Western Highland Chatino -controlledvocabulary.language.Western_Highland_Purepecha=Western Highland Purepecha -controlledvocabulary.language.Western_Huasteca_Nahuatl=Western Huasteca Nahuatl -controlledvocabulary.language.Western_Juxtlahuaca_Mixtec=Western Juxtlahuaca Mixtec -controlledvocabulary.language.Western_Kanjobal=Western Kanjobal -controlledvocabulary.language.Western_Karaboro=Western Karaboro -controlledvocabulary.language.Western_Katu=Western Katu -controlledvocabulary.language.Western_Kayah=Western Kayah -controlledvocabulary.language.Western_Keres=Western Keres -controlledvocabulary.language.Western_Krahn=Western Krahn -controlledvocabulary.language.Western_Lalu=Western Lalu -controlledvocabulary.language.Western_Lawa=Western Lawa -controlledvocabulary.language.Western_Magar=Western Magar -controlledvocabulary.language.Western_Maninkakan=Western Maninkakan -controlledvocabulary.language.Western_Mari=Western Mari -controlledvocabulary.language.Western_Mashan_Hmong=Western Mashan Hmong -controlledvocabulary.language.Western_Meohang=Western Meohang -controlledvocabulary.language.Western_Minyag=Western Minyag -controlledvocabulary.language.Western_Muria=Western Muria -controlledvocabulary.language.Western_Neo-Aramaic=Western Neo-Aramaic -controlledvocabulary.language.Western_Niger_Fulfulde=Western Niger Fulfulde -controlledvocabulary.language.Western_Ojibwa=Western Ojibwa -controlledvocabulary.language.Western_Panjabi=Western Panjabi -controlledvocabulary.language.Western_Parbate_Kham=Western Parbate Kham -controlledvocabulary.language.Western_Penan=Western Penan -controlledvocabulary.language.Western_Sisaala=Western Sisaala -controlledvocabulary.language.Western_Subanon=Western Subanon -controlledvocabulary.language.Western_Tamang=Western Tamang -controlledvocabulary.language.Western_Tawbuid=Western Tawbuid -controlledvocabulary.language.Western_Tlacolula_Valley_Zapotec=Western Tlacolula Valley Zapotec -controlledvocabulary.language.Western_Totonac=Western Totonac -controlledvocabulary.language.Western_Tunebo=Western Tunebo -controlledvocabulary.language.Western_Xiangxi_Miao=Western Xiangxi Miao -controlledvocabulary.language.Western_Xwla_Gbe=Western Xwla Gbe -controlledvocabulary.language.Western_Yiddish=Western Yiddish -controlledvocabulary.language.Westphalien=Westphalien -controlledvocabulary.language.Wetamut=Wetamut -controlledvocabulary.language.Wewaw=Wewaw -controlledvocabulary.language.Weyto=Weyto -controlledvocabulary.language.White_Gelao=White Gelao -controlledvocabulary.language.White_Lachi=White Lachi -controlledvocabulary.language.Whitesands=Whitesands -controlledvocabulary.language.Wiarumus=Wiarumus -controlledvocabulary.language.Wichita=Wichita -controlledvocabulary.language.Wich�_Lhamt�s_G�isnay=Wich� Lhamt�s G�isnay -controlledvocabulary.language.Wich�_Lhamt�s_Nocten=Wich� Lhamt�s Nocten -controlledvocabulary.language.Wich�_Lhamt�s_Vejoz=Wich� Lhamt�s Vejoz -controlledvocabulary.language.Wik_Ngathan=Wik Ngathan -controlledvocabulary.language.Wik-Epa=Wik-Epa -controlledvocabulary.language.Wik-Iiyanh=Wik-Iiyanh -controlledvocabulary.language.Wik-Keyangan=Wik-Keyangan -controlledvocabulary.language.Wik-Me'anha=Wik-Me'anha -controlledvocabulary.language.Wik-Mungkan=Wik-Mungkan -controlledvocabulary.language.Wikalkan=Wikalkan -controlledvocabulary.language.Wikngenchera=Wikngenchera -controlledvocabulary.language.Wilawila=Wilawila -controlledvocabulary.language.Wintu=Wintu -controlledvocabulary.language.Winy�=Winy� -controlledvocabulary.language.Wipi=Wipi -controlledvocabulary.language.Wiradjuri=Wiradjuri -controlledvocabulary.language.Wiraf�d=Wiraf�d -controlledvocabulary.language.Wirangu=Wirangu -controlledvocabulary.language.Wiru=Wiru -controlledvocabulary.language.Wiyot=Wiyot -controlledvocabulary.language.Woccon=Woccon -controlledvocabulary.language.Wogamusin=Wogamusin -controlledvocabulary.language.Wogeo=Wogeo -controlledvocabulary.language.Woi=Woi -controlledvocabulary.language.Woiwurrung=Woiwurrung -controlledvocabulary.language.Wojenaka=Wojenaka -controlledvocabulary.language.Wolane=Wolane -controlledvocabulary.language.Wolani=Wolani -controlledvocabulary.language.Wolaytta=Wolaytta -controlledvocabulary.language.Woleaian=Woleaian -controlledvocabulary.language.Wolio=Wolio -controlledvocabulary.language.Wolof=Wolof -controlledvocabulary.language.Wom_(Nigeria)=Wom (Nigeria) -controlledvocabulary.language.Wom_(Papua_New_Guinea)=Wom (Papua New Guinea) -controlledvocabulary.language.Womo=Womo -controlledvocabulary.language.Wongo=Wongo -controlledvocabulary.language.Woods_Cree=Woods Cree -controlledvocabulary.language.Woria=Woria -controlledvocabulary.language.Worimi=Worimi -controlledvocabulary.language.Worodougou=Worodougou -controlledvocabulary.language.Worrorra=Worrorra -controlledvocabulary.language.Wotapuri-Katarqalai=Wotapuri-Katarqalai -controlledvocabulary.language.Wotjobaluk=Wotjobaluk -controlledvocabulary.language.Wotu=Wotu -controlledvocabulary.language.Woun_Meu=Woun Meu -controlledvocabulary.language.Written_Oirat=Written Oirat -controlledvocabulary.language.Wu_Chinese=Wu Chinese -controlledvocabulary.language.Wuding-Luquan_Yi=Wuding-Luquan Yi -controlledvocabulary.language.Wudu=Wudu -controlledvocabulary.language.Wuliwuli=Wuliwuli -controlledvocabulary.language.Wulna=Wulna -controlledvocabulary.language.Wumboko=Wumboko -controlledvocabulary.language.Wumbvu=Wumbvu -controlledvocabulary.language.Wumeng_Nasu=Wumeng Nasu -controlledvocabulary.language.Wunai_Bunu=Wunai Bunu -controlledvocabulary.language.Wunambal=Wunambal -controlledvocabulary.language.Wunumara=Wunumara -controlledvocabulary.language.Wurrugu=Wurrugu -controlledvocabulary.language.Wusa_Nasu=Wusa Nasu -controlledvocabulary.language.Wushi=Wushi -controlledvocabulary.language.Wusi=Wusi -controlledvocabulary.language.Wutung=Wutung -controlledvocabulary.language.Wutunhua=Wutunhua -controlledvocabulary.language.Wuvulu-Aua=Wuvulu-Aua -controlledvocabulary.language.Wuzlam=Wuzlam -controlledvocabulary.language.Wyandot=Wyandot -controlledvocabulary.language.Wymysorys=Wymysorys -controlledvocabulary.language.W�ra=W�ra -controlledvocabulary.language.W�pha=W�pha -controlledvocabulary.language.W�_Northern=W� Northern -controlledvocabulary.language.W�_Southern=W� Southern -controlledvocabulary.language.W�_Western=W� Western -controlledvocabulary.language.Xaasongaxango=Xaasongaxango -controlledvocabulary.language.Xadani_Zapotec=Xadani Zapotec -controlledvocabulary.language.Xakriab�=Xakriab� -controlledvocabulary.language.Xamtanga=Xamtanga -controlledvocabulary.language.Xanagu�a_Zapotec=Xanagu�a Zapotec -controlledvocabulary.language.Xav�nte=Xav�nte -controlledvocabulary.language.Xer�nte=Xer�nte -controlledvocabulary.language.Xet�=Xet� -controlledvocabulary.language.Xhosa=Xhosa -controlledvocabulary.language.Xiang_Chinese=Xiang Chinese -controlledvocabulary.language.Xibe=Xibe -controlledvocabulary.language.Xicotepec_De_Ju�rez_Totonac=Xicotepec De Ju�rez Totonac -controlledvocabulary.language.Xinca=Xinca -controlledvocabulary.language.Xing�_Asurin�=Xing� Asurin� -controlledvocabulary.language.Xipaya=Xipaya -controlledvocabulary.language.Xiri=Xiri -controlledvocabulary.language.Xiri�na=Xiri�na -controlledvocabulary.language.Xishanba_Lalo=Xishanba Lalo -controlledvocabulary.language.Xokleng=Xokleng -controlledvocabulary.language.Xukur�=Xukur� -controlledvocabulary.language.Xwela_Gbe=Xwela Gbe -controlledvocabulary.language.X�r�c��=X�r�c�� -controlledvocabulary.language.X�r�gur�=X�r�gur� -controlledvocabulary.language.Yaaku=Yaaku -controlledvocabulary.language.Yabarana=Yabarana -controlledvocabulary.language.Yaba�na=Yaba�na -controlledvocabulary.language.Yabem=Yabem -controlledvocabulary.language.Yaben=Yaben -controlledvocabulary.language.Yabong=Yabong -controlledvocabulary.language.Yabula_Yabula=Yabula Yabula -controlledvocabulary.language.Yace=Yace -controlledvocabulary.language.Yaeyama=Yaeyama -controlledvocabulary.language.Yafi=Yafi -controlledvocabulary.language.Yagara=Yagara -controlledvocabulary.language.Yagaria=Yagaria -controlledvocabulary.language.Yagnobi=Yagnobi -controlledvocabulary.language.Yagomi=Yagomi -controlledvocabulary.language.Yagua=Yagua -controlledvocabulary.language.Yagwoia=Yagwoia -controlledvocabulary.language.Yahadian=Yahadian -controlledvocabulary.language.Yahang=Yahang -controlledvocabulary.language.Yahuna=Yahuna -controlledvocabulary.language.Yaka_(Central_African_Republic)=Yaka (Central African Republic) -controlledvocabulary.language.Yaka_(Congo)=Yaka (Congo) -controlledvocabulary.language.Yaka_(Democratic_Republic_of_Congo)=Yaka (Democratic Republic of Congo) -controlledvocabulary.language.Yakaikeke=Yakaikeke -controlledvocabulary.language.Yakama=Yakama -controlledvocabulary.language.Yakan=Yakan -controlledvocabulary.language.Yakha=Yakha -controlledvocabulary.language.Yakoma=Yakoma -controlledvocabulary.language.Yakut=Yakut -controlledvocabulary.language.Yala=Yala -controlledvocabulary.language.Yalahatan=Yalahatan -controlledvocabulary.language.Yalakalore=Yalakalore -controlledvocabulary.language.Yalarnnga=Yalarnnga -controlledvocabulary.language.Yale=Yale -controlledvocabulary.language.Yaleba=Yaleba -controlledvocabulary.language.Yalunka=Yalunka -controlledvocabulary.language.Yal�lag_Zapotec=Yal�lag Zapotec -controlledvocabulary.language.Yamap=Yamap -controlledvocabulary.language.Yamba=Yamba -controlledvocabulary.language.Yambes=Yambes -controlledvocabulary.language.Yambeta=Yambeta -controlledvocabulary.language.Yamdena=Yamdena -controlledvocabulary.language.Yameo=Yameo -controlledvocabulary.language.Yami=Yami -controlledvocabulary.language.Yaminahua=Yaminahua -controlledvocabulary.language.Yamna=Yamna -controlledvocabulary.language.Yamongeri=Yamongeri -controlledvocabulary.language.Yamphu=Yamphu -controlledvocabulary.language.Yan-nhangu=Yan-nhangu -controlledvocabulary.language.Yan-nhau_Sign_Language=Yan-nha?u Sign Language -controlledvocabulary.language.Yana=Yana -controlledvocabulary.language.Yanahuanca_Pasco_Quechua=Yanahuanca Pasco Quechua -controlledvocabulary.language.Yanda=Yanda -controlledvocabulary.language.Yanda_Dom_Dogon=Yanda Dom Dogon -controlledvocabulary.language.Yandjibara=Yandjibara -controlledvocabulary.language.Yandruwandha=Yandruwandha -controlledvocabulary.language.Yanesha'=Yanesha' -controlledvocabulary.language.Yang_Zhuang=Yang Zhuang -controlledvocabulary.language.Yangben=Yangben -controlledvocabulary.language.Yangkam=Yangkam -controlledvocabulary.language.Yangman=Yangman -controlledvocabulary.language.Yango=Yango -controlledvocabulary.language.Yangulam=Yangulam -controlledvocabulary.language.Yangum_Dey=Yangum Dey -controlledvocabulary.language.Yangum_Gel=Yangum Gel -controlledvocabulary.language.Yangum_Mon=Yangum Mon -controlledvocabulary.language.Yankunytjatjara=Yankunytjatjara -controlledvocabulary.language.Yanomam�=Yanomam� -controlledvocabulary.language.Yanom�mi=Yanom�mi -controlledvocabulary.language.Yansi=Yansi -controlledvocabulary.language.Yanyuwa=Yanyuwa -controlledvocabulary.language.Yao=Yao -controlledvocabulary.language.Yaosakor_Asmat=Yaosakor Asmat -controlledvocabulary.language.Yaour�=Yaour� -controlledvocabulary.language.Yapese=Yapese -controlledvocabulary.language.Yapunda=Yapunda -controlledvocabulary.language.Yaqay=Yaqay -controlledvocabulary.language.Yaqui=Yaqui -controlledvocabulary.language.Yarawata=Yarawata -controlledvocabulary.language.Yardliyawarra=Yardliyawarra -controlledvocabulary.language.Yareba=Yareba -controlledvocabulary.language.Yareni_Zapotec=Yareni Zapotec -controlledvocabulary.language.Yarluyandi=Yarluyandi -controlledvocabulary.language.Yaroam�=Yaroam� -controlledvocabulary.language.Yarsun=Yarsun -controlledvocabulary.language.Yasa=Yasa -controlledvocabulary.language.Yassic=Yassic -controlledvocabulary.language.Yatay=Yatay -controlledvocabulary.language.Yatee_Zapotec=Yatee Zapotec -controlledvocabulary.language.Yatzachi_Zapotec=Yatzachi Zapotec -controlledvocabulary.language.Yau_(Morobe_Province)=Yau (Morobe Province) -controlledvocabulary.language.Yau_(Sandaun_Province)=Yau (Sandaun Province) -controlledvocabulary.language.Yaul=Yaul -controlledvocabulary.language.Yauma=Yauma -controlledvocabulary.language.Yaur=Yaur -controlledvocabulary.language.Yautepec_Zapotec=Yautepec Zapotec -controlledvocabulary.language.Yauyos_Quechua=Yauyos Quechua -controlledvocabulary.language.Yavitero=Yavitero -controlledvocabulary.language.Yawa=Yawa -controlledvocabulary.language.Yawalapit�=Yawalapit� -controlledvocabulary.language.Yawanawa=Yawanawa -controlledvocabulary.language.Yawarawarga=Yawarawarga -controlledvocabulary.language.Yaweyuha=Yaweyuha -controlledvocabulary.language.Yawijibaya=Yawijibaya -controlledvocabulary.language.Yawiyo=Yawiyo -controlledvocabulary.language.Yawuru=Yawuru -controlledvocabulary.language.Yaygir=Yaygir -controlledvocabulary.language.Yazgulyam=Yazgulyam -controlledvocabulary.language.Yecuatla_Totonac=Yecuatla Totonac -controlledvocabulary.language.Yei=Yei -controlledvocabulary.language.Yekhee=Yekhee -controlledvocabulary.language.Yekora=Yekora -controlledvocabulary.language.Yela=Yela -controlledvocabulary.language.Yele=Yele -controlledvocabulary.language.Yelmek=Yelmek -controlledvocabulary.language.Yelogu=Yelogu -controlledvocabulary.language.Yemba=Yemba -controlledvocabulary.language.Yemsa=Yemsa -controlledvocabulary.language.Yendang=Yendang -controlledvocabulary.language.Yeni=Yeni -controlledvocabulary.language.Yeniche=Yeniche -controlledvocabulary.language.Yerakai=Yerakai -controlledvocabulary.language.Yeretuar=Yeretuar -controlledvocabulary.language.Yerong=Yerong -controlledvocabulary.language.Yerukula=Yerukula -controlledvocabulary.language.Yessan-Mayo=Yessan-Mayo -controlledvocabulary.language.Yetfa=Yetfa -controlledvocabulary.language.Yevanic=Yevanic -controlledvocabulary.language.Yeyi=Yeyi -controlledvocabulary.language.Yiddish=Yiddish -controlledvocabulary.language.Yidgha=Yidgha -controlledvocabulary.language.Yidiny=Yidiny -controlledvocabulary.language.Yil=Yil -controlledvocabulary.language.Yilan_Creole=Yilan Creole -controlledvocabulary.language.Yimas=Yimas -controlledvocabulary.language.Yimchungru_Naga=Yimchungru Naga -controlledvocabulary.language.Yinbaw_Karen=Yinbaw Karen -controlledvocabulary.language.Yindjibarndi=Yindjibarndi -controlledvocabulary.language.Yindjilandji=Yindjilandji -controlledvocabulary.language.Yine=Yine -controlledvocabulary.language.Yinggarda=Yinggarda -controlledvocabulary.language.Yinhawangka=Yinhawangka -controlledvocabulary.language.Yiningayi=Yiningayi -controlledvocabulary.language.Yintale_Karen=Yintale Karen -controlledvocabulary.language.Yinwum=Yinwum -controlledvocabulary.language.Yir_Yoront=Yir Yoront -controlledvocabulary.language.Yirandali=Yirandali -controlledvocabulary.language.Yirrk-Mel=Yirrk-Mel -controlledvocabulary.language.Yis=Yis -controlledvocabulary.language.Yitha_Yitha=Yitha Yitha -controlledvocabulary.language.Yoba=Yoba -controlledvocabulary.language.Yocobou�_Dida=Yocobou� Dida -controlledvocabulary.language.Yogad=Yogad -controlledvocabulary.language.Yoidik=Yoidik -controlledvocabulary.language.Yoke=Yoke -controlledvocabulary.language.Yokuts=Yokuts -controlledvocabulary.language.Yola=Yola -controlledvocabulary.language.Yoloxochitl_Mixtec=Yoloxochitl Mixtec -controlledvocabulary.language.Yolu_Sign_Language=Yol?u Sign Language -controlledvocabulary.language.Yom=Yom -controlledvocabulary.language.Yombe=Yombe -controlledvocabulary.language.Yonaguni=Yonaguni -controlledvocabulary.language.Yong=Yong -controlledvocabulary.language.Yongbei_Zhuang=Yongbei Zhuang -controlledvocabulary.language.Yongkom=Yongkom -controlledvocabulary.language.Yongnan_Zhuang=Yongnan Zhuang -controlledvocabulary.language.Yopno=Yopno -controlledvocabulary.language.Yora=Yora -controlledvocabulary.language.Yoron=Yoron -controlledvocabulary.language.Yorta_Yorta=Yorta Yorta -controlledvocabulary.language.Yoruba=Yoruba -controlledvocabulary.language.Yosond�a_Mixtec=Yosond�a Mixtec -controlledvocabulary.language.Yotti=Yotti -controlledvocabulary.language.Youjiang_Zhuang=Youjiang Zhuang -controlledvocabulary.language.Youle_Jinuo=Youle Jinuo -controlledvocabulary.language.Younuo_Bunu=Younuo Bunu -controlledvocabulary.language.Yout_Wam=Yout Wam -controlledvocabulary.language.Yoy=Yoy -controlledvocabulary.language.Yuanga=Yuanga -controlledvocabulary.language.Yucatec_Maya_Sign_Language=Yucatec Maya Sign Language -controlledvocabulary.language.Yucateco=Yucateco -controlledvocabulary.language.Yuchi=Yuchi -controlledvocabulary.language.Yucua�e_Mixtec=Yucua�e Mixtec -controlledvocabulary.language.Yucuna=Yucuna -controlledvocabulary.language.Yue_Chinese=Yue Chinese -controlledvocabulary.language.Yug=Yug -controlledvocabulary.language.Yugambal=Yugambal -controlledvocabulary.language.Yugoslavian_Sign_Language=Yugoslavian Sign Language -controlledvocabulary.language.Yugul=Yugul -controlledvocabulary.language.Yuhup=Yuhup -controlledvocabulary.language.Yuki=Yuki -controlledvocabulary.language.Yukpa=Yukpa -controlledvocabulary.language.Yukuben=Yukuben -controlledvocabulary.language.Yulu=Yulu -controlledvocabulary.language.Yuqui=Yuqui -controlledvocabulary.language.Yuracare=Yuracare -controlledvocabulary.language.Yurats=Yurats -controlledvocabulary.language.Yurok=Yurok -controlledvocabulary.language.Yuru=Yuru -controlledvocabulary.language.Yurut�=Yurut� -controlledvocabulary.language.Yutanduchi_Mixtec=Yutanduchi Mixtec -controlledvocabulary.language.Yuwana=Yuwana -controlledvocabulary.language.Yuyu=Yuyu -controlledvocabulary.language.Ywom=Ywom -controlledvocabulary.language.Y�mana=Y�mana -controlledvocabulary.language.Zaachila_Zapotec=Zaachila Zapotec -controlledvocabulary.language.Zabana=Zabana -controlledvocabulary.language.Zacatepec_Chatino=Zacatepec Chatino -controlledvocabulary.language.Zacatl�n-Ahuacatl�n-Tepetzintla_Nahuatl=Zacatl�n-Ahuacatl�n-Tepetzintla Nahuatl -controlledvocabulary.language.Zaghawa=Zaghawa -controlledvocabulary.language.Zaiwa=Zaiwa -controlledvocabulary.language.Zakhring=Zakhring -controlledvocabulary.language.Zambian_Sign_Language=Zambian Sign Language -controlledvocabulary.language.Zan_Gula=Zan Gula -controlledvocabulary.language.Zanaki=Zanaki -controlledvocabulary.language.Zande_(individual_language)=Zande (individual language) -controlledvocabulary.language.Zangskari=Zangskari -controlledvocabulary.language.Zangwal=Zangwal -controlledvocabulary.language.Zaniza_Zapotec=Zaniza Zapotec -controlledvocabulary.language.Zapotec=Zapotec -controlledvocabulary.language.Zaramo=Zaramo -controlledvocabulary.language.Zari=Zari -controlledvocabulary.language.Zarma=Zarma -controlledvocabulary.language.Zarphatic=Zarphatic -controlledvocabulary.language.Zauzou=Zauzou -controlledvocabulary.language.Zay=Zay -controlledvocabulary.language.Zayein_Karen=Zayein Karen -controlledvocabulary.language.Zayse-Zergulla=Zayse-Zergulla -controlledvocabulary.language.Zaza=Zaza -controlledvocabulary.language.Zazao=Zazao -controlledvocabulary.language.Zeem=Zeem -controlledvocabulary.language.Zeeuws=Zeeuws -controlledvocabulary.language.Zemba=Zemba -controlledvocabulary.language.Zeme_Naga=Zeme Naga -controlledvocabulary.language.Zemgalian=Zemgalian -controlledvocabulary.language.Zenag=Zenag -controlledvocabulary.language.Zenaga=Zenaga -controlledvocabulary.language.Zenzontepec_Chatino=Zenzontepec Chatino -controlledvocabulary.language.Zerenkel=Zerenkel -controlledvocabulary.language.Zhaba=Zhaba -controlledvocabulary.language.Zhang-Zhung=Zhang-Zhung -controlledvocabulary.language.Zhire=Zhire -controlledvocabulary.language.Zhoa=Zhoa -controlledvocabulary.language.Zhuang,_Chuang=Zhuang, Chuang -controlledvocabulary.language.Zia=Zia -controlledvocabulary.language.Zialo=Zialo -controlledvocabulary.language.Zigula=Zigula -controlledvocabulary.language.Zimakani=Zimakani -controlledvocabulary.language.Zimba=Zimba -controlledvocabulary.language.Zimbabwe_Sign_Language=Zimbabwe Sign Language -controlledvocabulary.language.Zinza=Zinza -controlledvocabulary.language.Zire=Zire -controlledvocabulary.language.Zizilivakan=Zizilivakan -controlledvocabulary.language.Zo'�=Zo'� -controlledvocabulary.language.Zokhuo=Zokhuo -controlledvocabulary.language.Zoogocho_Zapotec=Zoogocho Zapotec -controlledvocabulary.language.Zoroastrian_Dari=Zoroastrian Dari -controlledvocabulary.language.Zotung_Chin=Zotung Chin -controlledvocabulary.language.Zou=Zou -controlledvocabulary.language.Zul=Zul -controlledvocabulary.language.Zula=Zula -controlledvocabulary.language.Zulgo-Gemzek=Zulgo-Gemzek -controlledvocabulary.language.Zulu=Zulu -controlledvocabulary.language.Zumaya=Zumaya -controlledvocabulary.language.Zumbun=Zumbun -controlledvocabulary.language.Zuni=Zuni -controlledvocabulary.language.Zuojiang_Zhuang=Zuojiang Zhuang -controlledvocabulary.language.Zyphe_Chin=Zyphe Chin -controlledvocabulary.language.Z�paro=Z�paro -controlledvocabulary.language.sTodsde=sTodsde -controlledvocabulary.language.us-Saare=us-Saare -controlledvocabulary.language.ut-Hun=ut-Hun -controlledvocabulary.language.ut-Ma'in=ut-Ma'in -controlledvocabulary.language.�h�n=�h�n -controlledvocabulary.language.�nc�=�nc� -controlledvocabulary.language.�mie=�mie -controlledvocabulary.language.�nge=�nge -controlledvocabulary.language.Gwi=Gwi -controlledvocabulary.language.Xam=Xam -controlledvocabulary.language.Ani=Ani -controlledvocabulary.language.Xegwi=Xegwi -controlledvocabulary.language.Hua=Hua -controlledvocabulary.language.Ungkue=Ungkue -controlledvocabulary.language.X��=X�� -controlledvocabulary.language.Not_applicable=Not applicable +controlledvocabulary.language.'are'are='Are'are +controlledvocabulary.language.'auhelawa='Auhelawa +controlledvocabulary.language.a'ou=A'ou +controlledvocabulary.language.a-pucikwar=A-Pucikwar +controlledvocabulary.language.aari=Aari +controlledvocabulary.language.aas�x=Aas�x +controlledvocabulary.language.abadi=Abadi +controlledvocabulary.language.abaga=Abaga +controlledvocabulary.language.abai_sungai=Abai Sungai +controlledvocabulary.language.abanyom=Abanyom +controlledvocabulary.language.abar=Abar +controlledvocabulary.language.abau=Abau +controlledvocabulary.language.abaza=Abaza +controlledvocabulary.language.abellen_ayta=Abellen Ayta +controlledvocabulary.language.abidji=Abidji +controlledvocabulary.language.abinomn=Abinomn +controlledvocabulary.language.abipon=Abipon +controlledvocabulary.language.abishira=Abishira +controlledvocabulary.language.abkhaz=Abkhaz +controlledvocabulary.language.abom=Abom +controlledvocabulary.language.abon=Abon +controlledvocabulary.language.abron=Abron +controlledvocabulary.language.abu=Abu +controlledvocabulary.language.abu'_arapesh=Abu' Arapesh +controlledvocabulary.language.abua=Abua +controlledvocabulary.language.abui=Abui +controlledvocabulary.language.abun=Abun +controlledvocabulary.language.abure=Abure +controlledvocabulary.language.abureni=Abureni +controlledvocabulary.language.ab�=Ab� +controlledvocabulary.language.acatepec_me'phaa=Acatepec Me'phaa +controlledvocabulary.language.achagua=Achagua +controlledvocabulary.language.achang=Achang +controlledvocabulary.language.ache=Ache +controlledvocabulary.language.acheron=Acheron +controlledvocabulary.language.achi=Achi +controlledvocabulary.language.achinese=Achinese +controlledvocabulary.language.achterhoeks=Achterhoeks +controlledvocabulary.language.achuar-shiwiar=Achuar-Shiwiar +controlledvocabulary.language.achumawi=Achumawi +controlledvocabulary.language.ach�=Ach� +controlledvocabulary.language.acoli=Acoli +controlledvocabulary.language.acro�=Acro� +controlledvocabulary.language.adai=Adai +controlledvocabulary.language.adamawa_fulfulde=Adamawa Fulfulde +controlledvocabulary.language.adamorobe_sign_language=Adamorobe Sign Language +controlledvocabulary.language.adang=Adang +controlledvocabulary.language.adangbe=Adangbe +controlledvocabulary.language.adangme=Adangme +controlledvocabulary.language.adara=Adara +controlledvocabulary.language.adasen=Adasen +controlledvocabulary.language.adele=Adele +controlledvocabulary.language.adhola=Adhola +controlledvocabulary.language.adi=Adi +controlledvocabulary.language.adilabad_gondi=Adilabad Gondi +controlledvocabulary.language.adioukrou=Adioukrou +controlledvocabulary.language.adithinngithigh=Adithinngithigh +controlledvocabulary.language.adivasi_oriya=Adivasi Oriya +controlledvocabulary.language.adiwasi_garasia=Adiwasi Garasia +controlledvocabulary.language.adnyamathanha=Adnyamathanha +controlledvocabulary.language.adonara=Adonara +controlledvocabulary.language.aduge=Aduge +controlledvocabulary.language.adyghe=Adyghe +controlledvocabulary.language.adzera=Adzera +controlledvocabulary.language.aeka=Aeka +controlledvocabulary.language.aekyom=Aekyom +controlledvocabulary.language.aequian=Aequian +controlledvocabulary.language.aer=Aer +controlledvocabulary.language.afade=Afade +controlledvocabulary.language.afar=Afar +controlledvocabulary.language.afghan_sign_language=Afghan Sign Language +controlledvocabulary.language.afitti=Afitti +controlledvocabulary.language.afrihili=Afrihili +controlledvocabulary.language.afrikaans=Afrikaans +controlledvocabulary.language.afro-seminole_creole=Afro-Seminole Creole +controlledvocabulary.language.agarabi=Agarabi +controlledvocabulary.language.agariya=Agariya +controlledvocabulary.language.agatu=Agatu +controlledvocabulary.language.agavotaguerra=Agavotaguerra +controlledvocabulary.language.aghem=Aghem +controlledvocabulary.language.aghu=Aghu +controlledvocabulary.language.aghu-tharnggala=Aghu-Tharnggala +controlledvocabulary.language.aghul=Aghul +controlledvocabulary.language.aghwan=Aghwan +controlledvocabulary.language.agi=Agi +controlledvocabulary.language.agob=Agob +controlledvocabulary.language.agoi=Agoi +controlledvocabulary.language.aguacateco=Aguacateco +controlledvocabulary.language.aguano=Aguano +controlledvocabulary.language.aguaruna=Aguaruna +controlledvocabulary.language.aguna=Aguna +controlledvocabulary.language.agusan_manobo=Agusan Manobo +controlledvocabulary.language.agutaynen=Agutaynen +controlledvocabulary.language.agwagwune=Agwagwune +controlledvocabulary.language.ahanta=Ahanta +controlledvocabulary.language.aheri_gondi=Aheri Gondi +controlledvocabulary.language.aheu=Aheu +controlledvocabulary.language.ahirani=Ahirani +controlledvocabulary.language.ahom=Ahom +controlledvocabulary.language.ahtena=Ahtena +controlledvocabulary.language.ahwai=Ahwai +controlledvocabulary.language.ai-cham=Ai-Cham +controlledvocabulary.language.aighon=Aighon +controlledvocabulary.language.aikan�=Aikan� +controlledvocabulary.language.aiklep=Aiklep +controlledvocabulary.language.aimaq=Aimaq +controlledvocabulary.language.aimele=Aimele +controlledvocabulary.language.aimol=Aimol +controlledvocabulary.language.ainbai=Ainbai +controlledvocabulary.language.ainu_(china)=Ainu (China) +controlledvocabulary.language.ainu_(japan)=Ainu (Japan) +controlledvocabulary.language.aiome=Aiome +controlledvocabulary.language.airoran=Airoran +controlledvocabulary.language.aiton=Aiton +controlledvocabulary.language.aja_(benin)=Aja (Benin) +controlledvocabulary.language.aja_(south_sudan)=Aja (South Sudan) +controlledvocabulary.language.ajawa=Ajawa +controlledvocabulary.language.aji�=Aji� +controlledvocabulary.language.ajumbu=Ajumbu +controlledvocabulary.language.ajy�ninka_apurucayali=Ajy�ninka Apurucayali +controlledvocabulary.language.ak=Ak +controlledvocabulary.language.aka=Aka +controlledvocabulary.language.aka-bea=Aka-Bea +controlledvocabulary.language.aka-bo=Aka-Bo +controlledvocabulary.language.aka-cari=Aka-Cari +controlledvocabulary.language.aka-jeru=Aka-Jeru +controlledvocabulary.language.aka-kede=Aka-Kede +controlledvocabulary.language.aka-kol=Aka-Kol +controlledvocabulary.language.aka-kora=Aka-Kora +controlledvocabulary.language.akan=Akan +controlledvocabulary.language.akar-bale=Akar-Bale +controlledvocabulary.language.akaselem=Akaselem +controlledvocabulary.language.akawaio=Akawaio +controlledvocabulary.language.ake=Ake +controlledvocabulary.language.akebu=Akebu +controlledvocabulary.language.akei=Akei +controlledvocabulary.language.akeu=Akeu +controlledvocabulary.language.akha=Akha +controlledvocabulary.language.akhvakh=Akhvakh +controlledvocabulary.language.akkadian=Akkadian +controlledvocabulary.language.akkala_sami=Akkala Sami +controlledvocabulary.language.aklanon=Aklanon +controlledvocabulary.language.akolet=Akolet +controlledvocabulary.language.akoose=Akoose +controlledvocabulary.language.akoye=Akoye +controlledvocabulary.language.akpa=Akpa +controlledvocabulary.language.akpes=Akpes +controlledvocabulary.language.akrukay=Akrukay +controlledvocabulary.language.akukem=Akukem +controlledvocabulary.language.akuku=Akuku +controlledvocabulary.language.akum=Akum +controlledvocabulary.language.akuntsu=Akuntsu +controlledvocabulary.language.akurio=Akurio +controlledvocabulary.language.akwa=Akwa +controlledvocabulary.language.akyaung_ari_naga=Akyaung Ari Naga +controlledvocabulary.language.al-sayyid_bedouin_sign_language=Al-Sayyid Bedouin Sign Language +controlledvocabulary.language.alaba-kabeena=Alaba-K?abeena +controlledvocabulary.language.alabama=Alabama +controlledvocabulary.language.alabat_island_agta=Alabat Island Agta +controlledvocabulary.language.alacatlatzala_mixtec=Alacatlatzala Mixtec +controlledvocabulary.language.alago=Alago +controlledvocabulary.language.alagwa=Alagwa +controlledvocabulary.language.alak=Alak +controlledvocabulary.language.alamblak=Alamblak +controlledvocabulary.language.alangan=Alangan +controlledvocabulary.language.alanic=Alanic +controlledvocabulary.language.alapmunte=Alapmunte +controlledvocabulary.language.alawa=Alawa +controlledvocabulary.language.albanian=Albanian +controlledvocabulary.language.albanian_sign_language=Albanian Sign Language +controlledvocabulary.language.albarradas_sign_language=Albarradas Sign Language +controlledvocabulary.language.alcozauca_mixtec=Alcozauca Mixtec +controlledvocabulary.language.alege=Alege +controlledvocabulary.language.alekano=Alekano +controlledvocabulary.language.aleut=Aleut +controlledvocabulary.language.algerian_arabic=Algerian Arabic +controlledvocabulary.language.algerian_jewish_sign_language=Algerian Jewish Sign Language +controlledvocabulary.language.algerian_saharan_arabic=Algerian Saharan Arabic +controlledvocabulary.language.algerian_sign_language=Algerian Sign Language +controlledvocabulary.language.algonquin=Algonquin +controlledvocabulary.language.ali=Ali +controlledvocabulary.language.alladian=Alladian +controlledvocabulary.language.allar=Allar +controlledvocabulary.language.alngith=Alngith +controlledvocabulary.language.alo_phola=Alo Phola +controlledvocabulary.language.alor=Alor +controlledvocabulary.language.alo�pam_zapotec=Alo�pam Zapotec +controlledvocabulary.language.alsea=Alsea +controlledvocabulary.language.alu_kurumba=Alu Kurumba +controlledvocabulary.language.alugu=Alugu +controlledvocabulary.language.alumu-tesu=Alumu-Tesu +controlledvocabulary.language.alune=Alune +controlledvocabulary.language.aluo=Aluo +controlledvocabulary.language.alur=Alur +controlledvocabulary.language.alutor=Alutor +controlledvocabulary.language.alviri-vidari=Alviri-Vidari +controlledvocabulary.language.alyawarr=Alyawarr +controlledvocabulary.language.ama_(papua_new_guinea)=Ama (Papua New Guinea) +controlledvocabulary.language.ama_(sudan)=Ama (Sudan) +controlledvocabulary.language.amahai=Amahai +controlledvocabulary.language.amahuaca=Amahuaca +controlledvocabulary.language.amaimon=Amaimon +controlledvocabulary.language.amal=Amal +controlledvocabulary.language.amami_koniya_sign_language=Amami Koniya Sign Language +controlledvocabulary.language.amanab=Amanab +controlledvocabulary.language.amanay�=Amanay� +controlledvocabulary.language.amara=Amara +controlledvocabulary.language.amarakaeri=Amarakaeri +controlledvocabulary.language.amarasi=Amarasi +controlledvocabulary.language.amatl�n_zapotec=Amatl�n Zapotec +controlledvocabulary.language.amba_(solomon_islands)=Amba (Solomon Islands) +controlledvocabulary.language.amba_(uganda)=Amba (Uganda) +controlledvocabulary.language.ambai=Ambai +controlledvocabulary.language.ambakich=Ambakich +controlledvocabulary.language.ambala_ayta=Ambala Ayta +controlledvocabulary.language.ambelau=Ambelau +controlledvocabulary.language.ambele=Ambele +controlledvocabulary.language.amblong=Amblong +controlledvocabulary.language.ambo=Ambo +controlledvocabulary.language.ambo-pasco_quechua=Ambo-Pasco Quechua +controlledvocabulary.language.ambonese_malay=Ambonese Malay +controlledvocabulary.language.ambrak=Ambrak +controlledvocabulary.language.ambul=Ambul +controlledvocabulary.language.ambulas=Ambulas +controlledvocabulary.language.amdang=Amdang +controlledvocabulary.language.amdo_tibetan=Amdo Tibetan +controlledvocabulary.language.amele=Amele +controlledvocabulary.language.american_sign_language=American Sign Language +controlledvocabulary.language.amganad_ifugao=Amganad Ifugao +controlledvocabulary.language.amharic=Amharic +controlledvocabulary.language.ami=Ami +controlledvocabulary.language.amis=Amis +controlledvocabulary.language.amo=Amo +controlledvocabulary.language.amol=Amol +controlledvocabulary.language.amoltepec_mixtec=Amoltepec Mixtec +controlledvocabulary.language.ampanang=Ampanang +controlledvocabulary.language.ampari_dogon=Ampari Dogon +controlledvocabulary.language.amri_karbi=Amri Karbi +controlledvocabulary.language.amto=Amto +controlledvocabulary.language.amundava=Amundava +controlledvocabulary.language.amurdak=Amurdak +controlledvocabulary.language.ana_tinga_dogon=Ana Tinga Dogon +controlledvocabulary.language.anaang=Anaang +controlledvocabulary.language.anakalangu=Anakalangu +controlledvocabulary.language.anal=Anal +controlledvocabulary.language.anam=Anam +controlledvocabulary.language.anamb�=Anamb� +controlledvocabulary.language.anamgura=Anamgura +controlledvocabulary.language.anasi=Anasi +controlledvocabulary.language.ancient_greek_(to_1453)=Ancient Greek (to 1453) +controlledvocabulary.language.ancient_hebrew=Ancient Hebrew +controlledvocabulary.language.ancient_macedonian=Ancient Macedonian +controlledvocabulary.language.ancient_north_arabian=Ancient North Arabian +controlledvocabulary.language.ancient_zapotec=Ancient Zapotec +controlledvocabulary.language.andaandi=Andaandi +controlledvocabulary.language.andai=Andai +controlledvocabulary.language.andajin=Andajin +controlledvocabulary.language.andalusian_arabic=Andalusian Arabic +controlledvocabulary.language.andaman_creole_hindi=Andaman Creole Hindi +controlledvocabulary.language.andaqui=Andaqui +controlledvocabulary.language.andarum=Andarum +controlledvocabulary.language.andegerebinha=Andegerebinha +controlledvocabulary.language.andh=Andh +controlledvocabulary.language.andi=Andi +controlledvocabulary.language.andio=Andio +controlledvocabulary.language.andoa=Andoa +controlledvocabulary.language.andoque=Andoque +controlledvocabulary.language.andra-hus=Andra-Hus +controlledvocabulary.language.aneityum=Aneityum +controlledvocabulary.language.anem=Anem +controlledvocabulary.language.aneme_wake=Aneme Wake +controlledvocabulary.language.anfillo=Anfillo +controlledvocabulary.language.angaataha=Angaataha +controlledvocabulary.language.angait�=Angait� +controlledvocabulary.language.angal=Angal +controlledvocabulary.language.angal_enen=Angal Enen +controlledvocabulary.language.angal_heneng=Angal Heneng +controlledvocabulary.language.angami_naga=Angami Naga +controlledvocabulary.language.angguruk_yali=Angguruk Yali +controlledvocabulary.language.angika=Angika +controlledvocabulary.language.angkamuthi=Angkamuthi +controlledvocabulary.language.anglo-norman=Anglo-Norman +controlledvocabulary.language.angloromani=Angloromani +controlledvocabulary.language.angolar=Angolar +controlledvocabulary.language.angor=Angor +controlledvocabulary.language.angoram=Angoram +controlledvocabulary.language.angosturas_tunebo=Angosturas Tunebo +controlledvocabulary.language.anguthimri=Anguthimri +controlledvocabulary.language.ani_phowa=Ani Phowa +controlledvocabulary.language.anii=Anii +controlledvocabulary.language.animere=Animere +controlledvocabulary.language.anindilyakwa=Anindilyakwa +controlledvocabulary.language.aninka=Aninka +controlledvocabulary.language.anjam=Anjam +controlledvocabulary.language.ankave=Ankave +controlledvocabulary.language.anmatyerre=Anmatyerre +controlledvocabulary.language.anong=Anong +controlledvocabulary.language.anor=Anor +controlledvocabulary.language.anserma=Anserma +controlledvocabulary.language.ansus=Ansus +controlledvocabulary.language.antakarinya=Antakarinya +controlledvocabulary.language.antankarana_malagasy=Antankarana Malagasy +controlledvocabulary.language.antigua_and_barbuda_creole_english=Antigua and Barbuda Creole English +controlledvocabulary.language.anu-hkongso_chin=Anu-Hkongso Chin +controlledvocabulary.language.anuak=Anuak +controlledvocabulary.language.anufo=Anufo +controlledvocabulary.language.anuki=Anuki +controlledvocabulary.language.anus=Anus +controlledvocabulary.language.anuta=Anuta +controlledvocabulary.language.anyin=Anyin +controlledvocabulary.language.anyin_morofo=Anyin Morofo +controlledvocabulary.language.ao_naga=Ao Naga +controlledvocabulary.language.aoheng=Aoheng +controlledvocabulary.language.aore=Aore +controlledvocabulary.language.ap_ma=Ap Ma +controlledvocabulary.language.apalachee=Apalachee +controlledvocabulary.language.apala�=Apala� +controlledvocabulary.language.apali=Apali +controlledvocabulary.language.apasco-apoala_mixtec=Apasco-Apoala Mixtec +controlledvocabulary.language.apatani=Apatani +controlledvocabulary.language.apiak�=Apiak� +controlledvocabulary.language.apinay�=Apinay� +controlledvocabulary.language.apma=Apma +controlledvocabulary.language.aproumu_aizi=Aproumu Aizi +controlledvocabulary.language.apurin�=Apurin� +controlledvocabulary.language.aputai=Aputai +controlledvocabulary.language.aquitanian=Aquitanian +controlledvocabulary.language.arabana=Arabana +controlledvocabulary.language.arabela=Arabela +controlledvocabulary.language.arabic=Arabic +controlledvocabulary.language.aragonese=Aragonese +controlledvocabulary.language.araki=Araki +controlledvocabulary.language.arakwal=Arakwal +controlledvocabulary.language.aralle-tabulahan=Aralle-Tabulahan +controlledvocabulary.language.arammba=Arammba +controlledvocabulary.language.aranadan=Aranadan +controlledvocabulary.language.aranama-tamique=Aranama-Tamique +controlledvocabulary.language.arandai=Arandai +controlledvocabulary.language.araona=Araona +controlledvocabulary.language.arapaho=Arapaho +controlledvocabulary.language.arapaso=Arapaso +controlledvocabulary.language.ararandew�ra=Ararandew�ra +controlledvocabulary.language.arawak=Arawak +controlledvocabulary.language.arawet�=Arawet� +controlledvocabulary.language.arawum=Arawum +controlledvocabulary.language.arbore=Arbore +controlledvocabulary.language.arb�resh�_albanian=Arb�resh� Albanian +controlledvocabulary.language.archi=Archi +controlledvocabulary.language.ardhamgadh_prkrit=Ardham?gadh? Pr?krit +controlledvocabulary.language.are=Are +controlledvocabulary.language.areba=Areba +controlledvocabulary.language.arem=Arem +controlledvocabulary.language.arequipa-la_uni�n_quechua=Arequipa-La Uni�n Quechua +controlledvocabulary.language.argentine_sign_language=Argentine Sign Language +controlledvocabulary.language.argobba=Argobba +controlledvocabulary.language.arguni=Arguni +controlledvocabulary.language.arhuaco=Arhuaco +controlledvocabulary.language.arh�=Arh� +controlledvocabulary.language.arh�=Arh� +controlledvocabulary.language.ari=Ari +controlledvocabulary.language.aribwatsa=Aribwatsa +controlledvocabulary.language.aribwaung=Aribwaung +controlledvocabulary.language.arifama-miniafia=Arifama-Miniafia +controlledvocabulary.language.arigidi=Arigidi +controlledvocabulary.language.arikap�=Arikap� +controlledvocabulary.language.arikara=Arikara +controlledvocabulary.language.arikem=Arikem +controlledvocabulary.language.arin=Arin +controlledvocabulary.language.aringa=Aringa +controlledvocabulary.language.armazic=Armazic +controlledvocabulary.language.armenian=Armenian +controlledvocabulary.language.armenian_sign_language=Armenian Sign Language +controlledvocabulary.language.arop-lokep=Arop-Lokep +controlledvocabulary.language.arop-sissano=Arop-Sissano +controlledvocabulary.language.arosi=Arosi +controlledvocabulary.language.arpitan=Arpitan +controlledvocabulary.language.arritinngithigh=Arritinngithigh +controlledvocabulary.language.arta=Arta +controlledvocabulary.language.aruamu=Aruamu +controlledvocabulary.language.aruek=Aruek +controlledvocabulary.language.aruop=Aruop +controlledvocabulary.language.arutani=Arutani +controlledvocabulary.language.aru�_(amazonas_state)=Aru� (Amazonas State) +controlledvocabulary.language.aru�_(rodonia_state)=Aru� (Rodonia State) +controlledvocabulary.language.arvanitika_albanian=Arvanitika Albanian +controlledvocabulary.language.as=As +controlledvocabulary.language.asaro'o=Asaro'o +controlledvocabulary.language.ashe=Ashe +controlledvocabulary.language.ashkun=Ashkun +controlledvocabulary.language.asho_chin=Asho Chin +controlledvocabulary.language.ashtiani=Ashtiani +controlledvocabulary.language.ash�ninka=Ash�ninka +controlledvocabulary.language.ash�ninka_pajonal=Ash�ninka Pajonal +controlledvocabulary.language.ash�ninka_peren�=Ash�ninka Peren� +controlledvocabulary.language.asilulu=Asilulu +controlledvocabulary.language.askopan=Askopan +controlledvocabulary.language.asoa=Asoa +controlledvocabulary.language.assamese=Assamese +controlledvocabulary.language.assangori=Assangori +controlledvocabulary.language.assiniboine=Assiniboine +controlledvocabulary.language.assyrian_neo-aramaic=Assyrian Neo-Aramaic +controlledvocabulary.language.asturian=Asturian +controlledvocabulary.language.asu_(nigeria)=Asu (Nigeria) +controlledvocabulary.language.asu_(tanzania)=Asu (Tanzania) +controlledvocabulary.language.asue_awyu=Asue Awyu +controlledvocabulary.language.asumboa=Asumboa +controlledvocabulary.language.asunci�n_mixtepec_zapotec=Asunci�n Mixtepec Zapotec +controlledvocabulary.language.asuri=Asuri +controlledvocabulary.language.ata=Ata +controlledvocabulary.language.ata_manobo=Ata Manobo +controlledvocabulary.language.atakapa=Atakapa +controlledvocabulary.language.atampaya=Atampaya +controlledvocabulary.language.atatl�huca_mixtec=Atatl�huca Mixtec +controlledvocabulary.language.atauran=Atauran +controlledvocabulary.language.atayal=Atayal +controlledvocabulary.language.atemble=Atemble +controlledvocabulary.language.athpariya=Athpariya +controlledvocabulary.language.ati=Ati +controlledvocabulary.language.atikamekw=Atikamekw +controlledvocabulary.language.atohwaim=Atohwaim +controlledvocabulary.language.atong_(cameroon)=Atong (Cameroon) +controlledvocabulary.language.atong_(india)=Atong (India) +controlledvocabulary.language.atorada=Atorada +controlledvocabulary.language.atsahuaca=Atsahuaca +controlledvocabulary.language.atsam=Atsam +controlledvocabulary.language.atsugewi=Atsugewi +controlledvocabulary.language.attapady_kurumba=Attapady Kurumba +controlledvocabulary.language.atti�=Atti� +controlledvocabulary.language.atzingo_matlatzinca=Atzingo Matlatzinca +controlledvocabulary.language.au=Au +controlledvocabulary.language.aulua=Aulua +controlledvocabulary.language.aur�=Aur� +controlledvocabulary.language.aushi=Aushi +controlledvocabulary.language.aushiri=Aushiri +controlledvocabulary.language.auslan=Auslan +controlledvocabulary.language.austral=Austral +controlledvocabulary.language.australian_aborigines_sign_language=Australian Aborigines Sign Language +controlledvocabulary.language.austrian_sign_language=Austrian Sign Language +controlledvocabulary.language.auwe=Auwe +controlledvocabulary.language.auye=Auye +controlledvocabulary.language.auyokawa=Auyokawa +controlledvocabulary.language.avaric=Avaric +controlledvocabulary.language.avatime=Avatime +controlledvocabulary.language.avau=Avau +controlledvocabulary.language.avestan=Avestan +controlledvocabulary.language.avikam=Avikam +controlledvocabulary.language.avokaya=Avokaya +controlledvocabulary.language.av�-canoeiro=Av�-Canoeiro +controlledvocabulary.language.awa_(china)=Awa (China) +controlledvocabulary.language.awa_(papua_new_guinea)=Awa (Papua New Guinea) +controlledvocabulary.language.awa-cuaiquer=Awa-Cuaiquer +controlledvocabulary.language.awabakal=Awabakal +controlledvocabulary.language.awad_bing=Awad Bing +controlledvocabulary.language.awadhi=Awadhi +controlledvocabulary.language.awak=Awak +controlledvocabulary.language.awar=Awar +controlledvocabulary.language.awara=Awara +controlledvocabulary.language.awbono=Awbono +controlledvocabulary.language.aweer=Aweer +controlledvocabulary.language.awera=Awera +controlledvocabulary.language.awet�=Awet� +controlledvocabulary.language.awing=Awing +controlledvocabulary.language.awiyaana=Awiyaana +controlledvocabulary.language.awjilah=Awjilah +controlledvocabulary.language.awngi=Awngi +controlledvocabulary.language.awngthim=Awngthim +controlledvocabulary.language.awtuw=Awtuw +controlledvocabulary.language.awu=Awu +controlledvocabulary.language.awun=Awun +controlledvocabulary.language.awutu=Awutu +controlledvocabulary.language.awyi=Awyi +controlledvocabulary.language.axamb=Axamb +controlledvocabulary.language.axi_yi=Axi Yi +controlledvocabulary.language.ayabadhu=Ayabadhu +controlledvocabulary.language.ayacucho_quechua=Ayacucho Quechua +controlledvocabulary.language.ayautla_mazatec=Ayautla Mazatec +controlledvocabulary.language.ayere=Ayere +controlledvocabulary.language.ayerrerenge=Ayerrerenge +controlledvocabulary.language.ayi_(papua_new_guinea)=Ayi (Papua New Guinea) +controlledvocabulary.language.ayiwo=Ayiwo +controlledvocabulary.language.ayizi=Ayizi +controlledvocabulary.language.ayizo_gbe=Ayizo Gbe +controlledvocabulary.language.aymara=Aymara +controlledvocabulary.language.ayoquesco_zapotec=Ayoquesco Zapotec +controlledvocabulary.language.ayoreo=Ayoreo +controlledvocabulary.language.ayu=Ayu +controlledvocabulary.language.ayutla_mixtec=Ayutla Mixtec +controlledvocabulary.language.azerbaijani=Azerbaijani +controlledvocabulary.language.azha=Azha +controlledvocabulary.language.azhe=Azhe +controlledvocabulary.language.azoy�_me'phaa=Azoy� Me'phaa +controlledvocabulary.language.baan=Baan +controlledvocabulary.language.baangi=Baangi +controlledvocabulary.language.baatonum=Baatonum +controlledvocabulary.language.baba=Baba +controlledvocabulary.language.baba_malay=Baba Malay +controlledvocabulary.language.babango=Babango +controlledvocabulary.language.babanki=Babanki +controlledvocabulary.language.babatana=Babatana +controlledvocabulary.language.babine=Babine +controlledvocabulary.language.babuza=Babuza +controlledvocabulary.language.bacama=Bacama +controlledvocabulary.language.bacanese_malay=Bacanese Malay +controlledvocabulary.language.bactrian=Bactrian +controlledvocabulary.language.bada_(indonesia)=Bada (Indonesia) +controlledvocabulary.language.bada_(nigeria)=Bada (Nigeria) +controlledvocabulary.language.badaga=Badaga +controlledvocabulary.language.bade=Bade +controlledvocabulary.language.badeshi=Badeshi +controlledvocabulary.language.badimaya=Badimaya +controlledvocabulary.language.badjiri=Badjiri +controlledvocabulary.language.badui=Badui +controlledvocabulary.language.badyara=Badyara +controlledvocabulary.language.baeggu=Baeggu +controlledvocabulary.language.baelelea=Baelelea +controlledvocabulary.language.baetora=Baetora +controlledvocabulary.language.bafanji=Bafanji +controlledvocabulary.language.bafaw-balong=Bafaw-Balong +controlledvocabulary.language.bafia=Bafia +controlledvocabulary.language.bafut=Bafut +controlledvocabulary.language.baga_kaloum=Baga Kaloum +controlledvocabulary.language.baga_koga=Baga Koga +controlledvocabulary.language.baga_manduri=Baga Manduri +controlledvocabulary.language.baga_pokur=Baga Pokur +controlledvocabulary.language.baga_sitemu=Baga Sitemu +controlledvocabulary.language.baga_soban�=Baga Soban� +controlledvocabulary.language.bagheli=Bagheli +controlledvocabulary.language.bagirmi=Bagirmi +controlledvocabulary.language.bagirmi_fulfulde=Bagirmi Fulfulde +controlledvocabulary.language.bago-kusuntu=Bago-Kusuntu +controlledvocabulary.language.bagri=Bagri +controlledvocabulary.language.bagupi=Bagupi +controlledvocabulary.language.bagusa=Bagusa +controlledvocabulary.language.bagvalal=Bagvalal +controlledvocabulary.language.baha_buyang=Baha Buyang +controlledvocabulary.language.baham=Baham +controlledvocabulary.language.bahamas_creole_english=Bahamas Creole English +controlledvocabulary.language.baharna_arabic=Baharna Arabic +controlledvocabulary.language.bahau=Bahau +controlledvocabulary.language.bahinemo=Bahinemo +controlledvocabulary.language.bahing=Bahing +controlledvocabulary.language.bahnar=Bahnar +controlledvocabulary.language.bahonsuai=Bahonsuai +controlledvocabulary.language.bai_(south_sudan)=Bai (South Sudan) +controlledvocabulary.language.baibai=Baibai +controlledvocabulary.language.baikeno=Baikeno +controlledvocabulary.language.baima=Baima +controlledvocabulary.language.baimak=Baimak +controlledvocabulary.language.bainouk-gunyaamolo=Bainouk-Gunyaamolo +controlledvocabulary.language.bainouk-gunyu�o=Bainouk-Gunyu�o +controlledvocabulary.language.bainouk-samik=Bainouk-Samik +controlledvocabulary.language.baiso=Baiso +controlledvocabulary.language.baissa_fali=Baissa Fali +controlledvocabulary.language.bajan=Bajan +controlledvocabulary.language.bajelani=Bajelani +controlledvocabulary.language.bajjika=Bajjika +controlledvocabulary.language.baka_(cameroon)=Baka (Cameroon) +controlledvocabulary.language.baka_(south_sudan)=Baka (South Sudan) +controlledvocabulary.language.bakair�=Bakair� +controlledvocabulary.language.bakaka=Bakaka +controlledvocabulary.language.bakhtiari=Bakhtiari +controlledvocabulary.language.baki=Baki +controlledvocabulary.language.bakoko=Bakoko +controlledvocabulary.language.bakole=Bakole +controlledvocabulary.language.bakpinka=Bakpinka +controlledvocabulary.language.bakumpai=Bakumpai +controlledvocabulary.language.bakw�=Bakw� +controlledvocabulary.language.balaesang=Balaesang +controlledvocabulary.language.balaibalan=Balaibalan +controlledvocabulary.language.balangao=Balangao +controlledvocabulary.language.balangingi=Balangingi +controlledvocabulary.language.balanta-ganja=Balanta-Ganja +controlledvocabulary.language.balanta-kentohe=Balanta-Kentohe +controlledvocabulary.language.balantak=Balantak +controlledvocabulary.language.baldemu=Baldemu +controlledvocabulary.language.bali_(democratic_republic_of_congo)=Bali (Democratic Republic of Congo) +controlledvocabulary.language.bali_(nigeria)=Bali (Nigeria) +controlledvocabulary.language.balinese=Balinese +controlledvocabulary.language.balinese_malay=Balinese Malay +controlledvocabulary.language.balkan_gagauz_turkish=Balkan Gagauz Turkish +controlledvocabulary.language.balkan_romani=Balkan Romani +controlledvocabulary.language.balo=Balo +controlledvocabulary.language.baloi=Baloi +controlledvocabulary.language.balti=Balti +controlledvocabulary.language.baltic_romani=Baltic Romani +controlledvocabulary.language.baluan-pam=Baluan-Pam +controlledvocabulary.language.baluchi=Baluchi +controlledvocabulary.language.bamako_sign_language=Bamako Sign Language +controlledvocabulary.language.bamali=Bamali +controlledvocabulary.language.bambalang=Bambalang +controlledvocabulary.language.bambam=Bambam +controlledvocabulary.language.bambara=Bambara +controlledvocabulary.language.bambassi=Bambassi +controlledvocabulary.language.bambili-bambui=Bambili-Bambui +controlledvocabulary.language.bamenyam=Bamenyam +controlledvocabulary.language.bamu=Bamu +controlledvocabulary.language.bamukumbit=Bamukumbit +controlledvocabulary.language.bamun=Bamun +controlledvocabulary.language.bamunka=Bamunka +controlledvocabulary.language.bamwe=Bamwe +controlledvocabulary.language.ban_khor_sign_language=Ban Khor Sign Language +controlledvocabulary.language.bana=Bana +controlledvocabulary.language.banao_itneg=Banao Itneg +controlledvocabulary.language.banaro=Banaro +controlledvocabulary.language.banda_(indonesia)=Banda (Indonesia) +controlledvocabulary.language.banda_malay=Banda Malay +controlledvocabulary.language.banda-bambari=Banda-Bambari +controlledvocabulary.language.banda-banda=Banda-Banda +controlledvocabulary.language.banda-mbr�s=Banda-Mbr�s +controlledvocabulary.language.banda-nd�l�=Banda-Nd�l� +controlledvocabulary.language.banda-yangere=Banda-Yangere +controlledvocabulary.language.bandi=Bandi +controlledvocabulary.language.bandial=Bandial +controlledvocabulary.language.bandjalang=Bandjalang +controlledvocabulary.language.bangala=Bangala +controlledvocabulary.language.bangandu=Bangandu +controlledvocabulary.language.bangba=Bangba +controlledvocabulary.language.banggai=Banggai +controlledvocabulary.language.banggarla=Banggarla +controlledvocabulary.language.bangi=Bangi +controlledvocabulary.language.bangime=Bangime +controlledvocabulary.language.bangka=Bangka +controlledvocabulary.language.bangolan=Bangolan +controlledvocabulary.language.bangubangu=Bangubangu +controlledvocabulary.language.bangwinji=Bangwinji +controlledvocabulary.language.baniva=Baniva +controlledvocabulary.language.baniwa=Baniwa +controlledvocabulary.language.banjar=Banjar +controlledvocabulary.language.bankagooma=Bankagooma +controlledvocabulary.language.bankal=Bankal +controlledvocabulary.language.bankan_tey_dogon=Bankan Tey Dogon +controlledvocabulary.language.bankon=Bankon +controlledvocabulary.language.bannoni=Bannoni +controlledvocabulary.language.bantawa=Bantawa +controlledvocabulary.language.bantayanon=Bantayanon +controlledvocabulary.language.bantik=Bantik +controlledvocabulary.language.bantoanon=Bantoanon +controlledvocabulary.language.banyjima=Banyjima +controlledvocabulary.language.baoul�=Baoul� +controlledvocabulary.language.bara_malagasy=Bara Malagasy +controlledvocabulary.language.baraamu=Baraamu +controlledvocabulary.language.barababaraba=Barababaraba +controlledvocabulary.language.barai=Barai +controlledvocabulary.language.barakai=Barakai +controlledvocabulary.language.baram_kayan=Baram Kayan +controlledvocabulary.language.barama=Barama +controlledvocabulary.language.barambu=Barambu +controlledvocabulary.language.baramu=Baramu +controlledvocabulary.language.barapasi=Barapasi +controlledvocabulary.language.baras=Baras +controlledvocabulary.language.barasana-eduria=Barasana-Eduria +controlledvocabulary.language.barbaram=Barbaram +controlledvocabulary.language.barbare�o=Barbare�o +controlledvocabulary.language.barclayville_grebo=Barclayville Grebo +controlledvocabulary.language.bardi=Bardi +controlledvocabulary.language.barein=Barein +controlledvocabulary.language.bargam=Bargam +controlledvocabulary.language.bari=Bari +controlledvocabulary.language.bariai=Bariai +controlledvocabulary.language.bariji=Bariji +controlledvocabulary.language.barikanchi=Barikanchi +controlledvocabulary.language.barikewa=Barikewa +controlledvocabulary.language.barok=Barok +controlledvocabulary.language.barombi=Barombi +controlledvocabulary.language.barro_negro_tunebo=Barro Negro Tunebo +controlledvocabulary.language.barrow_point=Barrow Point +controlledvocabulary.language.baruga=Baruga +controlledvocabulary.language.baruya=Baruya +controlledvocabulary.language.barwe=Barwe +controlledvocabulary.language.barzani_jewish_neo-aramaic=Barzani Jewish Neo-Aramaic +controlledvocabulary.language.bar�=Bar� +controlledvocabulary.language.bar�=Bar� +controlledvocabulary.language.basa_(cameroon)=Basa (Cameroon) +controlledvocabulary.language.basa_(nigeria)=Basa (Nigeria) +controlledvocabulary.language.basa-gumna=Basa-Gumna +controlledvocabulary.language.basa-gurmana=Basa-Gurmana +controlledvocabulary.language.basap=Basap +controlledvocabulary.language.basay=Basay +controlledvocabulary.language.bashkardi=Bashkardi +controlledvocabulary.language.bashkir=Bashkir +controlledvocabulary.language.basketo=Basketo +controlledvocabulary.language.basque=Basque +controlledvocabulary.language.bassa=Bassa +controlledvocabulary.language.bassa-kontagora=Bassa-Kontagora +controlledvocabulary.language.bassari=Bassari +controlledvocabulary.language.bassossi=Bassossi +controlledvocabulary.language.bata=Bata +controlledvocabulary.language.batad_ifugao=Batad Ifugao +controlledvocabulary.language.batak=Batak +controlledvocabulary.language.batak_alas-kluet=Batak Alas-Kluet +controlledvocabulary.language.batak_angkola=Batak Angkola +controlledvocabulary.language.batak_dairi=Batak Dairi +controlledvocabulary.language.batak_karo=Batak Karo +controlledvocabulary.language.batak_mandailing=Batak Mandailing +controlledvocabulary.language.batak_simalungun=Batak Simalungun +controlledvocabulary.language.batak_toba=Batak Toba +controlledvocabulary.language.batanga=Batanga +controlledvocabulary.language.batek=Batek +controlledvocabulary.language.bateri=Bateri +controlledvocabulary.language.bathari=Bathari +controlledvocabulary.language.bati_(cameroon)=Bati (Cameroon) +controlledvocabulary.language.bati_(indonesia)=Bati (Indonesia) +controlledvocabulary.language.batjala=Batjala +controlledvocabulary.language.bats=Bats +controlledvocabulary.language.batu=Batu +controlledvocabulary.language.batui=Batui +controlledvocabulary.language.batuley=Batuley +controlledvocabulary.language.bau=Bau +controlledvocabulary.language.bau_bidayuh=Bau Bidayuh +controlledvocabulary.language.bauchi=Bauchi +controlledvocabulary.language.bauni=Bauni +controlledvocabulary.language.baure=Baure +controlledvocabulary.language.bauria=Bauria +controlledvocabulary.language.bauwaki=Bauwaki +controlledvocabulary.language.bauzi=Bauzi +controlledvocabulary.language.bavarian=Bavarian +controlledvocabulary.language.bawm_chin=Bawm Chin +controlledvocabulary.language.bay_miwok=Bay Miwok +controlledvocabulary.language.bayali=Bayali +controlledvocabulary.language.baybayanon=Baybayanon +controlledvocabulary.language.baygo=Baygo +controlledvocabulary.language.bayono=Bayono +controlledvocabulary.language.bayot=Bayot +controlledvocabulary.language.bayungu=Bayungu +controlledvocabulary.language.bazigar=Bazigar +controlledvocabulary.language.beami=Beami +controlledvocabulary.language.beaver=Beaver +controlledvocabulary.language.beba=Beba +controlledvocabulary.language.bebele=Bebele +controlledvocabulary.language.bebeli=Bebeli +controlledvocabulary.language.bebil=Bebil +controlledvocabulary.language.bedjond=Bedjond +controlledvocabulary.language.bedoanas=Bedoanas +controlledvocabulary.language.beeke=Beeke +controlledvocabulary.language.beele=Beele +controlledvocabulary.language.beembe=Beembe +controlledvocabulary.language.beezen=Beezen +controlledvocabulary.language.befang=Befang +controlledvocabulary.language.beginci=Beginci +controlledvocabulary.language.beja=Beja +controlledvocabulary.language.bekati'=Bekati' +controlledvocabulary.language.bekwarra=Bekwarra +controlledvocabulary.language.bekwel=Bekwel +controlledvocabulary.language.belait=Belait +controlledvocabulary.language.belanda_bor=Belanda Bor +controlledvocabulary.language.belanda_viri=Belanda Viri +controlledvocabulary.language.belarusian=Belarusian +controlledvocabulary.language.belhariya=Belhariya +controlledvocabulary.language.beli_(papua_new_guinea)=Beli (Papua New Guinea) +controlledvocabulary.language.beli_(south_sudan)=Beli (South Sudan) +controlledvocabulary.language.belize_kriol_english=Belize Kriol English +controlledvocabulary.language.bella_coola=Bella Coola +controlledvocabulary.language.bellari=Bellari +controlledvocabulary.language.belning=Belning +controlledvocabulary.language.bemba_(zambia)=Bemba (Zambia) +controlledvocabulary.language.bembe=Bembe +controlledvocabulary.language.ben_tey_dogon=Ben Tey Dogon +controlledvocabulary.language.bena_(nigeria)=Bena (Nigeria) +controlledvocabulary.language.bena_(tanzania)=Bena (Tanzania) +controlledvocabulary.language.benabena=Benabena +controlledvocabulary.language.benamanga=Benamanga +controlledvocabulary.language.bench=Bench +controlledvocabulary.language.bende=Bende +controlledvocabulary.language.bendi=Bendi +controlledvocabulary.language.beng=Beng +controlledvocabulary.language.benga=Benga +controlledvocabulary.language.bengali,_bangla=Bengali, Bangla +controlledvocabulary.language.benggoi=Benggoi +controlledvocabulary.language.bengkala_sign_language=Bengkala Sign Language +controlledvocabulary.language.bentong=Bentong +controlledvocabulary.language.benyadu'=Benyadu' +controlledvocabulary.language.beothuk=Beothuk +controlledvocabulary.language.bepour=Bepour +controlledvocabulary.language.berakou=Berakou +controlledvocabulary.language.berau_malay=Berau Malay +controlledvocabulary.language.berbice_creole_dutch=Berbice Creole Dutch +controlledvocabulary.language.berik=Berik +controlledvocabulary.language.berinomo=Berinomo +controlledvocabulary.language.berom=Berom +controlledvocabulary.language.berta=Berta +controlledvocabulary.language.berti=Berti +controlledvocabulary.language.besisi=Besisi +controlledvocabulary.language.besme=Besme +controlledvocabulary.language.besoa=Besoa +controlledvocabulary.language.betaf=Betaf +controlledvocabulary.language.betawi=Betawi +controlledvocabulary.language.bete=Bete +controlledvocabulary.language.bete-bendi=Bete-Bendi +controlledvocabulary.language.beti_(c�te_d'ivoire)=Beti (C�te d'Ivoire) +controlledvocabulary.language.betta_kurumba=Betta Kurumba +controlledvocabulary.language.bezhta=Bezhta +controlledvocabulary.language.bhadrawahi=Bhadrawahi +controlledvocabulary.language.bhalay=Bhalay +controlledvocabulary.language.bharia=Bharia +controlledvocabulary.language.bhatri=Bhatri +controlledvocabulary.language.bhattiyali=Bhattiyali +controlledvocabulary.language.bhaya=Bhaya +controlledvocabulary.language.bhele=Bhele +controlledvocabulary.language.bhilali=Bhilali +controlledvocabulary.language.bhili=Bhili +controlledvocabulary.language.bhojpuri=Bhojpuri +controlledvocabulary.language.bhoti_kinnauri=Bhoti Kinnauri +controlledvocabulary.language.bhujel=Bhujel +controlledvocabulary.language.bhunjia=Bhunjia +controlledvocabulary.language.biafada=Biafada +controlledvocabulary.language.biage=Biage +controlledvocabulary.language.biak=Biak +controlledvocabulary.language.biali=Biali +controlledvocabulary.language.bian_marind=Bian Marind +controlledvocabulary.language.biangai=Biangai +controlledvocabulary.language.biao=Biao +controlledvocabulary.language.biao_mon=Biao Mon +controlledvocabulary.language.biao-jiao_mien=Biao-Jiao Mien +controlledvocabulary.language.biatah_bidayuh=Biatah Bidayuh +controlledvocabulary.language.bibbulman=Bibbulman +controlledvocabulary.language.bidhawal=Bidhawal +controlledvocabulary.language.bidiyo=Bidiyo +controlledvocabulary.language.bidjara=Bidjara +controlledvocabulary.language.bidyogo=Bidyogo +controlledvocabulary.language.biem=Biem +controlledvocabulary.language.bierebo=Bierebo +controlledvocabulary.language.bieria=Bieria +controlledvocabulary.language.biete=Biete +controlledvocabulary.language.big_nambas=Big Nambas +controlledvocabulary.language.biga=Biga +controlledvocabulary.language.bigambal=Bigambal +controlledvocabulary.language.bih=Bih +controlledvocabulary.language.bihari=Bihari +controlledvocabulary.language.bijim=Bijim +controlledvocabulary.language.bijori=Bijori +controlledvocabulary.language.bikol=Bikol +controlledvocabulary.language.bikya=Bikya +controlledvocabulary.language.bila=Bila +controlledvocabulary.language.bilakura=Bilakura +controlledvocabulary.language.bilaspuri=Bilaspuri +controlledvocabulary.language.bilba=Bilba +controlledvocabulary.language.bilbil=Bilbil +controlledvocabulary.language.bile=Bile +controlledvocabulary.language.bilin=Bilin +controlledvocabulary.language.bilma_kanuri=Bilma Kanuri +controlledvocabulary.language.biloxi=Biloxi +controlledvocabulary.language.bilua=Bilua +controlledvocabulary.language.bilur=Bilur +controlledvocabulary.language.bima=Bima +controlledvocabulary.language.bimin=Bimin +controlledvocabulary.language.bimoba=Bimoba +controlledvocabulary.language.bina_(nigeria)=Bina (Nigeria) +controlledvocabulary.language.bina_(papua_new_guinea)=Bina (Papua New Guinea) +controlledvocabulary.language.binahari=Binahari +controlledvocabulary.language.binandere=Binandere +controlledvocabulary.language.bindal=Bindal +controlledvocabulary.language.bine=Bine +controlledvocabulary.language.bini=Bini +controlledvocabulary.language.binji=Binji +controlledvocabulary.language.binongan_itneg=Binongan Itneg +controlledvocabulary.language.bintauna=Bintauna +controlledvocabulary.language.bintulu=Bintulu +controlledvocabulary.language.binukid=Binukid +controlledvocabulary.language.binumarien=Binumarien +controlledvocabulary.language.bipi=Bipi +controlledvocabulary.language.bira=Bira +controlledvocabulary.language.birale=Birale +controlledvocabulary.language.birao=Birao +controlledvocabulary.language.birgit=Birgit +controlledvocabulary.language.birhor=Birhor +controlledvocabulary.language.biri=Biri +controlledvocabulary.language.biritai=Biritai +controlledvocabulary.language.birked=Birked +controlledvocabulary.language.birri=Birri +controlledvocabulary.language.birrpayi=Birrpayi +controlledvocabulary.language.birwa=Birwa +controlledvocabulary.language.biseni=Biseni +controlledvocabulary.language.bishnupriya=Bishnupriya +controlledvocabulary.language.bishuo=Bishuo +controlledvocabulary.language.bisis=Bisis +controlledvocabulary.language.bislama=Bislama +controlledvocabulary.language.bisorio=Bisorio +controlledvocabulary.language.bissa=Bissa +controlledvocabulary.language.bisu=Bisu +controlledvocabulary.language.bit=Bit +controlledvocabulary.language.bitare=Bitare +controlledvocabulary.language.bitur=Bitur +controlledvocabulary.language.biwat=Biwat +controlledvocabulary.language.biyo=Biyo +controlledvocabulary.language.biyom=Biyom +controlledvocabulary.language.blablanga=Blablanga +controlledvocabulary.language.blafe=Blafe +controlledvocabulary.language.blagar=Blagar +controlledvocabulary.language.blang=Blang +controlledvocabulary.language.blissymbols=Blissymbols +controlledvocabulary.language.bo_(laos)=Bo (Laos) +controlledvocabulary.language.bo_(papua_new_guinea)=Bo (Papua New Guinea) +controlledvocabulary.language.bo-rukul=Bo-Rukul +controlledvocabulary.language.bo-ung=Bo-Ung +controlledvocabulary.language.boano_(maluku)=Boano (Maluku) +controlledvocabulary.language.boano_(sulawesi)=Boano (Sulawesi) +controlledvocabulary.language.bobongko=Bobongko +controlledvocabulary.language.bobot=Bobot +controlledvocabulary.language.bodo_(central_african_republic)=Bodo (Central African Republic) +controlledvocabulary.language.bodo_(india)=Bodo (India) +controlledvocabulary.language.bodo_gadaba=Bodo Gadaba +controlledvocabulary.language.bodo_parja=Bodo Parja +controlledvocabulary.language.bofi=Bofi +controlledvocabulary.language.boga=Boga +controlledvocabulary.language.bogaya=Bogaya +controlledvocabulary.language.boghom=Boghom +controlledvocabulary.language.boguru=Boguru +controlledvocabulary.language.bohtan_neo-aramaic=Bohtan Neo-Aramaic +controlledvocabulary.language.boikin=Boikin +controlledvocabulary.language.bokha=Bokha +controlledvocabulary.language.boko_(benin)=Boko (Benin) +controlledvocabulary.language.boko_(democratic_republic_of_congo)=Boko (Democratic Republic of Congo) +controlledvocabulary.language.bokobaru=Bokobaru +controlledvocabulary.language.bokoto=Bokoto +controlledvocabulary.language.bokyi=Bokyi +controlledvocabulary.language.bola=Bola +controlledvocabulary.language.bolango=Bolango +controlledvocabulary.language.bole=Bole +controlledvocabulary.language.bolgarian=Bolgarian +controlledvocabulary.language.bolgo=Bolgo +controlledvocabulary.language.bolia=Bolia +controlledvocabulary.language.bolinao=Bolinao +controlledvocabulary.language.bolivian_sign_language=Bolivian Sign Language +controlledvocabulary.language.boloki=Boloki +controlledvocabulary.language.bolon=Bolon +controlledvocabulary.language.bolondo=Bolondo +controlledvocabulary.language.bolongan=Bolongan +controlledvocabulary.language.bolyu=Bolyu +controlledvocabulary.language.bom-kim=Bom-Kim +controlledvocabulary.language.boma=Boma +controlledvocabulary.language.bomboli=Bomboli +controlledvocabulary.language.bomboma=Bomboma +controlledvocabulary.language.bomitaba=Bomitaba +controlledvocabulary.language.bomu=Bomu +controlledvocabulary.language.bomwali=Bomwali +controlledvocabulary.language.bon_gula=Bon Gula +controlledvocabulary.language.bonan=Bonan +controlledvocabulary.language.bondei=Bondei +controlledvocabulary.language.bondo=Bondo +controlledvocabulary.language.bondoukou_kulango=Bondoukou Kulango +controlledvocabulary.language.bondum_dom_dogon=Bondum Dom Dogon +controlledvocabulary.language.bonerate=Bonerate +controlledvocabulary.language.bonerif=Bonerif +controlledvocabulary.language.bonggi=Bonggi +controlledvocabulary.language.bonggo=Bonggo +controlledvocabulary.language.bongili=Bongili +controlledvocabulary.language.bongo=Bongo +controlledvocabulary.language.bongu=Bongu +controlledvocabulary.language.bonjo=Bonjo +controlledvocabulary.language.bonkeng=Bonkeng +controlledvocabulary.language.bonkiman=Bonkiman +controlledvocabulary.language.bontok=Bontok +controlledvocabulary.language.bookan=Bookan +controlledvocabulary.language.boon=Boon +controlledvocabulary.language.boor=Boor +controlledvocabulary.language.bora=Bora +controlledvocabulary.language.borana-arsi-guji_oromo=Borana-Arsi-Guji Oromo +controlledvocabulary.language.border_kuna=Border Kuna +controlledvocabulary.language.borei=Borei +controlledvocabulary.language.borgu_fulfulde=Borgu Fulfulde +controlledvocabulary.language.boro_(ethiopia)=Boro (Ethiopia) +controlledvocabulary.language.boro_(ghana)=Boro (Ghana) +controlledvocabulary.language.borong=Borong +controlledvocabulary.language.boruca=Boruca +controlledvocabulary.language.bor�ro=Bor�ro +controlledvocabulary.language.boselewa=Boselewa +controlledvocabulary.language.bosngun=Bosngun +controlledvocabulary.language.bosnian=Bosnian +controlledvocabulary.language.bote-majhi=Bote-Majhi +controlledvocabulary.language.botlikh=Botlikh +controlledvocabulary.language.botolan_sambal=Botolan Sambal +controlledvocabulary.language.bouna_kulango=Bouna Kulango +controlledvocabulary.language.bouni=Bouni +controlledvocabulary.language.bouyei=Bouyei +controlledvocabulary.language.bozaba=Bozaba +controlledvocabulary.language.bragat=Bragat +controlledvocabulary.language.brahui=Brahui +controlledvocabulary.language.braj=Braj +controlledvocabulary.language.brao=Brao +controlledvocabulary.language.brazilian_sign_language=Brazilian Sign Language +controlledvocabulary.language.brem=Brem +controlledvocabulary.language.breri=Breri +controlledvocabulary.language.breton=Breton +controlledvocabulary.language.bribri=Bribri +controlledvocabulary.language.bribri_sign_language=Bribri Sign Language +controlledvocabulary.language.brithenig=Brithenig +controlledvocabulary.language.british_sign_language=British Sign Language +controlledvocabulary.language.brokkat=Brokkat +controlledvocabulary.language.brokpake=Brokpake +controlledvocabulary.language.brokskat=Brokskat +controlledvocabulary.language.brooke's_point_palawano=Brooke's Point Palawano +controlledvocabulary.language.broome_pearling_lugger_pidgin=Broome Pearling Lugger Pidgin +controlledvocabulary.language.brunca_sign_language=Brunca Sign Language +controlledvocabulary.language.brunei=Brunei +controlledvocabulary.language.brunei_bisaya=Brunei Bisaya +controlledvocabulary.language.bruny_island_tasmanian=Bruny Island Tasmanian +controlledvocabulary.language.bu_(bauchi_state)=Bu (Bauchi State) +controlledvocabulary.language.bu_(kaduna_state)=Bu (Kaduna State) +controlledvocabulary.language.bu-nao_bunu=Bu-Nao Bunu +controlledvocabulary.language.bua=Bua +controlledvocabulary.language.bualkhaw_chin=Bualkhaw Chin +controlledvocabulary.language.buamu=Buamu +controlledvocabulary.language.bube=Bube +controlledvocabulary.language.bubi=Bubi +controlledvocabulary.language.bubia=Bubia +controlledvocabulary.language.budeh_stieng=Budeh Stieng +controlledvocabulary.language.budibud=Budibud +controlledvocabulary.language.budong-budong=Budong-Budong +controlledvocabulary.language.budu=Budu +controlledvocabulary.language.budukh=Budukh +controlledvocabulary.language.buduma=Buduma +controlledvocabulary.language.budza=Budza +controlledvocabulary.language.bugan=Bugan +controlledvocabulary.language.bugawac=Bugawac +controlledvocabulary.language.bughotu=Bughotu +controlledvocabulary.language.buginese=Buginese +controlledvocabulary.language.buglere=Buglere +controlledvocabulary.language.bugun=Bugun +controlledvocabulary.language.buhi'non_bikol=Buhi'non Bikol +controlledvocabulary.language.buhid=Buhid +controlledvocabulary.language.buhutu=Buhutu +controlledvocabulary.language.bukar-sadung_bidayuh=Bukar-Sadung Bidayuh +controlledvocabulary.language.bukat=Bukat +controlledvocabulary.language.bukharic=Bukharic +controlledvocabulary.language.bukit_malay=Bukit Malay +controlledvocabulary.language.bukitan=Bukitan +controlledvocabulary.language.bukiyip=Bukiyip +controlledvocabulary.language.buksa=Buksa +controlledvocabulary.language.bukusu=Bukusu +controlledvocabulary.language.bukwen=Bukwen +controlledvocabulary.language.bulgarian=Bulgarian +controlledvocabulary.language.bulgarian_sign_language=Bulgarian Sign Language +controlledvocabulary.language.bulgebi=Bulgebi +controlledvocabulary.language.buli=Buli +controlledvocabulary.language.buli_(ghana)=Buli (Ghana) +controlledvocabulary.language.buli_(indonesia)=Buli (Indonesia) +controlledvocabulary.language.bullom_so=Bullom So +controlledvocabulary.language.bulo_stieng=Bulo Stieng +controlledvocabulary.language.bulu_(cameroon)=Bulu (Cameroon) +controlledvocabulary.language.bulu_(papua_new_guinea)=Bulu (Papua New Guinea) +controlledvocabulary.language.bum=Bum +controlledvocabulary.language.bumaji=Bumaji +controlledvocabulary.language.bumang=Bumang +controlledvocabulary.language.bumbita_arapesh=Bumbita Arapesh +controlledvocabulary.language.bumthangkha=Bumthangkha +controlledvocabulary.language.bun=Bun +controlledvocabulary.language.buna=Buna +controlledvocabulary.language.bunak=Bunak +controlledvocabulary.language.bunama=Bunama +controlledvocabulary.language.bundeli=Bundeli +controlledvocabulary.language.bung=Bung +controlledvocabulary.language.bungain=Bungain +controlledvocabulary.language.bunganditj=Bunganditj +controlledvocabulary.language.bungku=Bungku +controlledvocabulary.language.bungu=Bungu +controlledvocabulary.language.bunoge_dogon=Bunoge Dogon +controlledvocabulary.language.bunuba=Bunuba +controlledvocabulary.language.bunun=Bunun +controlledvocabulary.language.buol=Buol +controlledvocabulary.language.bura-pabir=Bura-Pabir +controlledvocabulary.language.burak=Burak +controlledvocabulary.language.buraka=Buraka +controlledvocabulary.language.burarra=Burarra +controlledvocabulary.language.burate=Burate +controlledvocabulary.language.burduna=Burduna +controlledvocabulary.language.bure=Bure +controlledvocabulary.language.buriat=Buriat +controlledvocabulary.language.burji=Burji +controlledvocabulary.language.burmbar=Burmbar +controlledvocabulary.language.burmese=Burmese +controlledvocabulary.language.burmeso=Burmeso +controlledvocabulary.language.buru_(indonesia)=Buru (Indonesia) +controlledvocabulary.language.buru_(nigeria)=Buru (Nigeria) +controlledvocabulary.language.burui=Burui +controlledvocabulary.language.burumakok=Burumakok +controlledvocabulary.language.burun=Burun +controlledvocabulary.language.burundian_sign_language=Burundian Sign Language +controlledvocabulary.language.burunge=Burunge +controlledvocabulary.language.burushaski=Burushaski +controlledvocabulary.language.burusu=Burusu +controlledvocabulary.language.buruwai=Buruwai +controlledvocabulary.language.busa=Busa +controlledvocabulary.language.busam=Busam +controlledvocabulary.language.busami=Busami +controlledvocabulary.language.busang_kayan=Busang Kayan +controlledvocabulary.language.bushi=Bushi +controlledvocabulary.language.bushoong=Bushoong +controlledvocabulary.language.buso=Buso +controlledvocabulary.language.busoa=Busoa +controlledvocabulary.language.bussa=Bussa +controlledvocabulary.language.busuu=Busuu +controlledvocabulary.language.butbut_kalinga=Butbut Kalinga +controlledvocabulary.language.butmas-tur=Butmas-Tur +controlledvocabulary.language.butuanon=Butuanon +controlledvocabulary.language.buwal=Buwal +controlledvocabulary.language.buyu=Buyu +controlledvocabulary.language.buyuan_jinuo=Buyuan Jinuo +controlledvocabulary.language.bwa=Bwa +controlledvocabulary.language.bwaidoka=Bwaidoka +controlledvocabulary.language.bwanabwana=Bwanabwana +controlledvocabulary.language.bwatoo=Bwatoo +controlledvocabulary.language.bwe_karen=Bwe Karen +controlledvocabulary.language.bwela=Bwela +controlledvocabulary.language.bwile=Bwile +controlledvocabulary.language.bwisi=Bwisi +controlledvocabulary.language.byangsi=Byangsi +controlledvocabulary.language.byep=Byep +controlledvocabulary.language.b�di_kanum=B�di Kanum +controlledvocabulary.language.c'lela=C'Lela +controlledvocabulary.language.caac=Caac +controlledvocabulary.language.cabiyar�=Cabiyar� +controlledvocabulary.language.cab�car=Cab�car +controlledvocabulary.language.cacaloxtepec_mixtec=Cacaloxtepec Mixtec +controlledvocabulary.language.cacaopera=Cacaopera +controlledvocabulary.language.cacgia_roglai=Cacgia Roglai +controlledvocabulary.language.cacua=Cacua +controlledvocabulary.language.caddo=Caddo +controlledvocabulary.language.cafundo_creole=Cafundo Creole +controlledvocabulary.language.cahuarano=Cahuarano +controlledvocabulary.language.cahuilla=Cahuilla +controlledvocabulary.language.cajamarca_quechua=Cajamarca Quechua +controlledvocabulary.language.cajatambo_north_lima_quechua=Cajatambo North Lima Quechua +controlledvocabulary.language.cajonos_zapotec=Cajonos Zapotec +controlledvocabulary.language.cajun_french=Cajun French +controlledvocabulary.language.caka=Caka +controlledvocabulary.language.cakchiquel-quich�_mixed_language=Cakchiquel-Quich� Mixed Language +controlledvocabulary.language.cakfem-mushere=Cakfem-Mushere +controlledvocabulary.language.calamian_tagbanwa=Calamian Tagbanwa +controlledvocabulary.language.calder�n_highland_quichua=Calder�n Highland Quichua +controlledvocabulary.language.callawalla=Callawalla +controlledvocabulary.language.caluyanun=Caluyanun +controlledvocabulary.language.cal�=Cal� +controlledvocabulary.language.cambodian_sign_language=Cambodian Sign Language +controlledvocabulary.language.cameroon_mambila=Cameroon Mambila +controlledvocabulary.language.cameroon_pidgin=Cameroon Pidgin +controlledvocabulary.language.camling=Camling +controlledvocabulary.language.campalagian=Campalagian +controlledvocabulary.language.campidanese_sardinian=Campidanese Sardinian +controlledvocabulary.language.cams�=Cams� +controlledvocabulary.language.camtho=Camtho +controlledvocabulary.language.camunic=Camunic +controlledvocabulary.language.candoshi-shapra=Candoshi-Shapra +controlledvocabulary.language.canela=Canela +controlledvocabulary.language.canichana=Canichana +controlledvocabulary.language.cao_lan=Cao Lan +controlledvocabulary.language.cao_miao=Cao Miao +controlledvocabulary.language.capanahua=Capanahua +controlledvocabulary.language.capiznon=Capiznon +controlledvocabulary.language.cappadocian_greek=Cappadocian Greek +controlledvocabulary.language.caquinte=Caquinte +controlledvocabulary.language.car_nicobarese=Car Nicobarese +controlledvocabulary.language.cara=Cara +controlledvocabulary.language.carabayo=Carabayo +controlledvocabulary.language.caramanta=Caramanta +controlledvocabulary.language.carapana=Carapana +controlledvocabulary.language.carian=Carian +controlledvocabulary.language.caribbean_hindustani=Caribbean Hindustani +controlledvocabulary.language.caribbean_javanese=Caribbean Javanese +controlledvocabulary.language.carijona=Carijona +controlledvocabulary.language.carolina_algonquian=Carolina Algonquian +controlledvocabulary.language.carolinian=Carolinian +controlledvocabulary.language.carpathian_romani=Carpathian Romani +controlledvocabulary.language.carrier=Carrier +controlledvocabulary.language.cashibo-cacataibo=Cashibo-Cacataibo +controlledvocabulary.language.cashinahua=Cashinahua +controlledvocabulary.language.casiguran_dumagat_agta=Casiguran Dumagat Agta +controlledvocabulary.language.casuarina_coast_asmat=Casuarina Coast Asmat +controlledvocabulary.language.catalan_sign_language=Catalan Sign Language +controlledvocabulary.language.catalan,_valencian=Catalan, Valencian +controlledvocabulary.language.catawba=Catawba +controlledvocabulary.language.cavine�a=Cavine�a +controlledvocabulary.language.cayubaba=Cayubaba +controlledvocabulary.language.cayuga=Cayuga +controlledvocabulary.language.cayuse=Cayuse +controlledvocabulary.language.ca�ar_highland_quichua=Ca�ar Highland Quichua +controlledvocabulary.language.cahungwarya=Ca?hungwa?rya? +controlledvocabulary.language.cebaara_senoufo=Cebaara Senoufo +controlledvocabulary.language.cebuano=Cebuano +controlledvocabulary.language.celtiberian=Celtiberian +controlledvocabulary.language.cemuh�=Cemuh� +controlledvocabulary.language.cen=Cen +controlledvocabulary.language.central_asmat=Central Asmat +controlledvocabulary.language.central_atlas_tamazight=Central Atlas Tamazight +controlledvocabulary.language.central_awyu=Central Awyu +controlledvocabulary.language.central_aymara=Central Aymara +controlledvocabulary.language.central_bai=Central Bai +controlledvocabulary.language.central_berawan=Central Berawan +controlledvocabulary.language.central_bikol=Central Bikol +controlledvocabulary.language.central_bontok=Central Bontok +controlledvocabulary.language.central_cagayan_agta=Central Cagayan Agta +controlledvocabulary.language.central_grebo=Central Grebo +controlledvocabulary.language.central_hongshuihe_zhuang=Central Hongshuihe Zhuang +controlledvocabulary.language.central_huasteca_nahuatl=Central Huasteca Nahuatl +controlledvocabulary.language.central_huishui_hmong=Central Huishui Hmong +controlledvocabulary.language.central_kanuri=Central Kanuri +controlledvocabulary.language.central_kurdish=Central Kurdish +controlledvocabulary.language.central_maewo=Central Maewo +controlledvocabulary.language.central_malay=Central Malay +controlledvocabulary.language.central_masela=Central Masela +controlledvocabulary.language.central_mashan_hmong=Central Mashan Hmong +controlledvocabulary.language.central_mazahua=Central Mazahua +controlledvocabulary.language.central_melanau=Central Melanau +controlledvocabulary.language.central_mnong=Central Mnong +controlledvocabulary.language.central_nahuatl=Central Nahuatl +controlledvocabulary.language.central_nicobarese=Central Nicobarese +controlledvocabulary.language.central_ojibwa=Central Ojibwa +controlledvocabulary.language.central_okinawan=Central Okinawan +controlledvocabulary.language.central_palawano=Central Palawano +controlledvocabulary.language.central_pame=Central Pame +controlledvocabulary.language.central_pashto=Central Pashto +controlledvocabulary.language.central_pomo=Central Pomo +controlledvocabulary.language.central_puebla_nahuatl=Central Puebla Nahuatl +controlledvocabulary.language.central_sama=Central Sama +controlledvocabulary.language.central_siberian_yupik=Central Siberian Yupik +controlledvocabulary.language.central_sierra_miwok=Central Sierra Miwok +controlledvocabulary.language.central_subanen=Central Subanen +controlledvocabulary.language.central_tagbanwa=Central Tagbanwa +controlledvocabulary.language.central_tarahumara=Central Tarahumara +controlledvocabulary.language.central_tunebo=Central Tunebo +controlledvocabulary.language.central_yupik=Central Yupik +controlledvocabulary.language.central-eastern_niger_fulfulde=Central-Eastern Niger Fulfulde +controlledvocabulary.language.cent��m=Cent��m +controlledvocabulary.language.cerma=Cerma +controlledvocabulary.language.cha'ari=Cha'ari +controlledvocabulary.language.chabu=Chabu +controlledvocabulary.language.chachapoyas_quechua=Chachapoyas Quechua +controlledvocabulary.language.chachi=Chachi +controlledvocabulary.language.chadian_arabic=Chadian Arabic +controlledvocabulary.language.chadian_sign_language=Chadian Sign Language +controlledvocabulary.language.chadong=Chadong +controlledvocabulary.language.chagatai=Chagatai +controlledvocabulary.language.chaima=Chaima +controlledvocabulary.language.chak=Chak +controlledvocabulary.language.chakali=Chakali +controlledvocabulary.language.chakavian=Chakavian +controlledvocabulary.language.chakma=Chakma +controlledvocabulary.language.chala=Chala +controlledvocabulary.language.chaldean_neo-aramaic=Chaldean Neo-Aramaic +controlledvocabulary.language.chalikha=Chalikha +controlledvocabulary.language.chamacoco=Chamacoco +controlledvocabulary.language.chamalal=Chamalal +controlledvocabulary.language.chambeali=Chambeali +controlledvocabulary.language.chambri=Chambri +controlledvocabulary.language.chamicuro=Chamicuro +controlledvocabulary.language.chamorro=Chamorro +controlledvocabulary.language.chang_naga=Chang Naga +controlledvocabulary.language.changriwa=Changriwa +controlledvocabulary.language.changthang=Changthang +controlledvocabulary.language.chantyal=Chantyal +controlledvocabulary.language.chan�=Chan� +controlledvocabulary.language.chara=Chara +controlledvocabulary.language.chaudangsi=Chaudangsi +controlledvocabulary.language.chaura=Chaura +controlledvocabulary.language.chavacano=Chavacano +controlledvocabulary.language.chayahuita=Chayahuita +controlledvocabulary.language.chayuco_mixtec=Chayuco Mixtec +controlledvocabulary.language.chazumba_mixtec=Chazumba Mixtec +controlledvocabulary.language.che=Che +controlledvocabulary.language.chechen=Chechen +controlledvocabulary.language.cheke_holo=Cheke Holo +controlledvocabulary.language.chemakum=Chemakum +controlledvocabulary.language.chenapian=Chenapian +controlledvocabulary.language.chenchu=Chenchu +controlledvocabulary.language.chenoua=Chenoua +controlledvocabulary.language.chepang=Chepang +controlledvocabulary.language.chepya=Chepya +controlledvocabulary.language.cherepon=Cherepon +controlledvocabulary.language.cherokee=Cherokee +controlledvocabulary.language.chesu=Chesu +controlledvocabulary.language.chetco=Chetco +controlledvocabulary.language.chewong=Chewong +controlledvocabulary.language.cheyenne=Cheyenne +controlledvocabulary.language.chhattisgarhi=Chhattisgarhi +controlledvocabulary.language.chhintange=Chhintange +controlledvocabulary.language.chhulung=Chhulung +controlledvocabulary.language.chiangmai_sign_language=Chiangmai Sign Language +controlledvocabulary.language.chiapanec=Chiapanec +controlledvocabulary.language.chibcha=Chibcha +controlledvocabulary.language.chicahuaxtla_triqui=Chicahuaxtla Triqui +controlledvocabulary.language.chichewa,_chewa,_nyanja=Chichewa, Chewa, Nyanja +controlledvocabulary.language.chichicapan_zapotec=Chichicapan Zapotec +controlledvocabulary.language.chichimeca-jonaz=Chichimeca-Jonaz +controlledvocabulary.language.chickasaw=Chickasaw +controlledvocabulary.language.chicomuceltec=Chicomuceltec +controlledvocabulary.language.chiga=Chiga +controlledvocabulary.language.chigmecatitl�n_mixtec=Chigmecatitl�n Mixtec +controlledvocabulary.language.chilcotin=Chilcotin +controlledvocabulary.language.chilean_sign_language=Chilean Sign Language +controlledvocabulary.language.chilisso=Chilisso +controlledvocabulary.language.chiltepec_chinantec=Chiltepec Chinantec +controlledvocabulary.language.chimalapa_zoque=Chimalapa Zoque +controlledvocabulary.language.chimariko=Chimariko +controlledvocabulary.language.chimborazo_highland_quichua=Chimborazo Highland Quichua +controlledvocabulary.language.chimila=Chimila +controlledvocabulary.language.china_buriat=China Buriat +controlledvocabulary.language.chinali=Chinali +controlledvocabulary.language.chinbon_chin=Chinbon Chin +controlledvocabulary.language.chincha_quechua=Chincha Quechua +controlledvocabulary.language.chinese=Chinese +controlledvocabulary.language.chinese_pidgin_english=Chinese Pidgin English +controlledvocabulary.language.chinese_sign_language=Chinese Sign Language +controlledvocabulary.language.chinook=Chinook +controlledvocabulary.language.chinook_jargon=Chinook jargon +controlledvocabulary.language.chipaya=Chipaya +controlledvocabulary.language.chipewyan=Chipewyan +controlledvocabulary.language.chippewa=Chippewa +controlledvocabulary.language.chiquihuitl�n_mazatec=Chiquihuitl�n Mazatec +controlledvocabulary.language.chiquitano=Chiquitano +controlledvocabulary.language.chiqui�n_ancash_quechua=Chiqui�n Ancash Quechua +controlledvocabulary.language.chirip�=Chirip� +controlledvocabulary.language.chiru=Chiru +controlledvocabulary.language.chitimacha=Chitimacha +controlledvocabulary.language.chitkuli_kinnauri=Chitkuli Kinnauri +controlledvocabulary.language.chittagonian=Chittagonian +controlledvocabulary.language.chitwania_tharu=Chitwania Tharu +controlledvocabulary.language.choapan_zapotec=Choapan Zapotec +controlledvocabulary.language.chocangacakha=Chocangacakha +controlledvocabulary.language.chochotec=Chochotec +controlledvocabulary.language.choctaw=Choctaw +controlledvocabulary.language.chodri=Chodri +controlledvocabulary.language.chokri_naga=Chokri Naga +controlledvocabulary.language.chokwe=Chokwe +controlledvocabulary.language.chol=Chol +controlledvocabulary.language.chol�n=Chol�n +controlledvocabulary.language.chong=Chong +controlledvocabulary.language.choni=Choni +controlledvocabulary.language.chonyi-dzihana-kauma=Chonyi-Dzihana-Kauma +controlledvocabulary.language.chopi=Chopi +controlledvocabulary.language.chorasmian=Chorasmian +controlledvocabulary.language.chort�=Chort� +controlledvocabulary.language.chothe_naga=Chothe Naga +controlledvocabulary.language.chrau=Chrau +controlledvocabulary.language.chru=Chru +controlledvocabulary.language.chuanqiandian_cluster_miao=Chuanqiandian Cluster Miao +controlledvocabulary.language.chuave=Chuave +controlledvocabulary.language.chug=Chug +controlledvocabulary.language.chuj=Chuj +controlledvocabulary.language.chuka=Chuka +controlledvocabulary.language.chukot=Chukot +controlledvocabulary.language.chukwa=Chukwa +controlledvocabulary.language.chulym=Chulym +controlledvocabulary.language.chumburung=Chumburung +controlledvocabulary.language.chung=Chung +controlledvocabulary.language.churahi=Churahi +controlledvocabulary.language.chut=Chut +controlledvocabulary.language.chuukese=Chuukese +controlledvocabulary.language.chuvantsy=Chuvantsy +controlledvocabulary.language.chuvash=Chuvash +controlledvocabulary.language.chuwabu=Chuwabu +controlledvocabulary.language.ch�cobo=Ch�cobo +controlledvocabulary.language.ci_gbe=Ci Gbe +controlledvocabulary.language.cia-cia=Cia-Cia +controlledvocabulary.language.cibak=Cibak +controlledvocabulary.language.cicipu=Cicipu +controlledvocabulary.language.cimbrian=Cimbrian +controlledvocabulary.language.cinda-regi-tiyal=Cinda-Regi-Tiyal +controlledvocabulary.language.cineni=Cineni +controlledvocabulary.language.cinta_larga=Cinta Larga +controlledvocabulary.language.cisalpine_gaulish=Cisalpine Gaulish +controlledvocabulary.language.cishingini=Cishingini +controlledvocabulary.language.citak=Citak +controlledvocabulary.language.ciwogai=Ciwogai +controlledvocabulary.language.clallam=Clallam +controlledvocabulary.language.classical_armenian=Classical Armenian +controlledvocabulary.language.classical_mandaic=Classical Mandaic +controlledvocabulary.language.classical_mongolian=Classical Mongolian +controlledvocabulary.language.classical_nahuatl=Classical Nahuatl +controlledvocabulary.language.classical_newari=Classical Newari +controlledvocabulary.language.classical_quechua=Classical Quechua +controlledvocabulary.language.classical_sanskrit=Classical Sanskrit +controlledvocabulary.language.classical_syriac=Classical Syriac +controlledvocabulary.language.classical_tibetan=Classical Tibetan +controlledvocabulary.language.coahuilteco=Coahuilteco +controlledvocabulary.language.coast_miwok=Coast Miwok +controlledvocabulary.language.coastal_konjo=Coastal Konjo +controlledvocabulary.language.coatecas_altas_zapotec=Coatecas Altas Zapotec +controlledvocabulary.language.coatepec_nahuatl=Coatepec Nahuatl +controlledvocabulary.language.coatl�n_mixe=Coatl�n Mixe +controlledvocabulary.language.coatl�n_zapotec=Coatl�n Zapotec +controlledvocabulary.language.coatzospan_mixtec=Coatzospan Mixtec +controlledvocabulary.language.cocama-cocamilla=Cocama-Cocamilla +controlledvocabulary.language.cochimi=Cochimi +controlledvocabulary.language.cocopa=Cocopa +controlledvocabulary.language.cocos_islands_malay=Cocos Islands Malay +controlledvocabulary.language.coeur_d'alene=Coeur d'Alene +controlledvocabulary.language.cof�n=Cof�n +controlledvocabulary.language.cogui=Cogui +controlledvocabulary.language.col=Col +controlledvocabulary.language.colombian_sign_language=Colombian Sign Language +controlledvocabulary.language.colonia_tovar_german=Colonia Tovar German +controlledvocabulary.language.colorado=Colorado +controlledvocabulary.language.columbia-wenatchi=Columbia-Wenatchi +controlledvocabulary.language.comaltepec_chinantec=Comaltepec Chinantec +controlledvocabulary.language.comanche=Comanche +controlledvocabulary.language.comecrudo=Comecrudo +controlledvocabulary.language.como_karim=Como Karim +controlledvocabulary.language.comox=Comox +controlledvocabulary.language.con=Con +controlledvocabulary.language.congo_swahili=Congo Swahili +controlledvocabulary.language.coos=Coos +controlledvocabulary.language.copainal�_zoque=Copainal� Zoque +controlledvocabulary.language.copala_triqui=Copala Triqui +controlledvocabulary.language.coptic=Coptic +controlledvocabulary.language.coquille=Coquille +controlledvocabulary.language.cori=Cori +controlledvocabulary.language.cornish=Cornish +controlledvocabulary.language.corongo_ancash_quechua=Corongo Ancash Quechua +controlledvocabulary.language.corsican=Corsican +controlledvocabulary.language.costa_rican_sign_language=Costa Rican Sign Language +controlledvocabulary.language.cotabato_manobo=Cotabato Manobo +controlledvocabulary.language.cotoname=Cotoname +controlledvocabulary.language.cowlitz=Cowlitz +controlledvocabulary.language.coyotepec_popoloca=Coyotepec Popoloca +controlledvocabulary.language.coyutla_totonac=Coyutla Totonac +controlledvocabulary.language.cree=Cree +controlledvocabulary.language.creek=Creek +controlledvocabulary.language.crimean_tatar=Crimean Tatar +controlledvocabulary.language.croatia_sign_language=Croatia Sign Language +controlledvocabulary.language.croatian=Croatian +controlledvocabulary.language.cross_river_mbembe=Cross River Mbembe +controlledvocabulary.language.crow=Crow +controlledvocabulary.language.cruze�o=Cruze�o +controlledvocabulary.language.cua=Cua +controlledvocabulary.language.cuba_sign_language=Cuba Sign Language +controlledvocabulary.language.cubeo=Cubeo +controlledvocabulary.language.cuiba=Cuiba +controlledvocabulary.language.cuitlatec=Cuitlatec +controlledvocabulary.language.culina=Culina +controlledvocabulary.language.cumanagoto=Cumanagoto +controlledvocabulary.language.cumbric=Cumbric +controlledvocabulary.language.cun=Cun +controlledvocabulary.language.cuneiform_luwian=Cuneiform Luwian +controlledvocabulary.language.cupe�o=Cupe�o +controlledvocabulary.language.curonian=Curonian +controlledvocabulary.language.curripaco=Curripaco +controlledvocabulary.language.cusco_quechua=Cusco Quechua +controlledvocabulary.language.cutchi-swahili=Cutchi-Swahili +controlledvocabulary.language.cuvok=Cuvok +controlledvocabulary.language.cuyamecalco_mixtec=Cuyamecalco Mixtec +controlledvocabulary.language.cuyonon=Cuyonon +controlledvocabulary.language.cwi_bwamu=Cwi Bwamu +controlledvocabulary.language.cypriot_arabic=Cypriot Arabic +controlledvocabulary.language.czech=Czech +controlledvocabulary.language.czech_sign_language=Czech Sign Language +controlledvocabulary.language.c��ng=C��ng +controlledvocabulary.language.da'a_kaili=Da'a Kaili +controlledvocabulary.language.daai_chin=Daai Chin +controlledvocabulary.language.daakaka=Daakaka +controlledvocabulary.language.daantanai'=Daantanai' +controlledvocabulary.language.daasanach=Daasanach +controlledvocabulary.language.daatsiin=Daats?i?in +controlledvocabulary.language.daba=Daba +controlledvocabulary.language.dabarre=Dabarre +controlledvocabulary.language.dabe=Dabe +controlledvocabulary.language.dacian=Dacian +controlledvocabulary.language.dadi_dadi=Dadi Dadi +controlledvocabulary.language.dadibi=Dadibi +controlledvocabulary.language.dadiya=Dadiya +controlledvocabulary.language.daga=Daga +controlledvocabulary.language.dagaari_dioula=Dagaari Dioula +controlledvocabulary.language.dagba=Dagba +controlledvocabulary.language.dagbani=Dagbani +controlledvocabulary.language.dagik=Dagik +controlledvocabulary.language.dagoman=Dagoman +controlledvocabulary.language.dahalik=Dahalik +controlledvocabulary.language.dahalo=Dahalo +controlledvocabulary.language.daho-doo=Daho-Doo +controlledvocabulary.language.dai=Dai +controlledvocabulary.language.dai_zhuang=Dai Zhuang +controlledvocabulary.language.dair=Dair +controlledvocabulary.language.dakka=Dakka +controlledvocabulary.language.dakota=Dakota +controlledvocabulary.language.dakpakha=Dakpakha +controlledvocabulary.language.dalabon=Dalabon +controlledvocabulary.language.dalmatian=Dalmatian +controlledvocabulary.language.daloa_b�t�=Daloa B�t� +controlledvocabulary.language.dama=Dama +controlledvocabulary.language.damakawa=Damakawa +controlledvocabulary.language.damal=Damal +controlledvocabulary.language.dambi=Dambi +controlledvocabulary.language.dameli=Dameli +controlledvocabulary.language.dampelas=Dampelas +controlledvocabulary.language.dan=Dan +controlledvocabulary.language.danaru=Danaru +controlledvocabulary.language.danau=Danau +controlledvocabulary.language.dandami_maria=Dandami Maria +controlledvocabulary.language.dangal�at=Dangal�at +controlledvocabulary.language.dangaura_tharu=Dangaura Tharu +controlledvocabulary.language.danish=Danish +controlledvocabulary.language.danish_sign_language=Danish Sign Language +controlledvocabulary.language.dano=Dano +controlledvocabulary.language.danu=Danu +controlledvocabulary.language.dao=Dao +controlledvocabulary.language.daonda=Daonda +controlledvocabulary.language.dar_daju_daju=Dar Daju Daju +controlledvocabulary.language.dar_fur_daju=Dar Fur Daju +controlledvocabulary.language.dar_sila_daju=Dar Sila Daju +controlledvocabulary.language.darai=Darai +controlledvocabulary.language.dargwa=Dargwa +controlledvocabulary.language.dari=Dari +controlledvocabulary.language.darkinyung=Darkinyung +controlledvocabulary.language.darlong=Darlong +controlledvocabulary.language.darmiya=Darmiya +controlledvocabulary.language.daro-matu_melanau=Daro-Matu Melanau +controlledvocabulary.language.dass=Dass +controlledvocabulary.language.datooga=Datooga +controlledvocabulary.language.daungwurrung=Daungwurrung +controlledvocabulary.language.daur=Daur +controlledvocabulary.language.davawenyo=Davawenyo +controlledvocabulary.language.dawawa=Dawawa +controlledvocabulary.language.dawera-daweloor=Dawera-Daweloor +controlledvocabulary.language.dawik_kui=Dawik Kui +controlledvocabulary.language.dawro=Dawro +controlledvocabulary.language.day=Day +controlledvocabulary.language.dayi=Dayi +controlledvocabulary.language.daza=Daza +controlledvocabulary.language.dazaga=Dazaga +controlledvocabulary.language.deccan=Deccan +controlledvocabulary.language.dedua=Dedua +controlledvocabulary.language.defaka=Defaka +controlledvocabulary.language.defi_gbe=Defi Gbe +controlledvocabulary.language.deg=Deg +controlledvocabulary.language.degema=Degema +controlledvocabulary.language.degenan=Degenan +controlledvocabulary.language.degexit'an=Degexit'an +controlledvocabulary.language.dehu=Dehu +controlledvocabulary.language.dehwari=Dehwari +controlledvocabulary.language.dek=Dek +controlledvocabulary.language.dela-oenale=Dela-Oenale +controlledvocabulary.language.delaware=Delaware +controlledvocabulary.language.delo=Delo +controlledvocabulary.language.dem=Dem +controlledvocabulary.language.dema=Dema +controlledvocabulary.language.demisa=Demisa +controlledvocabulary.language.demta=Demta +controlledvocabulary.language.dendi_(benin)=Dendi (Benin) +controlledvocabulary.language.dendi_(central_african_republic)=Dendi (Central African Republic) +controlledvocabulary.language.dengese=Dengese +controlledvocabulary.language.dengka=Dengka +controlledvocabulary.language.deno=Deno +controlledvocabulary.language.denya=Denya +controlledvocabulary.language.den�=Den� +controlledvocabulary.language.deori=Deori +controlledvocabulary.language.dera_(indonesia)=Dera (Indonesia) +controlledvocabulary.language.dera_(nigeria)=Dera (Nigeria) +controlledvocabulary.language.desano=Desano +controlledvocabulary.language.desiya=Desiya +controlledvocabulary.language.dewas_rai=Dewas Rai +controlledvocabulary.language.dewoin=Dewoin +controlledvocabulary.language.dezfuli=Dezfuli +controlledvocabulary.language.dghwede=Dghwede +controlledvocabulary.language.dhaiso=Dhaiso +controlledvocabulary.language.dhalandji=Dhalandji +controlledvocabulary.language.dhangu-djangu=Dhangu-Djangu +controlledvocabulary.language.dhanki=Dhanki +controlledvocabulary.language.dhanwar_(nepal)=Dhanwar (Nepal) +controlledvocabulary.language.dhao=Dhao +controlledvocabulary.language.dharawal=Dharawal +controlledvocabulary.language.dhargari=Dhargari +controlledvocabulary.language.dharuk=Dharuk +controlledvocabulary.language.dharumbal=Dharumbal +controlledvocabulary.language.dhatki=Dhatki +controlledvocabulary.language.dhimal=Dhimal +controlledvocabulary.language.dhodia=Dhodia +controlledvocabulary.language.dhofari_arabic=Dhofari Arabic +controlledvocabulary.language.dhudhuroa=Dhudhuroa +controlledvocabulary.language.dhundari=Dhundari +controlledvocabulary.language.dhungaloo=Dhungaloo +controlledvocabulary.language.dhurga=Dhurga +controlledvocabulary.language.dhuwal=Dhuwal +controlledvocabulary.language.dhuwaya=Dhuwaya +controlledvocabulary.language.dia=Dia +controlledvocabulary.language.dibabawon_manobo=Dibabawon Manobo +controlledvocabulary.language.dibiyaso=Dibiyaso +controlledvocabulary.language.dibo=Dibo +controlledvocabulary.language.dibole=Dibole +controlledvocabulary.language.dicamay_agta=Dicamay Agta +controlledvocabulary.language.didinga=Didinga +controlledvocabulary.language.dido=Dido +controlledvocabulary.language.dieri=Dieri +controlledvocabulary.language.digaro-mishmi=Digaro-Mishmi +controlledvocabulary.language.digo=Digo +controlledvocabulary.language.dii=Dii +controlledvocabulary.language.dijim-bwilim=Dijim-Bwilim +controlledvocabulary.language.dilling=Dilling +controlledvocabulary.language.dima=Dima +controlledvocabulary.language.dimasa=Dimasa +controlledvocabulary.language.dimbong=Dimbong +controlledvocabulary.language.dime=Dime +controlledvocabulary.language.dimli_(individual_language)=Dimli (individual language) +controlledvocabulary.language.ding=Ding +controlledvocabulary.language.dinka=Dinka +controlledvocabulary.language.dir-nyamzak-mbarimi=Dir-Nyamzak-Mbarimi +controlledvocabulary.language.dirasha=Dirasha +controlledvocabulary.language.diri=Diri +controlledvocabulary.language.diriku=Diriku +controlledvocabulary.language.dirim=Dirim +controlledvocabulary.language.disa=Disa +controlledvocabulary.language.ditammari=Ditammari +controlledvocabulary.language.ditidaht=Ditidaht +controlledvocabulary.language.diuwe=Diuwe +controlledvocabulary.language.diuxi-tilantongo_mixtec=Diuxi-Tilantongo Mixtec +controlledvocabulary.language.dixon_reef=Dixon Reef +controlledvocabulary.language.dizin=Dizin +controlledvocabulary.language.djabugay=Djabugay +controlledvocabulary.language.djabwurrung=Djabwurrung +controlledvocabulary.language.djadjawurrung=Djadjawurrung +controlledvocabulary.language.djambarrpuyngu=Djambarrpuyngu +controlledvocabulary.language.djamindjung=Djamindjung +controlledvocabulary.language.djangun=Djangun +controlledvocabulary.language.djawi=Djawi +controlledvocabulary.language.djeebbana=Djeebbana +controlledvocabulary.language.djimini_senoufo=Djimini Senoufo +controlledvocabulary.language.djinang=Djinang +controlledvocabulary.language.djinba=Djinba +controlledvocabulary.language.djiwarli=Djiwarli +controlledvocabulary.language.dobel=Dobel +controlledvocabulary.language.dobu=Dobu +controlledvocabulary.language.doe=Doe +controlledvocabulary.language.doga=Doga +controlledvocabulary.language.doghoro=Doghoro +controlledvocabulary.language.dogoso=Dogoso +controlledvocabulary.language.dogos�=Dogos� +controlledvocabulary.language.dogri_(individual_language)=Dogri (individual language) +controlledvocabulary.language.dogri_(macrolanguage)=Dogri (macrolanguage) +controlledvocabulary.language.dogul_dom_dogon=Dogul Dom Dogon +controlledvocabulary.language.doka=Doka +controlledvocabulary.language.doko-uyanga=Doko-Uyanga +controlledvocabulary.language.dokshi=Dokshi +controlledvocabulary.language.dolgan=Dolgan +controlledvocabulary.language.dolpo=Dolpo +controlledvocabulary.language.dom=Dom +controlledvocabulary.language.domaaki=Domaaki +controlledvocabulary.language.domari=Domari +controlledvocabulary.language.dombe=Dombe +controlledvocabulary.language.dominican_sign_language=Dominican Sign Language +controlledvocabulary.language.dompo=Dompo +controlledvocabulary.language.domu=Domu +controlledvocabulary.language.domung=Domung +controlledvocabulary.language.dondo=Dondo +controlledvocabulary.language.dong=Dong +controlledvocabulary.language.dongo=Dongo +controlledvocabulary.language.dongotono=Dongotono +controlledvocabulary.language.dongshanba_lalo=Dongshanba Lalo +controlledvocabulary.language.dongxiang=Dongxiang +controlledvocabulary.language.donno_so_dogon=Donno So Dogon +controlledvocabulary.language.doondo=Doondo +controlledvocabulary.language.dori'o=Dori'o +controlledvocabulary.language.doromu-koki=Doromu-Koki +controlledvocabulary.language.dorze=Dorze +controlledvocabulary.language.doso=Doso +controlledvocabulary.language.dotyali=Dotyali +controlledvocabulary.language.doutai=Doutai +controlledvocabulary.language.doyayo=Doyayo +controlledvocabulary.language.drents=Drents +controlledvocabulary.language.drung=Drung +controlledvocabulary.language.duala=Duala +controlledvocabulary.language.duano=Duano +controlledvocabulary.language.duau=Duau +controlledvocabulary.language.dubli=Dubli +controlledvocabulary.language.dubu=Dubu +controlledvocabulary.language.dugun=Dugun +controlledvocabulary.language.duguri=Duguri +controlledvocabulary.language.dugwor=Dugwor +controlledvocabulary.language.duhwa=Duhwa +controlledvocabulary.language.duke=Duke +controlledvocabulary.language.dulbu=Dulbu +controlledvocabulary.language.duli-gey=Duli-Gey +controlledvocabulary.language.duma=Duma +controlledvocabulary.language.dumbea=Dumbea +controlledvocabulary.language.dumi=Dumi +controlledvocabulary.language.dumpas=Dumpas +controlledvocabulary.language.dumun=Dumun +controlledvocabulary.language.duna=Duna +controlledvocabulary.language.dungan=Dungan +controlledvocabulary.language.dungmali=Dungmali +controlledvocabulary.language.dungra_bhil=Dungra Bhil +controlledvocabulary.language.dungu=Dungu +controlledvocabulary.language.dupaninan_agta=Dupaninan Agta +controlledvocabulary.language.dura=Dura +controlledvocabulary.language.duri=Duri +controlledvocabulary.language.duriankere=Duriankere +controlledvocabulary.language.durop=Durop +controlledvocabulary.language.duruma=Duruma +controlledvocabulary.language.duruwa=Duruwa +controlledvocabulary.language.dusner=Dusner +controlledvocabulary.language.dusun_deyah=Dusun Deyah +controlledvocabulary.language.dusun_malang=Dusun Malang +controlledvocabulary.language.dusun_witu=Dusun Witu +controlledvocabulary.language.dutch=Dutch +controlledvocabulary.language.dutch_sign_language=Dutch Sign Language +controlledvocabulary.language.dutton_world_speedwords=Dutton World Speedwords +controlledvocabulary.language.duungooma=Duungooma +controlledvocabulary.language.duupa=Duupa +controlledvocabulary.language.duvle=Duvle +controlledvocabulary.language.duwai=Duwai +controlledvocabulary.language.duwet=Duwet +controlledvocabulary.language.duya=Du?ya +controlledvocabulary.language.dwang=Dwang +controlledvocabulary.language.dyaberdyaber=Dyaberdyaber +controlledvocabulary.language.dyan=Dyan +controlledvocabulary.language.dyangadi=Dyangadi +controlledvocabulary.language.dyarim=Dyarim +controlledvocabulary.language.dyirbal=Dyirbal +controlledvocabulary.language.dyugun=Dyugun +controlledvocabulary.language.dyula=Dyula +controlledvocabulary.language.dza=Dza +controlledvocabulary.language.dzalakha=Dzalakha +controlledvocabulary.language.dzando=Dzando +controlledvocabulary.language.dzao_min=Dzao Min +controlledvocabulary.language.dzongkha=Dzongkha +controlledvocabulary.language.dz��ngoo=Dz��ngoo +controlledvocabulary.language.d�w=D�w +controlledvocabulary.language.e=E +controlledvocabulary.language.e'ma_buyang=E'ma Buyang +controlledvocabulary.language.e'�apa_woromaipu=E'�apa Woromaipu +controlledvocabulary.language.early_tripuri=Early Tripuri +controlledvocabulary.language.east_ambae=East Ambae +controlledvocabulary.language.east_berawan=East Berawan +controlledvocabulary.language.east_damar=East Damar +controlledvocabulary.language.east_futuna=East Futuna +controlledvocabulary.language.east_kewa=East Kewa +controlledvocabulary.language.east_limba=East Limba +controlledvocabulary.language.east_makian=East Makian +controlledvocabulary.language.east_masela=East Masela +controlledvocabulary.language.east_nyala=East Nyala +controlledvocabulary.language.east_tarangan=East Tarangan +controlledvocabulary.language.east_yugur=East Yugur +controlledvocabulary.language.eastern_abnaki=Eastern Abnaki +controlledvocabulary.language.eastern_acipa=Eastern Acipa +controlledvocabulary.language.eastern_apur�mac_quechua=Eastern Apur�mac Quechua +controlledvocabulary.language.eastern_arrernte=Eastern Arrernte +controlledvocabulary.language.eastern_balochi=Eastern Balochi +controlledvocabulary.language.eastern_bolivian_guaran�=Eastern Bolivian Guaran� +controlledvocabulary.language.eastern_bontok=Eastern Bontok +controlledvocabulary.language.eastern_bru=Eastern Bru +controlledvocabulary.language.eastern_canadian_inuktitut=Eastern Canadian Inuktitut +controlledvocabulary.language.eastern_cham=Eastern Cham +controlledvocabulary.language.eastern_durango_nahuatl=Eastern Durango Nahuatl +controlledvocabulary.language.eastern_egyptian_bedawi_arabic=Eastern Egyptian Bedawi Arabic +controlledvocabulary.language.eastern_frisian=Eastern Frisian +controlledvocabulary.language.eastern_gorkha_tamang=Eastern Gorkha Tamang +controlledvocabulary.language.eastern_highland_chatino=Eastern Highland Chatino +controlledvocabulary.language.eastern_highland_otomi=Eastern Highland Otomi +controlledvocabulary.language.eastern_hongshuihe_zhuang=Eastern Hongshuihe Zhuang +controlledvocabulary.language.eastern_huasteca_nahuatl=Eastern Huasteca Nahuatl +controlledvocabulary.language.eastern_huishui_hmong=Eastern Huishui Hmong +controlledvocabulary.language.eastern_karaboro=Eastern Karaboro +controlledvocabulary.language.eastern_katu=Eastern Katu +controlledvocabulary.language.eastern_kayah=Eastern Kayah +controlledvocabulary.language.eastern_keres=Eastern Keres +controlledvocabulary.language.eastern_khumi_chin=Eastern Khumi Chin +controlledvocabulary.language.eastern_krahn=Eastern Krahn +controlledvocabulary.language.eastern_lalu=Eastern Lalu +controlledvocabulary.language.eastern_lawa=Eastern Lawa +controlledvocabulary.language.eastern_magar=Eastern Magar +controlledvocabulary.language.eastern_maninkakan=Eastern Maninkakan +controlledvocabulary.language.eastern_mari=Eastern Mari +controlledvocabulary.language.eastern_maroon_creole=Eastern Maroon Creole +controlledvocabulary.language.eastern_meohang=Eastern Meohang +controlledvocabulary.language.eastern_minyag=Eastern Minyag +controlledvocabulary.language.eastern_mnong=Eastern Mnong +controlledvocabulary.language.eastern_muria=Eastern Muria +controlledvocabulary.language.eastern_ngad'a=Eastern Ngad'a +controlledvocabulary.language.eastern_nisu=Eastern Nisu +controlledvocabulary.language.eastern_ojibwa=Eastern Ojibwa +controlledvocabulary.language.eastern_oromo=Eastern Oromo +controlledvocabulary.language.eastern_parbate_kham=Eastern Parbate Kham +controlledvocabulary.language.eastern_penan=Eastern Penan +controlledvocabulary.language.eastern_pomo=Eastern Pomo +controlledvocabulary.language.eastern_qiandong_miao=Eastern Qiandong Miao +controlledvocabulary.language.eastern_subanen=Eastern Subanen +controlledvocabulary.language.eastern_tamang=Eastern Tamang +controlledvocabulary.language.eastern_tawbuid=Eastern Tawbuid +controlledvocabulary.language.eastern_xiangxi_miao=Eastern Xiangxi Miao +controlledvocabulary.language.eastern_xwla_gbe=Eastern Xwla Gbe +controlledvocabulary.language.eastern_yiddish=Eastern Yiddish +controlledvocabulary.language.ebira=Ebira +controlledvocabulary.language.eblan=Eblan +controlledvocabulary.language.ebri�=Ebri� +controlledvocabulary.language.ebughu=Ebughu +controlledvocabulary.language.ecuadorian_sign_language=Ecuadorian Sign Language +controlledvocabulary.language.ede_cabe=Ede Cabe +controlledvocabulary.language.ede_ica=Ede Ica +controlledvocabulary.language.ede_idaca=Ede Idaca +controlledvocabulary.language.ede_ije=Ede Ije +controlledvocabulary.language.edera_awyu=Edera Awyu +controlledvocabulary.language.edolo=Edolo +controlledvocabulary.language.edomite=Edomite +controlledvocabulary.language.edopi=Edopi +controlledvocabulary.language.efai=Efai +controlledvocabulary.language.efe=Efe +controlledvocabulary.language.efik=Efik +controlledvocabulary.language.efutop=Efutop +controlledvocabulary.language.ega=Ega +controlledvocabulary.language.eggon=Eggon +controlledvocabulary.language.egypt_sign_language=Egypt Sign Language +controlledvocabulary.language.egyptian_(ancient)=Egyptian (Ancient) +controlledvocabulary.language.egyptian_arabic=Egyptian Arabic +controlledvocabulary.language.ehueun=Ehueun +controlledvocabulary.language.eipomek=Eipomek +controlledvocabulary.language.eitiep=Eitiep +controlledvocabulary.language.ejagham=Ejagham +controlledvocabulary.language.ejamat=Ejamat +controlledvocabulary.language.ekai_chin=Ekai Chin +controlledvocabulary.language.ekajuk=Ekajuk +controlledvocabulary.language.ekari=Ekari +controlledvocabulary.language.eki=Eki +controlledvocabulary.language.ekit=Ekit +controlledvocabulary.language.ekpeye=Ekpeye +controlledvocabulary.language.el_alto_zapotec=El Alto Zapotec +controlledvocabulary.language.el_hugeirat=El Hugeirat +controlledvocabulary.language.el_molo=El Molo +controlledvocabulary.language.el_nayar_cora=El Nayar Cora +controlledvocabulary.language.elamite=Elamite +controlledvocabulary.language.eleme=Eleme +controlledvocabulary.language.elepi=Elepi +controlledvocabulary.language.elfdalian=Elfdalian +controlledvocabulary.language.elip=Elip +controlledvocabulary.language.elkei=Elkei +controlledvocabulary.language.elotepec_zapotec=Elotepec Zapotec +controlledvocabulary.language.eloyi=Eloyi +controlledvocabulary.language.elseng=Elseng +controlledvocabulary.language.elu=Elu +controlledvocabulary.language.elymian=Elymian +controlledvocabulary.language.emae=Emae +controlledvocabulary.language.emai-iuleha-ora=Emai-Iuleha-Ora +controlledvocabulary.language.eman=Eman +controlledvocabulary.language.embaloh=Embaloh +controlledvocabulary.language.ember�-baud�=Ember�-Baud� +controlledvocabulary.language.ember�-cat�o=Ember�-Cat�o +controlledvocabulary.language.ember�-cham�=Ember�-Cham� +controlledvocabulary.language.ember�-tad�=Ember�-Tad� +controlledvocabulary.language.embu=Embu +controlledvocabulary.language.emerillon=Emerillon +controlledvocabulary.language.emilian=Emilian +controlledvocabulary.language.emplawas=Emplawas +controlledvocabulary.language.emumu=Emumu +controlledvocabulary.language.en=En +controlledvocabulary.language.enawen�-naw�=Enawen�-Naw� +controlledvocabulary.language.ende=Ende +controlledvocabulary.language.enga=Enga +controlledvocabulary.language.engdewu=Engdewu +controlledvocabulary.language.engenni=Engenni +controlledvocabulary.language.enggano=Enggano +controlledvocabulary.language.english=English +controlledvocabulary.language.enlhet=Enlhet +controlledvocabulary.language.enrekang=Enrekang +controlledvocabulary.language.enu=Enu +controlledvocabulary.language.enwan_(akwa_ibom_state)=Enwan (Akwa Ibom State) +controlledvocabulary.language.enwan_(edo_state)=Enwan (Edo State) +controlledvocabulary.language.enxet=Enxet +controlledvocabulary.language.enya=Enya +controlledvocabulary.language.epena=Epena +controlledvocabulary.language.epi-olmec=Epi-Olmec +controlledvocabulary.language.epie=Epie +controlledvocabulary.language.epigraphic_mayan=Epigraphic Mayan +controlledvocabulary.language.eravallan=Eravallan +controlledvocabulary.language.erave=Erave +controlledvocabulary.language.ere=Ere +controlledvocabulary.language.eritai=Eritai +controlledvocabulary.language.erokwanas=Erokwanas +controlledvocabulary.language.erre=Erre +controlledvocabulary.language.erromintxela=Erromintxela +controlledvocabulary.language.ersu=Ersu +controlledvocabulary.language.eruwa=Eruwa +controlledvocabulary.language.erzya=Erzya +controlledvocabulary.language.esan=Esan +controlledvocabulary.language.ese=Ese +controlledvocabulary.language.ese_ejja=Ese Ejja +controlledvocabulary.language.eshtehardi=Eshtehardi +controlledvocabulary.language.esimbi=Esimbi +controlledvocabulary.language.eskayan=Eskayan +controlledvocabulary.language.esperanto=Esperanto +controlledvocabulary.language.esselen=Esselen +controlledvocabulary.language.estado_de_m�xico_otomi=Estado de M�xico Otomi +controlledvocabulary.language.estonian=Estonian +controlledvocabulary.language.estonian_sign_language=Estonian Sign Language +controlledvocabulary.language.esuma=Esuma +controlledvocabulary.language.etchemin=Etchemin +controlledvocabulary.language.etebi=Etebi +controlledvocabulary.language.eten=Eten +controlledvocabulary.language.eteocretan=Eteocretan +controlledvocabulary.language.eteocypriot=Eteocypriot +controlledvocabulary.language.ethiopian_sign_language=Ethiopian Sign Language +controlledvocabulary.language.etkywan=Etkywan +controlledvocabulary.language.eton_(cameroon)=Eton (Cameroon) +controlledvocabulary.language.eton_(vanuatu)=Eton (Vanuatu) +controlledvocabulary.language.etruscan=Etruscan +controlledvocabulary.language.etulo=Etulo +controlledvocabulary.language.eudeve=Eudeve +controlledvocabulary.language.evant=Evant +controlledvocabulary.language.even=Even +controlledvocabulary.language.evenki=Evenki +controlledvocabulary.language.eviya=Eviya +controlledvocabulary.language.ewage-notu=Ewage-Notu +controlledvocabulary.language.ewe=Ewe +controlledvocabulary.language.ewondo=Ewondo +controlledvocabulary.language.extremaduran=Extremaduran +controlledvocabulary.language.eyak=Eyak +controlledvocabulary.language.ezaa=Ezaa +controlledvocabulary.language.fa_d'ambu=Fa d'Ambu +controlledvocabulary.language.fagani=Fagani +controlledvocabulary.language.faifi=Faifi +controlledvocabulary.language.faire_atta=Faire Atta +controlledvocabulary.language.faita=Faita +controlledvocabulary.language.faiwol=Faiwol +controlledvocabulary.language.fala=Fala +controlledvocabulary.language.falam_chin=Falam Chin +controlledvocabulary.language.fali=Fali +controlledvocabulary.language.faliscan=Faliscan +controlledvocabulary.language.fam=Fam +controlledvocabulary.language.fanagalo=Fanagalo +controlledvocabulary.language.fanamaket=Fanamaket +controlledvocabulary.language.fanbak=Fanbak +controlledvocabulary.language.fang_(cameroon)=Fang (Cameroon) +controlledvocabulary.language.fang_(equatorial_guinea)=Fang (Equatorial Guinea) +controlledvocabulary.language.fania=Fania +controlledvocabulary.language.fanti=Fanti +controlledvocabulary.language.far_western_muria=Far Western Muria +controlledvocabulary.language.farefare=Farefare +controlledvocabulary.language.faroese=Faroese +controlledvocabulary.language.fas=Fas +controlledvocabulary.language.fasu=Fasu +controlledvocabulary.language.fataleka=Fataleka +controlledvocabulary.language.fataluku=Fataluku +controlledvocabulary.language.fayu=Fayu +controlledvocabulary.language.fe'fe'=Fe'fe' +controlledvocabulary.language.fembe=Fembe +controlledvocabulary.language.fernando_po_creole_english=Fernando Po Creole English +controlledvocabulary.language.feroge=Feroge +controlledvocabulary.language.fiji_hindi=Fiji Hindi +controlledvocabulary.language.fijian=Fijian +controlledvocabulary.language.filipino=Filipino +controlledvocabulary.language.filomena_mata-coahuitl�n_totonac=Filomena Mata-Coahuitl�n Totonac +controlledvocabulary.language.finland-swedish_sign_language=Finland-Swedish Sign Language +controlledvocabulary.language.finnish=Finnish +controlledvocabulary.language.finnish_sign_language=Finnish Sign Language +controlledvocabulary.language.finongan=Finongan +controlledvocabulary.language.fipa=Fipa +controlledvocabulary.language.firan=Firan +controlledvocabulary.language.fiwaga=Fiwaga +controlledvocabulary.language.flaaitaal=Flaaitaal +controlledvocabulary.language.flinders_island=Flinders Island +controlledvocabulary.language.foau=Foau +controlledvocabulary.language.foi=Foi +controlledvocabulary.language.foia_foia=Foia Foia +controlledvocabulary.language.folopa=Folopa +controlledvocabulary.language.foma=Foma +controlledvocabulary.language.fon=Fon +controlledvocabulary.language.fongoro=Fongoro +controlledvocabulary.language.foodo=Foodo +controlledvocabulary.language.forak=Forak +controlledvocabulary.language.fordata=Fordata +controlledvocabulary.language.fore=Fore +controlledvocabulary.language.forest_enets=Forest Enets +controlledvocabulary.language.fortsenal=Fortsenal +controlledvocabulary.language.francisco_le�n_zoque=Francisco Le�n Zoque +controlledvocabulary.language.frankish=Frankish +controlledvocabulary.language.french=French +controlledvocabulary.language.french_sign_language=French Sign Language +controlledvocabulary.language.friulian=Friulian +controlledvocabulary.language.fula,_fulah=Fula, Fulah +controlledvocabulary.language.fuliiru=Fuliiru +controlledvocabulary.language.fulni�=Fulni� +controlledvocabulary.language.fum=Fum +controlledvocabulary.language.fungwa=Fungwa +controlledvocabulary.language.fur=Fur +controlledvocabulary.language.furu=Furu +controlledvocabulary.language.futuna-aniwa=Futuna-Aniwa +controlledvocabulary.language.fuyug=Fuyug +controlledvocabulary.language.fwe=Fwe +controlledvocabulary.language.fw�i=Fw�i +controlledvocabulary.language.fyam=Fyam +controlledvocabulary.language.fyer=Fyer +controlledvocabulary.language.ga=Ga +controlledvocabulary.language.ga'anda=Ga'anda +controlledvocabulary.language.ga'dang=Ga'dang +controlledvocabulary.language.gaa=Gaa +controlledvocabulary.language.gaam=Gaam +controlledvocabulary.language.gabi-gabi=Gabi-Gabi +controlledvocabulary.language.gabri=Gabri +controlledvocabulary.language.gabrielino-fernande�o=Gabrielino-Fernande�o +controlledvocabulary.language.gadang=Gadang +controlledvocabulary.language.gaddang=Gaddang +controlledvocabulary.language.gaddi=Gaddi +controlledvocabulary.language.gade=Gade +controlledvocabulary.language.gade_lohar=Gade Lohar +controlledvocabulary.language.gadjerawang=Gadjerawang +controlledvocabulary.language.gadsup=Gadsup +controlledvocabulary.language.gaelic,_scottish_gaelic=Gaelic, Scottish Gaelic +controlledvocabulary.language.gafat=Gafat +controlledvocabulary.language.gagadu=Gagadu +controlledvocabulary.language.gagauz=Gagauz +controlledvocabulary.language.gagnoa_b�t�=Gagnoa B�t� +controlledvocabulary.language.gagu=Gagu +controlledvocabulary.language.gahri=Gahri +controlledvocabulary.language.gaikundi=Gaikundi +controlledvocabulary.language.gail=Gail +controlledvocabulary.language.gaina=Gaina +controlledvocabulary.language.gal=Gal +controlledvocabulary.language.galambu=Galambu +controlledvocabulary.language.galatian=Galatian +controlledvocabulary.language.galela=Galela +controlledvocabulary.language.galeya=Galeya +controlledvocabulary.language.galibi_carib=Galibi Carib +controlledvocabulary.language.galice=Galice +controlledvocabulary.language.galician=Galician +controlledvocabulary.language.galindan=Galindan +controlledvocabulary.language.gallurese_sardinian=Gallurese Sardinian +controlledvocabulary.language.galo=Galo +controlledvocabulary.language.galolen=Galolen +controlledvocabulary.language.gamale_kham=Gamale Kham +controlledvocabulary.language.gambera=Gambera +controlledvocabulary.language.gambian_wolof=Gambian Wolof +controlledvocabulary.language.gamilaraay=Gamilaraay +controlledvocabulary.language.gamit=Gamit +controlledvocabulary.language.gamkonora=Gamkonora +controlledvocabulary.language.gamo=Gamo +controlledvocabulary.language.gamo-ningi=Gamo-Ningi +controlledvocabulary.language.gan_chinese=Gan Chinese +controlledvocabulary.language.gana=Gana +controlledvocabulary.language.ganang=Ganang +controlledvocabulary.language.ganda=Ganda +controlledvocabulary.language.gane=Gane +controlledvocabulary.language.ganggalida=Ganggalida +controlledvocabulary.language.ganglau=Ganglau +controlledvocabulary.language.gangte=Gangte +controlledvocabulary.language.gangulu=Gangulu +controlledvocabulary.language.gants=Gants +controlledvocabulary.language.ganza=Ganza +controlledvocabulary.language.ganzi=Ganzi +controlledvocabulary.language.gao=Gao +controlledvocabulary.language.gapapaiwa=Gapapaiwa +controlledvocabulary.language.garhwali=Garhwali +controlledvocabulary.language.garifuna=Garifuna +controlledvocabulary.language.garig-ilgar=Garig-Ilgar +controlledvocabulary.language.garingbal=Garingbal +controlledvocabulary.language.garlali=Garlali +controlledvocabulary.language.garo=Garo +controlledvocabulary.language.garre=Garre +controlledvocabulary.language.garrwa=Garrwa +controlledvocabulary.language.garus=Garus +controlledvocabulary.language.garza=Garza +controlledvocabulary.language.gata'=Gata' +controlledvocabulary.language.gavak=Gavak +controlledvocabulary.language.gavar=Gavar +controlledvocabulary.language.gavi�o_do_jiparan�=Gavi�o Do Jiparan� +controlledvocabulary.language.gawar-bati=Gawar-Bati +controlledvocabulary.language.gawri=Gawri +controlledvocabulary.language.gawwada=Gawwada +controlledvocabulary.language.gayil=Gayil +controlledvocabulary.language.gayo=Gayo +controlledvocabulary.language.gazi=Gazi +controlledvocabulary.language.gaogbo=Ga?ogbo +controlledvocabulary.language.gbagyi=Gbagyi +controlledvocabulary.language.gbanu=Gbanu +controlledvocabulary.language.gbanziri=Gbanziri +controlledvocabulary.language.gbari=Gbari +controlledvocabulary.language.gbaya_(central_african_republic)=Gbaya (Central African Republic) +controlledvocabulary.language.gbaya_(sudan)=Gbaya (Sudan) +controlledvocabulary.language.gbaya-bossangoa=Gbaya-Bossangoa +controlledvocabulary.language.gbaya-bozoum=Gbaya-Bozoum +controlledvocabulary.language.gbaya-mbodomo=Gbaya-Mbodomo +controlledvocabulary.language.gbayi=Gbayi +controlledvocabulary.language.gbesi_gbe=Gbesi Gbe +controlledvocabulary.language.gbii=Gbii +controlledvocabulary.language.gbin=Gbin +controlledvocabulary.language.gbiri-niragu=Gbiri-Niragu +controlledvocabulary.language.gboloo_grebo=Gboloo Grebo +controlledvocabulary.language.ge=Ge +controlledvocabulary.language.geba_karen=Geba Karen +controlledvocabulary.language.gebe=Gebe +controlledvocabulary.language.gedaged=Gedaged +controlledvocabulary.language.gedeo=Gedeo +controlledvocabulary.language.geez=Geez +controlledvocabulary.language.geji=Geji +controlledvocabulary.language.geko_karen=Geko Karen +controlledvocabulary.language.gela=Gela +controlledvocabulary.language.geme=Geme +controlledvocabulary.language.gen=Gen +controlledvocabulary.language.gende=Gende +controlledvocabulary.language.gengle=Gengle +controlledvocabulary.language.georgian=Georgian +controlledvocabulary.language.gepo=Gepo +controlledvocabulary.language.gera=Gera +controlledvocabulary.language.gerai=Gerai +controlledvocabulary.language.german=German +controlledvocabulary.language.german_sign_language=German Sign Language +controlledvocabulary.language.geruma=Geruma +controlledvocabulary.language.geser-gorom=Geser-Gorom +controlledvocabulary.language.ghadam�s=Ghadam�s +controlledvocabulary.language.ghanaian_pidgin_english=Ghanaian Pidgin English +controlledvocabulary.language.ghanaian_sign_language=Ghanaian Sign Language +controlledvocabulary.language.ghandruk_sign_language=Ghandruk Sign Language +controlledvocabulary.language.ghanongga=Ghanongga +controlledvocabulary.language.ghari=Ghari +controlledvocabulary.language.ghayavi=Ghayavi +controlledvocabulary.language.gheg_albanian=Gheg Albanian +controlledvocabulary.language.ghera=Ghera +controlledvocabulary.language.ghodoberi=Ghodoberi +controlledvocabulary.language.ghomara=Ghomara +controlledvocabulary.language.ghom�l�'=Ghom�l�' +controlledvocabulary.language.ghotuo=Ghotuo +controlledvocabulary.language.ghulfan=Ghulfan +controlledvocabulary.language.giangan=Giangan +controlledvocabulary.language.gibanawa=Gibanawa +controlledvocabulary.language.gidar=Gidar +controlledvocabulary.language.giiwo=Giiwo +controlledvocabulary.language.gikyode=Gikyode +controlledvocabulary.language.gilaki=Gilaki +controlledvocabulary.language.gilbertese=Gilbertese +controlledvocabulary.language.gilima=Gilima +controlledvocabulary.language.gilyak=Gilyak +controlledvocabulary.language.gimi_(eastern_highlands)=Gimi (Eastern Highlands) +controlledvocabulary.language.gimi_(west_new_britain)=Gimi (West New Britain) +controlledvocabulary.language.gimme=Gimme +controlledvocabulary.language.gimnime=Gimnime +controlledvocabulary.language.ginuman=Ginuman +controlledvocabulary.language.ginyanga=Ginyanga +controlledvocabulary.language.girawa=Girawa +controlledvocabulary.language.girirra=Girirra +controlledvocabulary.language.giryama=Giryama +controlledvocabulary.language.githabul=Githabul +controlledvocabulary.language.gitonga=Gitonga +controlledvocabulary.language.gitua=Gitua +controlledvocabulary.language.gitxsan=Gitxsan +controlledvocabulary.language.giyug=Giyug +controlledvocabulary.language.gizrra=Gizrra +controlledvocabulary.language.glaro-twabo=Glaro-Twabo +controlledvocabulary.language.glavda=Glavda +controlledvocabulary.language.glio-oubi=Glio-Oubi +controlledvocabulary.language.gnau=Gnau +controlledvocabulary.language.goan_konkani=Goan Konkani +controlledvocabulary.language.goaria=Goaria +controlledvocabulary.language.gobasi=Gobasi +controlledvocabulary.language.gobu=Gobu +controlledvocabulary.language.godi�=Godi� +controlledvocabulary.language.godwari=Godwari +controlledvocabulary.language.goemai=Goemai +controlledvocabulary.language.gofa=Gofa +controlledvocabulary.language.gogo=Gogo +controlledvocabulary.language.gogodala=Gogodala +controlledvocabulary.language.gokana=Gokana +controlledvocabulary.language.gola=Gola +controlledvocabulary.language.golin=Golin +controlledvocabulary.language.golpa=Golpa +controlledvocabulary.language.gondi=Gondi +controlledvocabulary.language.gone_dau=Gone Dau +controlledvocabulary.language.gongduk=Gongduk +controlledvocabulary.language.gonja=Gonja +controlledvocabulary.language.goo=Goo +controlledvocabulary.language.gooniyandi=Gooniyandi +controlledvocabulary.language.gor=Gor +controlledvocabulary.language.gorakor=Gorakor +controlledvocabulary.language.gorap=Gorap +controlledvocabulary.language.goreng=Goreng +controlledvocabulary.language.gorontalo=Gorontalo +controlledvocabulary.language.gorovu=Gorovu +controlledvocabulary.language.gorowa=Gorowa +controlledvocabulary.language.gothic=Gothic +controlledvocabulary.language.goundo=Goundo +controlledvocabulary.language.gourmanch�ma=Gourmanch�ma +controlledvocabulary.language.gowlan=Gowlan +controlledvocabulary.language.gowli=Gowli +controlledvocabulary.language.gowro=Gowro +controlledvocabulary.language.gozarkhani=Gozarkhani +controlledvocabulary.language.grangali=Grangali +controlledvocabulary.language.grass_koiari=Grass Koiari +controlledvocabulary.language.grebo=Grebo +controlledvocabulary.language.greek_(modern)=Greek (modern) +controlledvocabulary.language.greek_sign_language=Greek Sign Language +controlledvocabulary.language.green_gelao=Green Gelao +controlledvocabulary.language.greenlandic,_kalaallisut=Greenlandic, Kalaallisut +controlledvocabulary.language.grenadian_creole_english=Grenadian Creole English +controlledvocabulary.language.gresi=Gresi +controlledvocabulary.language.groma=Groma +controlledvocabulary.language.gronings=Gronings +controlledvocabulary.language.gros_ventre=Gros Ventre +controlledvocabulary.language.gua=Gua +controlledvocabulary.language.guadeloupean_creole_french=Guadeloupean Creole French +controlledvocabulary.language.guahibo=Guahibo +controlledvocabulary.language.guajaj�ra=Guajaj�ra +controlledvocabulary.language.guaj�=Guaj� +controlledvocabulary.language.guambiano=Guambiano +controlledvocabulary.language.guana_(brazil)=Guana (Brazil) +controlledvocabulary.language.guana_(paraguay)=Guana (Paraguay) +controlledvocabulary.language.guanano=Guanano +controlledvocabulary.language.guanche=Guanche +controlledvocabulary.language.guanyinqiao=Guanyinqiao +controlledvocabulary.language.guaran�=Guaran� +controlledvocabulary.language.guarayu=Guarayu +controlledvocabulary.language.guarequena=Guarequena +controlledvocabulary.language.guatemalan_sign_language=Guatemalan Sign Language +controlledvocabulary.language.guat�=Guat� +controlledvocabulary.language.guayabero=Guayabero +controlledvocabulary.language.gudang=Gudang +controlledvocabulary.language.gudanji=Gudanji +controlledvocabulary.language.gude=Gude +controlledvocabulary.language.gudu=Gudu +controlledvocabulary.language.guduf-gava=Guduf-Gava +controlledvocabulary.language.guerrero_amuzgo=Guerrero Amuzgo +controlledvocabulary.language.guerrero_nahuatl=Guerrero Nahuatl +controlledvocabulary.language.guevea_de_humboldt_zapotec=Guevea De Humboldt Zapotec +controlledvocabulary.language.gugadj=Gugadj +controlledvocabulary.language.gugu_badhun=Gugu Badhun +controlledvocabulary.language.gugu_warra=Gugu Warra +controlledvocabulary.language.gugubera=Gugubera +controlledvocabulary.language.guhu-samane=Guhu-Samane +controlledvocabulary.language.guianese_creole_french=Guianese Creole French +controlledvocabulary.language.guibei_zhuang=Guibei Zhuang +controlledvocabulary.language.guiberoua_b�te=Guiberoua B�te +controlledvocabulary.language.guibian_zhuang=Guibian Zhuang +controlledvocabulary.language.guinea_kpelle=Guinea Kpelle +controlledvocabulary.language.guinea-bissau_sign_language=Guinea-Bissau Sign Language +controlledvocabulary.language.guinean_sign_language=Guinean Sign Language +controlledvocabulary.language.guiqiong=Guiqiong +controlledvocabulary.language.gujarati=Gujarati +controlledvocabulary.language.gujari=Gujari +controlledvocabulary.language.gula_(central_african_republic)=Gula (Central African Republic) +controlledvocabulary.language.gula_(chad)=Gula (Chad) +controlledvocabulary.language.gula_iro=Gula Iro +controlledvocabulary.language.gula'alaa=Gula'alaa +controlledvocabulary.language.gulay=Gulay +controlledvocabulary.language.gule=Gule +controlledvocabulary.language.gulf_arabic=Gulf Arabic +controlledvocabulary.language.gumalu=Gumalu +controlledvocabulary.language.gumatj=Gumatj +controlledvocabulary.language.gumawana=Gumawana +controlledvocabulary.language.gumuz=Gumuz +controlledvocabulary.language.gun=Gun +controlledvocabulary.language.gundi=Gundi +controlledvocabulary.language.gunditjmara=Gunditjmara +controlledvocabulary.language.gundungurra=Gundungurra +controlledvocabulary.language.gungabula=Gungabula +controlledvocabulary.language.gungu=Gungu +controlledvocabulary.language.guntai=Guntai +controlledvocabulary.language.gunwinggu=Gunwinggu +controlledvocabulary.language.gunya=Gunya +controlledvocabulary.language.gupa-abawa=Gupa-Abawa +controlledvocabulary.language.gupapuyngu=Gupapuyngu +controlledvocabulary.language.guramalum=Guramalum +controlledvocabulary.language.gurani=Gurani +controlledvocabulary.language.gurdjar=Gurdjar +controlledvocabulary.language.gureng_gureng=Gureng Gureng +controlledvocabulary.language.gurgula=Gurgula +controlledvocabulary.language.guriaso=Guriaso +controlledvocabulary.language.gurindji=Gurindji +controlledvocabulary.language.gurindji_kriol=Gurindji Kriol +controlledvocabulary.language.gurmana=Gurmana +controlledvocabulary.language.guro=Guro +controlledvocabulary.language.gurr-goni=Gurr-goni +controlledvocabulary.language.gurung=Gurung +controlledvocabulary.language.guruntum-mbaaru=Guruntum-Mbaaru +controlledvocabulary.language.gusii=Gusii +controlledvocabulary.language.gusilay=Gusilay +controlledvocabulary.language.guugu_yimidhirr=Guugu Yimidhirr +controlledvocabulary.language.guwa=Guwa +controlledvocabulary.language.guwamu=Guwamu +controlledvocabulary.language.guya=Guya +controlledvocabulary.language.guyanese_creole_english=Guyanese Creole English +controlledvocabulary.language.guyani=Guyani +controlledvocabulary.language.gvoko=Gvoko +controlledvocabulary.language.gwa=Gwa +controlledvocabulary.language.gwahatike=Gwahatike +controlledvocabulary.language.gwak=Gwak +controlledvocabulary.language.gwamhi-wuri=Gwamhi-Wuri +controlledvocabulary.language.gwandara=Gwandara +controlledvocabulary.language.gweda=Gweda +controlledvocabulary.language.gweno=Gweno +controlledvocabulary.language.gwere=Gwere +controlledvocabulary.language.gwichin=Gwich?in +controlledvocabulary.language.gyalsumdo=Gyalsumdo +controlledvocabulary.language.gyele=Gyele +controlledvocabulary.language.gyem=Gyem +controlledvocabulary.language.g�il�_zapotec=G�il� Zapotec +controlledvocabulary.language.gndhr=G?ndh?r? +controlledvocabulary.language.ha=Ha +controlledvocabulary.language.habu=Habu +controlledvocabulary.language.hadiyya=Hadiyya +controlledvocabulary.language.hadothi=Hadothi +controlledvocabulary.language.hadrami=Hadrami +controlledvocabulary.language.hadrami_arabic=Hadrami Arabic +controlledvocabulary.language.hadza=Hadza +controlledvocabulary.language.haeke=Haeke +controlledvocabulary.language.hahon=Hahon +controlledvocabulary.language.haida=Haida +controlledvocabulary.language.haigwai=Haigwai +controlledvocabulary.language.haiphong_sign_language=Haiphong Sign Language +controlledvocabulary.language.haisla=Haisla +controlledvocabulary.language.haitian_creole,_haitian=Haitian Creole, Haitian +controlledvocabulary.language.haitian_vodoun_culture_language=Haitian Vodoun Culture Language +controlledvocabulary.language.haiom=Hai?om +controlledvocabulary.language.haji=Haji +controlledvocabulary.language.hajong=Hajong +controlledvocabulary.language.hakha_chin=Hakha Chin +controlledvocabulary.language.hakka_chinese=Hakka Chinese +controlledvocabulary.language.hak�=Hak� +controlledvocabulary.language.halang=Halang +controlledvocabulary.language.halang_doan=Halang Doan +controlledvocabulary.language.halbi=Halbi +controlledvocabulary.language.halh_mongolian=Halh Mongolian +controlledvocabulary.language.halia=Halia +controlledvocabulary.language.halkomelem=Halkomelem +controlledvocabulary.language.hamap=Hamap +controlledvocabulary.language.hamba=Hamba +controlledvocabulary.language.hamer-banna=Hamer-Banna +controlledvocabulary.language.hamtai=Hamtai +controlledvocabulary.language.han=Han +controlledvocabulary.language.hanga=Hanga +controlledvocabulary.language.hanga_hundi=Hanga Hundi +controlledvocabulary.language.hangaza=Hangaza +controlledvocabulary.language.hani=Hani +controlledvocabulary.language.hano=Hano +controlledvocabulary.language.hanoi_sign_language=Hanoi Sign Language +controlledvocabulary.language.hanunoo=Hanunoo +controlledvocabulary.language.harami=Harami +controlledvocabulary.language.harari=Harari +controlledvocabulary.language.harijan_kinnauri=Harijan Kinnauri +controlledvocabulary.language.haroi=Haroi +controlledvocabulary.language.harsusi=Harsusi +controlledvocabulary.language.haruai=Haruai +controlledvocabulary.language.haruku=Haruku +controlledvocabulary.language.haryanvi=Haryanvi +controlledvocabulary.language.harzani=Harzani +controlledvocabulary.language.hasha=Hasha +controlledvocabulary.language.hassaniyya=Hassaniyya +controlledvocabulary.language.hatam=Hatam +controlledvocabulary.language.hattic=Hattic +controlledvocabulary.language.hausa=Hausa +controlledvocabulary.language.hausa_sign_language=Hausa Sign Language +controlledvocabulary.language.havasupai-walapai-yavapai=Havasupai-Walapai-Yavapai +controlledvocabulary.language.haveke=Haveke +controlledvocabulary.language.havu=Havu +controlledvocabulary.language.hawai'i_creole_english=Hawai'i Creole English +controlledvocabulary.language.hawai'i_sign_language_(hsl)=Hawai'i Sign Language (HSL) +controlledvocabulary.language.hawaiian=Hawaiian +controlledvocabulary.language.haya=Haya +controlledvocabulary.language.hazaragi=Hazaragi +controlledvocabulary.language.hdi=Hdi +controlledvocabulary.language.hebrew_(modern)=Hebrew (modern) +controlledvocabulary.language.hehe=Hehe +controlledvocabulary.language.heiban=Heiban +controlledvocabulary.language.heiltsuk=Heiltsuk +controlledvocabulary.language.helong=Helong +controlledvocabulary.language.hema=Hema +controlledvocabulary.language.hemba=Hemba +controlledvocabulary.language.herd�=Herd� +controlledvocabulary.language.herero=Herero +controlledvocabulary.language.hermit=Hermit +controlledvocabulary.language.hernican=Hernican +controlledvocabulary.language.hewa=Hewa +controlledvocabulary.language.heyo=Heyo +controlledvocabulary.language.hiberno-scottish_gaelic=Hiberno-Scottish Gaelic +controlledvocabulary.language.hibito=Hibito +controlledvocabulary.language.hidatsa=Hidatsa +controlledvocabulary.language.hieroglyphic_luwian=Hieroglyphic Luwian +controlledvocabulary.language.higaonon=Higaonon +controlledvocabulary.language.highland_konjo=Highland Konjo +controlledvocabulary.language.highland_oaxaca_chontal=Highland Oaxaca Chontal +controlledvocabulary.language.highland_popoluca=Highland Popoluca +controlledvocabulary.language.highland_puebla_nahuatl=Highland Puebla Nahuatl +controlledvocabulary.language.highland_totonac=Highland Totonac +controlledvocabulary.language.hijazi_arabic=Hijazi Arabic +controlledvocabulary.language.hijuk=Hijuk +controlledvocabulary.language.hiligaynon=Hiligaynon +controlledvocabulary.language.himarim�=Himarim� +controlledvocabulary.language.hindi=Hindi +controlledvocabulary.language.hinduri=Hinduri +controlledvocabulary.language.hinukh=Hinukh +controlledvocabulary.language.hiri_motu=Hiri Motu +controlledvocabulary.language.hittite=Hittite +controlledvocabulary.language.hitu=Hitu +controlledvocabulary.language.hiw=Hiw +controlledvocabulary.language.hixkary�na=Hixkary�na +controlledvocabulary.language.hlai=Hlai +controlledvocabulary.language.hlepho_phowa=Hlepho Phowa +controlledvocabulary.language.hlersu=Hlersu +controlledvocabulary.language.hmar=Hmar +controlledvocabulary.language.hmong=Hmong +controlledvocabulary.language.hmong_daw=Hmong Daw +controlledvocabulary.language.hmong_don=Hmong Don +controlledvocabulary.language.hmong_d�=Hmong D� +controlledvocabulary.language.hmong_njua=Hmong Njua +controlledvocabulary.language.hmong_shua=Hmong Shua +controlledvocabulary.language.hmwaveke=Hmwaveke +controlledvocabulary.language.ho=Ho +controlledvocabulary.language.ho_chi_minh_city_sign_language=Ho Chi Minh City Sign Language +controlledvocabulary.language.ho-chunk=Ho-Chunk +controlledvocabulary.language.hoava=Hoava +controlledvocabulary.language.hoby�t=Hoby�t +controlledvocabulary.language.hoia_hoia=Hoia Hoia +controlledvocabulary.language.holikachuk=Holikachuk +controlledvocabulary.language.holiya=Holiya +controlledvocabulary.language.holma=Holma +controlledvocabulary.language.holoholo=Holoholo +controlledvocabulary.language.holu=Holu +controlledvocabulary.language.homa=Homa +controlledvocabulary.language.honduras_sign_language=Honduras Sign Language +controlledvocabulary.language.hong_kong_sign_language=Hong Kong Sign Language +controlledvocabulary.language.honi=Honi +controlledvocabulary.language.hopi=Hopi +controlledvocabulary.language.horned_miao=Horned Miao +controlledvocabulary.language.horo=Horo +controlledvocabulary.language.horom=Horom +controlledvocabulary.language.horpa=Horpa +controlledvocabulary.language.hote=Hote +controlledvocabulary.language.hoti=Hoti +controlledvocabulary.language.hovongan=Hovongan +controlledvocabulary.language.hoyahoya=Hoyahoya +controlledvocabulary.language.hozo=Hozo +controlledvocabulary.language.hpon=Hpon +controlledvocabulary.language.hrangkhol=Hrangkhol +controlledvocabulary.language.hre=Hre +controlledvocabulary.language.hruso=Hruso +controlledvocabulary.language.hu=Hu +controlledvocabulary.language.huachipaeri=Huachipaeri +controlledvocabulary.language.huallaga_hu�nuco_quechua=Huallaga Hu�nuco Quechua +controlledvocabulary.language.huamal�es-dos_de_mayo_hu�nuco_quechua=Huamal�es-Dos de Mayo Hu�nuco Quechua +controlledvocabulary.language.huambisa=Huambisa +controlledvocabulary.language.huarijio=Huarijio +controlledvocabulary.language.huastec=Huastec +controlledvocabulary.language.huaulu=Huaulu +controlledvocabulary.language.huautla_mazatec=Huautla Mazatec +controlledvocabulary.language.huaxcaleca_nahuatl=Huaxcaleca Nahuatl +controlledvocabulary.language.huaylas_ancash_quechua=Huaylas Ancash Quechua +controlledvocabulary.language.huaylla_wanca_quechua=Huaylla Wanca Quechua +controlledvocabulary.language.huba=Huba +controlledvocabulary.language.huehuetla_tepehua=Huehuetla Tepehua +controlledvocabulary.language.huichol=Huichol +controlledvocabulary.language.huilliche=Huilliche +controlledvocabulary.language.huitepec_mixtec=Huitepec Mixtec +controlledvocabulary.language.huizhou_chinese=Huizhou Chinese +controlledvocabulary.language.hukumina=Hukumina +controlledvocabulary.language.hula=Hula +controlledvocabulary.language.hulaul�=Hulaul� +controlledvocabulary.language.huli=Huli +controlledvocabulary.language.hulung=Hulung +controlledvocabulary.language.humburi_senni_songhay=Humburi Senni Songhay +controlledvocabulary.language.humene=Humene +controlledvocabulary.language.humla=Humla +controlledvocabulary.language.hunde=Hunde +controlledvocabulary.language.hung=Hung +controlledvocabulary.language.hungana=Hungana +controlledvocabulary.language.hungarian=Hungarian +controlledvocabulary.language.hungarian_sign_language=Hungarian Sign Language +controlledvocabulary.language.hungu=Hungu +controlledvocabulary.language.hunjara-kaina_ke=Hunjara-Kaina Ke +controlledvocabulary.language.hunnic=Hunnic +controlledvocabulary.language.hunsrik=Hunsrik +controlledvocabulary.language.hunzib=Hunzib +controlledvocabulary.language.hupa=Hupa +controlledvocabulary.language.hupd�=Hupd� +controlledvocabulary.language.hupla=Hupla +controlledvocabulary.language.hurrian=Hurrian +controlledvocabulary.language.hutterite_german=Hutterite German +controlledvocabulary.language.hwana=Hwana +controlledvocabulary.language.hya=Hya +controlledvocabulary.language.hyam=Hyam +controlledvocabulary.language.hyolmo=Hyolmo +controlledvocabulary.language.h�rtevin=H�rtevin +controlledvocabulary.language.h�ne=H�ne +controlledvocabulary.language.i-wak=I-Wak +controlledvocabulary.language.iaai=Iaai +controlledvocabulary.language.iamalele=Iamalele +controlledvocabulary.language.iatmul=Iatmul +controlledvocabulary.language.iau=Iau +controlledvocabulary.language.ibali_teke=Ibali Teke +controlledvocabulary.language.ibaloi=Ibaloi +controlledvocabulary.language.iban=Iban +controlledvocabulary.language.ibanag=Ibanag +controlledvocabulary.language.ibani=Ibani +controlledvocabulary.language.ibatan=Ibatan +controlledvocabulary.language.iberian=Iberian +controlledvocabulary.language.ibibio=Ibibio +controlledvocabulary.language.ibino=Ibino +controlledvocabulary.language.ibu=Ibu +controlledvocabulary.language.ibuoro=Ibuoro +controlledvocabulary.language.icelandic=Icelandic +controlledvocabulary.language.icelandic_sign_language=Icelandic Sign Language +controlledvocabulary.language.iceve-maci=Iceve-Maci +controlledvocabulary.language.ida'an=Ida'an +controlledvocabulary.language.idakho-isukha-tiriki=Idakho-Isukha-Tiriki +controlledvocabulary.language.idat�=Idat� +controlledvocabulary.language.idere=Idere +controlledvocabulary.language.idesa=Idesa +controlledvocabulary.language.idi=Idi +controlledvocabulary.language.ido=Ido +controlledvocabulary.language.idoma=Idoma +controlledvocabulary.language.idon=Idon +controlledvocabulary.language.idu-mishmi=Idu-Mishmi +controlledvocabulary.language.iduna=Iduna +controlledvocabulary.language.ifo=Ifo +controlledvocabulary.language.if�=If� +controlledvocabulary.language.igala=Igala +controlledvocabulary.language.igana=Igana +controlledvocabulary.language.igbo=Igbo +controlledvocabulary.language.igede=Igede +controlledvocabulary.language.ignaciano=Ignaciano +controlledvocabulary.language.igo=Igo +controlledvocabulary.language.iguta=Iguta +controlledvocabulary.language.igwe=Igwe +controlledvocabulary.language.iha=Iha +controlledvocabulary.language.iha_based_pidgin=Iha Based Pidgin +controlledvocabulary.language.ihievbe=Ihievbe +controlledvocabulary.language.ik=Ik +controlledvocabulary.language.ika=Ika +controlledvocabulary.language.ikaranggal=Ikaranggal +controlledvocabulary.language.ikhin-arokho=Ikhin-Arokho +controlledvocabulary.language.ikizu=Ikizu +controlledvocabulary.language.iko=Iko +controlledvocabulary.language.ikobi=Ikobi +controlledvocabulary.language.ikoma-nata-isenye=Ikoma-Nata-Isenye +controlledvocabulary.language.ikpeng=Ikpeng +controlledvocabulary.language.ikpeshi=Ikpeshi +controlledvocabulary.language.ikposo=Ikposo +controlledvocabulary.language.iku-gora-ankwa=Iku-Gora-Ankwa +controlledvocabulary.language.ikulu=Ikulu +controlledvocabulary.language.ikwere=Ikwere +controlledvocabulary.language.ikwo=Ikwo +controlledvocabulary.language.ila=Ila +controlledvocabulary.language.ile_ape=Ile Ape +controlledvocabulary.language.ili_turki=Ili Turki +controlledvocabulary.language.ili'uun=Ili'uun +controlledvocabulary.language.ilianen_manobo=Ilianen Manobo +controlledvocabulary.language.illyrian=Illyrian +controlledvocabulary.language.iloko=Iloko +controlledvocabulary.language.ilongot=Ilongot +controlledvocabulary.language.ilue=Ilue +controlledvocabulary.language.ilwana=Ilwana +controlledvocabulary.language.imbabura_highland_quichua=Imbabura Highland Quichua +controlledvocabulary.language.imbongu=Imbongu +controlledvocabulary.language.imonda=Imonda +controlledvocabulary.language.imotong=Imotong +controlledvocabulary.language.imroing=Imroing +controlledvocabulary.language.inabaknon=Inabaknon +controlledvocabulary.language.inapang=Inapang +controlledvocabulary.language.inari_sami=Inari Sami +controlledvocabulary.language.indian_sign_language=Indian Sign Language +controlledvocabulary.language.indo-portuguese=Indo-Portuguese +controlledvocabulary.language.indonesian=Indonesian +controlledvocabulary.language.indonesian_bajau=Indonesian Bajau +controlledvocabulary.language.indonesian_sign_language=Indonesian Sign Language +controlledvocabulary.language.indri=Indri +controlledvocabulary.language.indus_kohistani=Indus Kohistani +controlledvocabulary.language.indus_valley_language=Indus Valley Language +controlledvocabulary.language.inebu_one=Inebu One +controlledvocabulary.language.inese�o=Inese�o +controlledvocabulary.language.inga=Inga +controlledvocabulary.language.ingrian=Ingrian +controlledvocabulary.language.ingush=Ingush +controlledvocabulary.language.inlaod_itneg=Inlaod Itneg +controlledvocabulary.language.innu=Innu +controlledvocabulary.language.inoke-yate=Inoke-Yate +controlledvocabulary.language.inonhan=Inonhan +controlledvocabulary.language.inor=Inor +controlledvocabulary.language.inpui_naga=Inpui Naga +controlledvocabulary.language.interglossa=Interglossa +controlledvocabulary.language.interlingua=Interlingua +controlledvocabulary.language.interlingue=Interlingue +controlledvocabulary.language.international_sign=International Sign +controlledvocabulary.language.interslavic=Interslavic +controlledvocabulary.language.intha=Intha +controlledvocabulary.language.inuinnaqtun=Inuinnaqtun +controlledvocabulary.language.inuit_sign_language=Inuit Sign Language +controlledvocabulary.language.inuktitut=Inuktitut +controlledvocabulary.language.inupiaq=Inupiaq +controlledvocabulary.language.iowa-oto=Iowa-Oto +controlledvocabulary.language.ipalapa_amuzgo=Ipalapa Amuzgo +controlledvocabulary.language.ipiko=Ipiko +controlledvocabulary.language.ipili=Ipili +controlledvocabulary.language.ipulo=Ipulo +controlledvocabulary.language.iquito=Iquito +controlledvocabulary.language.ir=Ir +controlledvocabulary.language.iranian_persian=Iranian Persian +controlledvocabulary.language.iranian_sign_language=Iranian Sign Language +controlledvocabulary.language.iranun_(malaysia)=Iranun (Malaysia) +controlledvocabulary.language.iranun_(philippines)=Iranun (Philippines) +controlledvocabulary.language.iraqw=Iraqw +controlledvocabulary.language.irarutu=Irarutu +controlledvocabulary.language.iraya=Iraya +controlledvocabulary.language.iresim=Iresim +controlledvocabulary.language.irish=Irish +controlledvocabulary.language.irish_sign_language=Irish Sign Language +controlledvocabulary.language.irula=Irula +controlledvocabulary.language.ir�ntxe=Ir�ntxe +controlledvocabulary.language.isabi=Isabi +controlledvocabulary.language.isanzu=Isanzu +controlledvocabulary.language.isarog_agta=Isarog Agta +controlledvocabulary.language.isconahua=Isconahua +controlledvocabulary.language.isebe=Isebe +controlledvocabulary.language.isekiri=Isekiri +controlledvocabulary.language.ishkashimi=Ishkashimi +controlledvocabulary.language.isinai=Isinai +controlledvocabulary.language.isirawa=Isirawa +controlledvocabulary.language.island_carib=Island Carib +controlledvocabulary.language.islander_creole_english=Islander Creole English +controlledvocabulary.language.isnag=Isnag +controlledvocabulary.language.isoko=Isoko +controlledvocabulary.language.israeli_sign_language=Israeli Sign Language +controlledvocabulary.language.isthmus_mixe=Isthmus Mixe +controlledvocabulary.language.isthmus_zapotec=Isthmus Zapotec +controlledvocabulary.language.isthmus-cosoleacaque_nahuatl=Isthmus-Cosoleacaque Nahuatl +controlledvocabulary.language.isthmus-mecayapan_nahuatl=Isthmus-Mecayapan Nahuatl +controlledvocabulary.language.isthmus-pajapan_nahuatl=Isthmus-Pajapan Nahuatl +controlledvocabulary.language.istriot=Istriot +controlledvocabulary.language.istro_romanian=Istro Romanian +controlledvocabulary.language.isu_(fako_division)=Isu (Fako Division) +controlledvocabulary.language.isu_(menchum_division)=Isu (Menchum Division) +controlledvocabulary.language.italian=Italian +controlledvocabulary.language.italian_sign_language=Italian Sign Language +controlledvocabulary.language.itawit=Itawit +controlledvocabulary.language.itelmen=Itelmen +controlledvocabulary.language.itene=Itene +controlledvocabulary.language.iteri=Iteri +controlledvocabulary.language.itik=Itik +controlledvocabulary.language.ito=Ito +controlledvocabulary.language.itonama=Itonama +controlledvocabulary.language.itu_mbon_uzo=Itu Mbon Uzo +controlledvocabulary.language.itundujia_mixtec=Itundujia Mixtec +controlledvocabulary.language.itz�=Itz� +controlledvocabulary.language.iu_mien=Iu Mien +controlledvocabulary.language.ivatan=Ivatan +controlledvocabulary.language.ivbie_north-okpela-arhe=Ivbie North-Okpela-Arhe +controlledvocabulary.language.iwaidja=Iwaidja +controlledvocabulary.language.iwal=Iwal +controlledvocabulary.language.iwam=Iwam +controlledvocabulary.language.iwur=Iwur +controlledvocabulary.language.ixcatec=Ixcatec +controlledvocabulary.language.ixcatl�n_mazatec=Ixcatl�n Mazatec +controlledvocabulary.language.ixil=Ixil +controlledvocabulary.language.ixtayutla_mixtec=Ixtayutla Mixtec +controlledvocabulary.language.ixtenco_otomi=Ixtenco Otomi +controlledvocabulary.language.iyayu=Iyayu +controlledvocabulary.language.iyive=Iyive +controlledvocabulary.language.iyo=Iyo +controlledvocabulary.language.iyo'wujwa_chorote=Iyo'wujwa Chorote +controlledvocabulary.language.iyojwa'ja_chorote=Iyojwa'ja Chorote +controlledvocabulary.language.izere=Izere +controlledvocabulary.language.izii=Izii +controlledvocabulary.language.izon=Izon +controlledvocabulary.language.izora=Izora +controlledvocabulary.language.i�apari=I�apari +controlledvocabulary.language.jabut�=Jabut� +controlledvocabulary.language.jad=Jad +controlledvocabulary.language.jadgali=Jadgali +controlledvocabulary.language.jah_hut=Jah Hut +controlledvocabulary.language.jahanka=Jahanka +controlledvocabulary.language.jair_awyu=Jair Awyu +controlledvocabulary.language.jaitmatang=Jaitmatang +controlledvocabulary.language.jakati=Jakati +controlledvocabulary.language.jakattoe=Jakattoe +controlledvocabulary.language.jakun=Jakun +controlledvocabulary.language.jalapa_de_d�az_mazatec=Jalapa De D�az Mazatec +controlledvocabulary.language.jalkunan=Jalkunan +controlledvocabulary.language.jamaican_country_sign_language=Jamaican Country Sign Language +controlledvocabulary.language.jamaican_creole_english=Jamaican Creole English +controlledvocabulary.language.jamaican_sign_language=Jamaican Sign Language +controlledvocabulary.language.jamamad�=Jamamad� +controlledvocabulary.language.jambi_malay=Jambi Malay +controlledvocabulary.language.jamiltepec_mixtec=Jamiltepec Mixtec +controlledvocabulary.language.jamsay_dogon=Jamsay Dogon +controlledvocabulary.language.jandai=Jandai +controlledvocabulary.language.jandavra=Jandavra +controlledvocabulary.language.jangkang=Jangkang +controlledvocabulary.language.jangshung=Jangshung +controlledvocabulary.language.janji=Janji +controlledvocabulary.language.japanese=Japanese +controlledvocabulary.language.japanese_sign_language=Japanese Sign Language +controlledvocabulary.language.japrer�a=Japrer�a +controlledvocabulary.language.jaqaru=Jaqaru +controlledvocabulary.language.jara=Jara +controlledvocabulary.language.jarai=Jarai +controlledvocabulary.language.jarawa_(india)=Jarawa (India) +controlledvocabulary.language.jaru=Jaru +controlledvocabulary.language.jauja_wanca_quechua=Jauja Wanca Quechua +controlledvocabulary.language.jaunsari=Jaunsari +controlledvocabulary.language.javanese=Javanese +controlledvocabulary.language.javindo=Javindo +controlledvocabulary.language.jawe=Jawe +controlledvocabulary.language.jawoyn=Jawoyn +controlledvocabulary.language.jaya=Jaya +controlledvocabulary.language.jebero=Jebero +controlledvocabulary.language.jeh=Jeh +controlledvocabulary.language.jehai=Jehai +controlledvocabulary.language.jejara_naga=Jejara Naga +controlledvocabulary.language.jejueo=Jejueo +controlledvocabulary.language.jemez=Jemez +controlledvocabulary.language.jenaama_bozo=Jenaama Bozo +controlledvocabulary.language.jennu_kurumba=Jennu Kurumba +controlledvocabulary.language.jere=Jere +controlledvocabulary.language.jeri_kuo=Jeri Kuo +controlledvocabulary.language.jerung=Jerung +controlledvocabulary.language.jewish_babylonian_aramaic_(ca._200-1200_ce)=Jewish Babylonian Aramaic (ca. 200-1200 CE) +controlledvocabulary.language.jewish_palestinian_aramaic=Jewish Palestinian Aramaic +controlledvocabulary.language.jhankot_sign_language=Jhankot Sign Language +controlledvocabulary.language.jiamao=Jiamao +controlledvocabulary.language.jiarong=Jiarong +controlledvocabulary.language.jiba=Jiba +controlledvocabulary.language.jibu=Jibu +controlledvocabulary.language.jicarilla_apache=Jicarilla Apache +controlledvocabulary.language.jiiddu=Jiiddu +controlledvocabulary.language.jilbe=Jilbe +controlledvocabulary.language.jilim=Jilim +controlledvocabulary.language.jimi_(cameroon)=Jimi (Cameroon) +controlledvocabulary.language.jimi_(nigeria)=Jimi (Nigeria) +controlledvocabulary.language.jina=Jina +controlledvocabulary.language.jingulu=Jingulu +controlledvocabulary.language.jinyu_chinese=Jinyu Chinese +controlledvocabulary.language.jiongnai_bunu=Jiongnai Bunu +controlledvocabulary.language.jirel=Jirel +controlledvocabulary.language.jiru=Jiru +controlledvocabulary.language.jita=Jita +controlledvocabulary.language.jju=Jju +controlledvocabulary.language.joba=Joba +controlledvocabulary.language.jofotek-bromnya=Jofotek-Bromnya +controlledvocabulary.language.jogi=Jogi +controlledvocabulary.language.jola-fonyi=Jola-Fonyi +controlledvocabulary.language.jola-kasa=Jola-Kasa +controlledvocabulary.language.jonkor_bourmataguil=Jonkor Bourmataguil +controlledvocabulary.language.jordanian_sign_language=Jordanian Sign Language +controlledvocabulary.language.jor�=Jor� +controlledvocabulary.language.jowulu=Jowulu +controlledvocabulary.language.ju=Ju +controlledvocabulary.language.juang=Juang +controlledvocabulary.language.judeo-arabic=Judeo-Arabic +controlledvocabulary.language.judeo-berber=Judeo-Berber +controlledvocabulary.language.judeo-georgian=Judeo-Georgian +controlledvocabulary.language.judeo-iraqi_arabic=Judeo-Iraqi Arabic +controlledvocabulary.language.judeo-italian=Judeo-Italian +controlledvocabulary.language.judeo-moroccan_arabic=Judeo-Moroccan Arabic +controlledvocabulary.language.judeo-persian=Judeo-Persian +controlledvocabulary.language.judeo-tat=Judeo-Tat +controlledvocabulary.language.judeo-tripolitanian_arabic=Judeo-Tripolitanian Arabic +controlledvocabulary.language.judeo-yemeni_arabic=Judeo-Yemeni Arabic +controlledvocabulary.language.jukun_takum=Jukun Takum +controlledvocabulary.language.jumjum=Jumjum +controlledvocabulary.language.jumla_sign_language=Jumla Sign Language +controlledvocabulary.language.jumli=Jumli +controlledvocabulary.language.jungle_inga=Jungle Inga +controlledvocabulary.language.juquila_mixe=Juquila Mixe +controlledvocabulary.language.jur_modo=Jur Modo +controlledvocabulary.language.juray=Juray +controlledvocabulary.language.jurchen=Jurchen +controlledvocabulary.language.jur�na=Jur�na +controlledvocabulary.language.jutish=Jutish +controlledvocabulary.language.juwal=Juwal +controlledvocabulary.language.juxtlahuaca_mixtec=Juxtlahuaca Mixtec +controlledvocabulary.language.juhoan=Ju??hoan +controlledvocabulary.language.jwira-pepesa=Jwira-Pepesa +controlledvocabulary.language.j�rriais=J�rriais +controlledvocabulary.language.j�ma=J�ma +controlledvocabulary.language.k'iche'=K'iche' +controlledvocabulary.language.kaamba=Kaamba +controlledvocabulary.language.kaan=Kaan +controlledvocabulary.language.kaang_chin=Kaang Chin +controlledvocabulary.language.kaansa=Kaansa +controlledvocabulary.language.kaba=Kaba +controlledvocabulary.language.kabalai=Kabalai +controlledvocabulary.language.kabardian=Kabardian +controlledvocabulary.language.kabatei=Kabatei +controlledvocabulary.language.kabiy�=Kabiy� +controlledvocabulary.language.kabola=Kabola +controlledvocabulary.language.kabore_one=Kabore One +controlledvocabulary.language.kabras=Kabras +controlledvocabulary.language.kaburi=Kaburi +controlledvocabulary.language.kabutra=Kabutra +controlledvocabulary.language.kabuverdianu=Kabuverdianu +controlledvocabulary.language.kabwa=Kabwa +controlledvocabulary.language.kabwari=Kabwari +controlledvocabulary.language.kabyle=Kabyle +controlledvocabulary.language.kachama-ganjule=Kachama-Ganjule +controlledvocabulary.language.kachari=Kachari +controlledvocabulary.language.kachhi=Kachhi +controlledvocabulary.language.kachi_koli=Kachi Koli +controlledvocabulary.language.kachin=Kachin +controlledvocabulary.language.kachok=Kachok +controlledvocabulary.language.kacipo-bale_suri=Kacipo-Bale Suri +controlledvocabulary.language.kadai=Kadai +controlledvocabulary.language.kadar=Kadar +controlledvocabulary.language.kadaru=Kadaru +controlledvocabulary.language.kadazan_dusun=Kadazan Dusun +controlledvocabulary.language.kadiw�u=Kadiw�u +controlledvocabulary.language.kadu=Kadu +controlledvocabulary.language.kadung=Kadung +controlledvocabulary.language.kaduo=Kaduo +controlledvocabulary.language.kaeku=Kaeku +controlledvocabulary.language.kaera=Kaera +controlledvocabulary.language.kafa=Kafa +controlledvocabulary.language.kafoa=Kafoa +controlledvocabulary.language.kagan_kalagan=Kagan Kalagan +controlledvocabulary.language.kagate=Kagate +controlledvocabulary.language.kagayanen=Kagayanen +controlledvocabulary.language.kagoma=Kagoma +controlledvocabulary.language.kagoro=Kagoro +controlledvocabulary.language.kagulu=Kagulu +controlledvocabulary.language.kahe=Kahe +controlledvocabulary.language.kahua=Kahua +controlledvocabulary.language.kaian=Kaian +controlledvocabulary.language.kaibobo=Kaibobo +controlledvocabulary.language.kaidipang=Kaidipang +controlledvocabulary.language.kaiep=Kaiep +controlledvocabulary.language.kaikadi=Kaikadi +controlledvocabulary.language.kaikavian_literary_language=Kaikavian Literary Language +controlledvocabulary.language.kaike=Kaike +controlledvocabulary.language.kaimbulawa=Kaimbulawa +controlledvocabulary.language.kaimb�=Kaimb� +controlledvocabulary.language.kaingang=Kaingang +controlledvocabulary.language.kairak=Kairak +controlledvocabulary.language.kairiru=Kairiru +controlledvocabulary.language.kairui-midiki=Kairui-Midiki +controlledvocabulary.language.kais=Kais +controlledvocabulary.language.kaitag=Kaitag +controlledvocabulary.language.kaivi=Kaivi +controlledvocabulary.language.kaiw�=Kaiw� +controlledvocabulary.language.kaiy=Kaiy +controlledvocabulary.language.kajakse=Kajakse +controlledvocabulary.language.kajali=Kajali +controlledvocabulary.language.kajaman=Kajaman +controlledvocabulary.language.kakabai=Kakabai +controlledvocabulary.language.kakabe=Kakabe +controlledvocabulary.language.kakanda=Kakanda +controlledvocabulary.language.kaki_ae=Kaki Ae +controlledvocabulary.language.kako=Kako +controlledvocabulary.language.kakwa=Kakwa +controlledvocabulary.language.kala_lagaw_ya=Kala Lagaw Ya +controlledvocabulary.language.kalaamaya=Kalaamaya +controlledvocabulary.language.kalabakan=Kalabakan +controlledvocabulary.language.kalabari=Kalabari +controlledvocabulary.language.kalabra=Kalabra +controlledvocabulary.language.kalagan=Kalagan +controlledvocabulary.language.kalaktang_monpa=Kalaktang Monpa +controlledvocabulary.language.kalam=Kalam +controlledvocabulary.language.kalams�=Kalams� +controlledvocabulary.language.kalanadi=Kalanadi +controlledvocabulary.language.kalanga=Kalanga +controlledvocabulary.language.kalanguya=Kalanguya +controlledvocabulary.language.kalao=Kalao +controlledvocabulary.language.kalapuya=Kalapuya +controlledvocabulary.language.kalarko=Kalarko +controlledvocabulary.language.kalasha=Kalasha +controlledvocabulary.language.kalenjin=Kalenjin +controlledvocabulary.language.kalispel-pend_d'oreille=Kalispel-Pend d'Oreille +controlledvocabulary.language.kalkoti=Kalkoti +controlledvocabulary.language.kalkutung=Kalkutung +controlledvocabulary.language.kalmyk=Kalmyk +controlledvocabulary.language.kalo_finnish_romani=Kalo Finnish Romani +controlledvocabulary.language.kalou=Kalou +controlledvocabulary.language.kaluli=Kaluli +controlledvocabulary.language.kalumpang=Kalumpang +controlledvocabulary.language.kam=Kam +controlledvocabulary.language.kamakan=Kamakan +controlledvocabulary.language.kamang=Kamang +controlledvocabulary.language.kamano=Kamano +controlledvocabulary.language.kamantan=Kamantan +controlledvocabulary.language.kamar=Kamar +controlledvocabulary.language.kamara=Kamara +controlledvocabulary.language.kamarian=Kamarian +controlledvocabulary.language.kamaru=Kamaru +controlledvocabulary.language.kamas=Kamas +controlledvocabulary.language.kamasa=Kamasa +controlledvocabulary.language.kamasau=Kamasau +controlledvocabulary.language.kamayo=Kamayo +controlledvocabulary.language.kamayur�=Kamayur� +controlledvocabulary.language.kamba_(kenya)=Kamba (Kenya) +controlledvocabulary.language.kambaata=Kambaata +controlledvocabulary.language.kambaira=Kambaira +controlledvocabulary.language.kambera=Kambera +controlledvocabulary.language.kamberau=Kamberau +controlledvocabulary.language.kambiw�=Kambiw� +controlledvocabulary.language.kami_(nigeria)=Kami (Nigeria) +controlledvocabulary.language.kami_(tanzania)=Kami (Tanzania) +controlledvocabulary.language.kamo=Kamo +controlledvocabulary.language.kamoro=Kamoro +controlledvocabulary.language.kamu=Kamu +controlledvocabulary.language.kamula=Kamula +controlledvocabulary.language.kamviri=Kamviri +controlledvocabulary.language.kamwe=Kamwe +controlledvocabulary.language.kanakanabu=Kanakanabu +controlledvocabulary.language.kanamar�=Kanamar� +controlledvocabulary.language.kanan=Kanan +controlledvocabulary.language.kanashi=Kanashi +controlledvocabulary.language.kanasi=Kanasi +controlledvocabulary.language.kanauji=Kanauji +controlledvocabulary.language.kandas=Kandas +controlledvocabulary.language.kandawo=Kandawo +controlledvocabulary.language.kande=Kande +controlledvocabulary.language.kanembu=Kanembu +controlledvocabulary.language.kang=Kang +controlledvocabulary.language.kanga=Kanga +controlledvocabulary.language.kangean=Kangean +controlledvocabulary.language.kanggape=Kanggape +controlledvocabulary.language.kangjia=Kangjia +controlledvocabulary.language.kango_(bas-u�l�_district)=Kango (Bas-U�l� District) +controlledvocabulary.language.kango_(tshopo_district)=Kango (Tshopo District) +controlledvocabulary.language.kangri=Kangri +controlledvocabulary.language.kaniet=Kaniet +controlledvocabulary.language.kanikkaran=Kanikkaran +controlledvocabulary.language.kaningdon-nindem=Kaningdon-Nindem +controlledvocabulary.language.kaningi=Kaningi +controlledvocabulary.language.kaningra=Kaningra +controlledvocabulary.language.kaninuwa=Kaninuwa +controlledvocabulary.language.kanite=Kanite +controlledvocabulary.language.kanjari=Kanjari +controlledvocabulary.language.kanju=Kanju +controlledvocabulary.language.kankanaey=Kankanaey +controlledvocabulary.language.kannada=Kannada +controlledvocabulary.language.kannada_kurumba=Kannada Kurumba +controlledvocabulary.language.kanowit-tanjong_melanau=Kanowit-Tanjong Melanau +controlledvocabulary.language.kano�=Kano� +controlledvocabulary.language.kansa=Kansa +controlledvocabulary.language.kantosi=Kantosi +controlledvocabulary.language.kanu=Kanu +controlledvocabulary.language.kanufi=Kanufi +controlledvocabulary.language.kanuri=Kanuri +controlledvocabulary.language.kanyok=Kanyok +controlledvocabulary.language.kao=Kao +controlledvocabulary.language.kaonde=Kaonde +controlledvocabulary.language.kap=Kap +controlledvocabulary.language.kapin=Kapin +controlledvocabulary.language.kapinaw�=Kapinaw� +controlledvocabulary.language.kapingamarangi=Kapingamarangi +controlledvocabulary.language.kapori=Kapori +controlledvocabulary.language.kapriman=Kapriman +controlledvocabulary.language.kaptiau=Kaptiau +controlledvocabulary.language.kapya=Kapya +controlledvocabulary.language.kaqchikel=Kaqchikel +controlledvocabulary.language.kara_(central_african_republic)=Kara (Central African Republic) +controlledvocabulary.language.kara_(korea)=Kara (Korea) +controlledvocabulary.language.kara_(papua_new_guinea)=Kara (Papua New Guinea) +controlledvocabulary.language.kara_(tanzania)=Kara (Tanzania) +controlledvocabulary.language.kara-kalpak=Kara-Kalpak +controlledvocabulary.language.karachay-balkar=Karachay-Balkar +controlledvocabulary.language.karagas=Karagas +controlledvocabulary.language.karaim=Karaim +controlledvocabulary.language.karajarri=Karajarri +controlledvocabulary.language.karaj�=Karaj� +controlledvocabulary.language.karakhanid=Karakhanid +controlledvocabulary.language.karami=Karami +controlledvocabulary.language.karamojong=Karamojong +controlledvocabulary.language.karang=Karang +controlledvocabulary.language.karanga=Karanga +controlledvocabulary.language.karankawa=Karankawa +controlledvocabulary.language.karao=Karao +controlledvocabulary.language.karas=Karas +controlledvocabulary.language.karata=Karata +controlledvocabulary.language.karawa=Karawa +controlledvocabulary.language.karbi=Karbi +controlledvocabulary.language.kare_(central_african_republic)=Kare (Central African Republic) +controlledvocabulary.language.kare_(papua_new_guinea)=Kare (Papua New Guinea) +controlledvocabulary.language.karekare=Karekare +controlledvocabulary.language.karelian=Karelian +controlledvocabulary.language.karenggapa=Karenggapa +controlledvocabulary.language.karey=Karey +controlledvocabulary.language.kari=Kari +controlledvocabulary.language.karingani=Karingani +controlledvocabulary.language.karipuna=Karipuna +controlledvocabulary.language.karip�na_creole_french=Karip�na Creole French +controlledvocabulary.language.karir�-xoc�=Karir�-Xoc� +controlledvocabulary.language.kariti�na=Kariti�na +controlledvocabulary.language.kariya=Kariya +controlledvocabulary.language.kariyarra=Kariyarra +controlledvocabulary.language.karkar-yuri=Karkar-Yuri +controlledvocabulary.language.karkin=Karkin +controlledvocabulary.language.karko=Karko +controlledvocabulary.language.karnai=Karnai +controlledvocabulary.language.karo_(brazil)=Karo (Brazil) +controlledvocabulary.language.karo_(ethiopia)=Karo (Ethiopia) +controlledvocabulary.language.karok=Karok +controlledvocabulary.language.karon=Karon +controlledvocabulary.language.karon_dori=Karon Dori +controlledvocabulary.language.karore=Karore +controlledvocabulary.language.karuwali=Karuwali +controlledvocabulary.language.kasanga=Kasanga +controlledvocabulary.language.kasem=Kasem +controlledvocabulary.language.kashaya=Kashaya +controlledvocabulary.language.kashmiri=Kashmiri +controlledvocabulary.language.kashubian=Kashubian +controlledvocabulary.language.kasiguranin=Kasiguranin +controlledvocabulary.language.kaska=Kaska +controlledvocabulary.language.kaskean=Kaskean +controlledvocabulary.language.kasua=Kasua +controlledvocabulary.language.katabaga=Katabaga +controlledvocabulary.language.katawixi=Katawixi +controlledvocabulary.language.katbol=Katbol +controlledvocabulary.language.katcha-kadugli-miri=Katcha-Kadugli-Miri +controlledvocabulary.language.kathoriya_tharu=Kathoriya Tharu +controlledvocabulary.language.kathu=Kathu +controlledvocabulary.language.kati=Kati +controlledvocabulary.language.katkari=Katkari +controlledvocabulary.language.katla=Katla +controlledvocabulary.language.kato=Kato +controlledvocabulary.language.katso=Katso +controlledvocabulary.language.katua=Katua +controlledvocabulary.language.katuk�na=Katuk�na +controlledvocabulary.language.kaulong=Kaulong +controlledvocabulary.language.kaur=Kaur +controlledvocabulary.language.kaure=Kaure +controlledvocabulary.language.kaurna=Kaurna +controlledvocabulary.language.kauwera=Kauwera +controlledvocabulary.language.kavalan=Kavalan +controlledvocabulary.language.kavet=Kavet +controlledvocabulary.language.kawacha=Kawacha +controlledvocabulary.language.kawaiisu=Kawaiisu +controlledvocabulary.language.kawe=Kawe +controlledvocabulary.language.kawi=Kawi +controlledvocabulary.language.kaxarar�=Kaxarar� +controlledvocabulary.language.kaxui�na=Kaxui�na +controlledvocabulary.language.kayab�=Kayab� +controlledvocabulary.language.kayagar=Kayagar +controlledvocabulary.language.kayan=Kayan +controlledvocabulary.language.kayan_mahakam=Kayan Mahakam +controlledvocabulary.language.kayan_river_kayan=Kayan River Kayan +controlledvocabulary.language.kayap�=Kayap� +controlledvocabulary.language.kayardild=Kayardild +controlledvocabulary.language.kayaw=Kayaw +controlledvocabulary.language.kayeli=Kayeli +controlledvocabulary.language.kayong=Kayong +controlledvocabulary.language.kayort=Kayort +controlledvocabulary.language.kaytetye=Kaytetye +controlledvocabulary.language.kayupulau=Kayupulau +controlledvocabulary.language.kazakh=Kazakh +controlledvocabulary.language.kazukuru=Kazukuru +controlledvocabulary.language.ke'o=Ke'o +controlledvocabulary.language.keak=Keak +controlledvocabulary.language.keapara=Keapara +controlledvocabulary.language.kedah_malay=Kedah Malay +controlledvocabulary.language.kedang=Kedang +controlledvocabulary.language.keder=Keder +controlledvocabulary.language.keerray-woorroong=Keerray-Woorroong +controlledvocabulary.language.kehu=Kehu +controlledvocabulary.language.kei=Kei +controlledvocabulary.language.keiga=Keiga +controlledvocabulary.language.kein=Kein +controlledvocabulary.language.keiyo=Keiyo +controlledvocabulary.language.kekch�=Kekch� +controlledvocabulary.language.kela_(democratic_republic_of_congo)=Kela (Democratic Republic of Congo) +controlledvocabulary.language.kela_(papua_new_guinea)=Kela (Papua New Guinea) +controlledvocabulary.language.kelabit=Kelabit +controlledvocabulary.language.kele_(democratic_republic_of_congo)=Kele (Democratic Republic of Congo) +controlledvocabulary.language.kele_(papua_new_guinea)=Kele (Papua New Guinea) +controlledvocabulary.language.keley-i_kallahan=Keley-I Kallahan +controlledvocabulary.language.keliko=Keliko +controlledvocabulary.language.kelo=Kelo +controlledvocabulary.language.kelon=Kelon +controlledvocabulary.language.kemak=Kemak +controlledvocabulary.language.kembayan=Kembayan +controlledvocabulary.language.kemberano=Kemberano +controlledvocabulary.language.kembra=Kembra +controlledvocabulary.language.kemedzung=Kemedzung +controlledvocabulary.language.kemi_sami=Kemi Sami +controlledvocabulary.language.kemiehua=Kemiehua +controlledvocabulary.language.kemtuik=Kemtuik +controlledvocabulary.language.kenaboi=Kenaboi +controlledvocabulary.language.kenati=Kenati +controlledvocabulary.language.kendayan=Kendayan +controlledvocabulary.language.kendeje=Kendeje +controlledvocabulary.language.kendem=Kendem +controlledvocabulary.language.kenga=Kenga +controlledvocabulary.language.keningau_murut=Keningau Murut +controlledvocabulary.language.keninjal=Keninjal +controlledvocabulary.language.kensiu=Kensiu +controlledvocabulary.language.kenswei_nsei=Kenswei Nsei +controlledvocabulary.language.kenyan_sign_language=Kenyan Sign Language +controlledvocabulary.language.kenyang=Kenyang +controlledvocabulary.language.kenyi=Kenyi +controlledvocabulary.language.kenzi=Kenzi +controlledvocabulary.language.keoru-ahia=Keoru-Ahia +controlledvocabulary.language.kepkiriw�t=Kepkiriw�t +controlledvocabulary.language.kepo'=Kepo' +controlledvocabulary.language.kera=Kera +controlledvocabulary.language.kerak=Kerak +controlledvocabulary.language.kereho=Kereho +controlledvocabulary.language.kerek=Kerek +controlledvocabulary.language.kerewe=Kerewe +controlledvocabulary.language.kerewo=Kerewo +controlledvocabulary.language.kerinci=Kerinci +controlledvocabulary.language.kesawai=Kesawai +controlledvocabulary.language.ket=Ket +controlledvocabulary.language.ketangalan=Ketangalan +controlledvocabulary.language.kete=Kete +controlledvocabulary.language.ketengban=Ketengban +controlledvocabulary.language.ketum=Ketum +controlledvocabulary.language.keyagana=Keyagana +controlledvocabulary.language.kgalagadi=Kgalagadi +controlledvocabulary.language.khah=Khah +controlledvocabulary.language.khakas=Khakas +controlledvocabulary.language.khalaj=Khalaj +controlledvocabulary.language.khaling=Khaling +controlledvocabulary.language.khamba=Khamba +controlledvocabulary.language.khamnigan_mongol=Khamnigan Mongol +controlledvocabulary.language.khams_tibetan=Khams Tibetan +controlledvocabulary.language.khamti=Khamti +controlledvocabulary.language.khamyang=Khamyang +controlledvocabulary.language.khana=Khana +controlledvocabulary.language.khandesi=Khandesi +controlledvocabulary.language.khanty=Khanty +controlledvocabulary.language.khao=Khao +controlledvocabulary.language.kharam_naga=Kharam Naga +controlledvocabulary.language.kharia=Kharia +controlledvocabulary.language.kharia_thar=Kharia Thar +controlledvocabulary.language.khasi=Khasi +controlledvocabulary.language.khayo=Khayo +controlledvocabulary.language.khazar=Khazar +controlledvocabulary.language.khe=Khe +controlledvocabulary.language.khehek=Khehek +controlledvocabulary.language.khengkha=Khengkha +controlledvocabulary.language.khetrani=Khetrani +controlledvocabulary.language.khezha_naga=Khezha Naga +controlledvocabulary.language.khiamniungan_naga=Khiamniungan Naga +controlledvocabulary.language.khinalugh=Khinalugh +controlledvocabulary.language.khirwar=Khirwar +controlledvocabulary.language.khisa=Khisa +controlledvocabulary.language.khlula=Khlula +controlledvocabulary.language.khmer=Khmer +controlledvocabulary.language.khmu=Khmu +controlledvocabulary.language.kho'ini=Kho'ini +controlledvocabulary.language.khoekhoe=Khoekhoe +controlledvocabulary.language.khoibu_naga=Khoibu Naga +controlledvocabulary.language.kholok=Kholok +controlledvocabulary.language.khorasani_turkish=Khorasani Turkish +controlledvocabulary.language.khorezmian=Khorezmian +controlledvocabulary.language.khotanese=Khotanese +controlledvocabulary.language.khowar=Khowar +controlledvocabulary.language.khua=Khua +controlledvocabulary.language.khuen=Khuen +controlledvocabulary.language.khumi_chin=Khumi Chin +controlledvocabulary.language.khunsari=Khunsari +controlledvocabulary.language.khvarshi=Khvarshi +controlledvocabulary.language.kh�ng=Kh�ng +controlledvocabulary.language.kh�n=Kh�n +controlledvocabulary.language.kibala=Kibala +controlledvocabulary.language.kibet=Kibet +controlledvocabulary.language.kibiri=Kibiri +controlledvocabulary.language.kickapoo=Kickapoo +controlledvocabulary.language.kija=Kija +controlledvocabulary.language.kikai=Kikai +controlledvocabulary.language.kikuyu,_gikuyu=Kikuyu, Gikuyu +controlledvocabulary.language.kildin_sami=Kildin Sami +controlledvocabulary.language.kilivila=Kilivila +controlledvocabulary.language.kiliwa=Kiliwa +controlledvocabulary.language.kilmeri=Kilmeri +controlledvocabulary.language.kim=Kim +controlledvocabulary.language.kim_mun=Kim Mun +controlledvocabulary.language.kimaama=Kimaama +controlledvocabulary.language.kimaragang=Kimaragang +controlledvocabulary.language.kimbu=Kimbu +controlledvocabulary.language.kimbundu=Kimbundu +controlledvocabulary.language.kimki=Kimki +controlledvocabulary.language.kimr�=Kimr� +controlledvocabulary.language.kinabalian=Kinabalian +controlledvocabulary.language.kinalakna=Kinalakna +controlledvocabulary.language.kinamiging_manobo=Kinamiging Manobo +controlledvocabulary.language.kinaray-a=Kinaray-A +controlledvocabulary.language.kinga=Kinga +controlledvocabulary.language.kinnauri=Kinnauri +controlledvocabulary.language.kintaq=Kintaq +controlledvocabulary.language.kinuku=Kinuku +controlledvocabulary.language.kinyarwanda=Kinyarwanda +controlledvocabulary.language.kioko=Kioko +controlledvocabulary.language.kiong=Kiong +controlledvocabulary.language.kiorr=Kiorr +controlledvocabulary.language.kiowa=Kiowa +controlledvocabulary.language.kiowa_apache=Kiowa Apache +controlledvocabulary.language.kipsigis=Kipsigis +controlledvocabulary.language.kiput=Kiput +controlledvocabulary.language.kir-balar=Kir-Balar +controlledvocabulary.language.kire=Kire +controlledvocabulary.language.kirghiz=Kirghiz +controlledvocabulary.language.kirike=Kirike +controlledvocabulary.language.kirikiri=Kirikiri +controlledvocabulary.language.kirmanjki_(individual_language)=Kirmanjki (individual language) +controlledvocabulary.language.kirundi=Kirundi +controlledvocabulary.language.kirya-konzl=Kirya-Konz?l +controlledvocabulary.language.kis=Kis +controlledvocabulary.language.kisa=Kisa +controlledvocabulary.language.kisan=Kisan +controlledvocabulary.language.kisankasa=Kisankasa +controlledvocabulary.language.kisar=Kisar +controlledvocabulary.language.kisi=Kisi +controlledvocabulary.language.kistane=Kistane +controlledvocabulary.language.kita_maninkakan=Kita Maninkakan +controlledvocabulary.language.kitan=Kitan +controlledvocabulary.language.kitsai=Kitsai +controlledvocabulary.language.kituba_(congo)=Kituba (Congo) +controlledvocabulary.language.kituba_(democratic_republic_of_congo)=Kituba (Democratic Republic of Congo) +controlledvocabulary.language.kiunum=Kiunum +controlledvocabulary.language.kizamani=Kizamani +controlledvocabulary.language.kla-dan=Kla-Dan +controlledvocabulary.language.klamath-modoc=Klamath-Modoc +controlledvocabulary.language.klao=Klao +controlledvocabulary.language.klias_river_kadazan=Klias River Kadazan +controlledvocabulary.language.klingon=Klingon +controlledvocabulary.language.knaanic=Knaanic +controlledvocabulary.language.ko=Ko +controlledvocabulary.language.koalib=Koalib +controlledvocabulary.language.koasati=Koasati +controlledvocabulary.language.koba=Koba +controlledvocabulary.language.kobiana=Kobiana +controlledvocabulary.language.kobo=Kobo +controlledvocabulary.language.kobol=Kobol +controlledvocabulary.language.kobon=Kobon +controlledvocabulary.language.koch=Koch +controlledvocabulary.language.kochila_tharu=Kochila Tharu +controlledvocabulary.language.koda=Koda +controlledvocabulary.language.kodaku=Kodaku +controlledvocabulary.language.kodava=Kodava +controlledvocabulary.language.kodeoha=Kodeoha +controlledvocabulary.language.kodi=Kodi +controlledvocabulary.language.kodia=Kodia +controlledvocabulary.language.koenoem=Koenoem +controlledvocabulary.language.kofa=Kofa +controlledvocabulary.language.kofei=Kofei +controlledvocabulary.language.kofyar=Kofyar +controlledvocabulary.language.koguryo=Koguryo +controlledvocabulary.language.kohin=Kohin +controlledvocabulary.language.kohistani_shina=Kohistani Shina +controlledvocabulary.language.koho=Koho +controlledvocabulary.language.kohumono=Kohumono +controlledvocabulary.language.koi=Koi +controlledvocabulary.language.koireng=Koireng +controlledvocabulary.language.koitabu=Koitabu +controlledvocabulary.language.koiwat=Koiwat +controlledvocabulary.language.kok_borok=Kok Borok +controlledvocabulary.language.kok-nar=Kok-Nar +controlledvocabulary.language.kokata=Kokata +controlledvocabulary.language.koke=Koke +controlledvocabulary.language.koki_naga=Koki Naga +controlledvocabulary.language.koko_babangk=Koko Babangk +controlledvocabulary.language.kokoda=Kokoda +controlledvocabulary.language.kokola=Kokola +controlledvocabulary.language.kokota=Kokota +controlledvocabulary.language.kol_(bangladesh)=Kol (Bangladesh) +controlledvocabulary.language.kol_(cameroon)=Kol (Cameroon) +controlledvocabulary.language.kol_(papua_new_guinea)=Kol (Papua New Guinea) +controlledvocabulary.language.kola=Kola +controlledvocabulary.language.kolbila=Kolbila +controlledvocabulary.language.kolibugan_subanon=Kolibugan Subanon +controlledvocabulary.language.koluwawa=Koluwawa +controlledvocabulary.language.kom_(cameroon)=Kom (Cameroon) +controlledvocabulary.language.kom_(india)=Kom (India) +controlledvocabulary.language.koma=Koma +controlledvocabulary.language.komba=Komba +controlledvocabulary.language.kombai=Kombai +controlledvocabulary.language.kombio=Kombio +controlledvocabulary.language.komering=Komering +controlledvocabulary.language.komi=Komi +controlledvocabulary.language.komi-permyak=Komi-Permyak +controlledvocabulary.language.komi-zyrian=Komi-Zyrian +controlledvocabulary.language.kominimung=Kominimung +controlledvocabulary.language.komo_(democratic_republic_of_congo)=Komo (Democratic Republic of Congo) +controlledvocabulary.language.komo_(sudan)=Komo (Sudan) +controlledvocabulary.language.komodo=Komodo +controlledvocabulary.language.kompane=Kompane +controlledvocabulary.language.komyandaret=Komyandaret +controlledvocabulary.language.kon_keu=Kon Keu +controlledvocabulary.language.konai=Konai +controlledvocabulary.language.konda=Konda +controlledvocabulary.language.konda-dora=Konda-Dora +controlledvocabulary.language.koneraw=Koneraw +controlledvocabulary.language.kongo=Kongo +controlledvocabulary.language.konkani_(individual_language)=Konkani (individual language) +controlledvocabulary.language.konkani_(macrolanguage)=Konkani (macrolanguage) +controlledvocabulary.language.konkomba=Konkomba +controlledvocabulary.language.konni=Konni +controlledvocabulary.language.kono_(guinea)=Kono (Guinea) +controlledvocabulary.language.kono_(nigeria)=Kono (Nigeria) +controlledvocabulary.language.kono_(sierra_leone)=Kono (Sierra Leone) +controlledvocabulary.language.konomala=Konomala +controlledvocabulary.language.konongo=Konongo +controlledvocabulary.language.konso=Konso +controlledvocabulary.language.konyak_naga=Konyak Naga +controlledvocabulary.language.konyanka_maninka=Konyanka Maninka +controlledvocabulary.language.konzo=Konzo +controlledvocabulary.language.koongo=Koongo +controlledvocabulary.language.koonzime=Koonzime +controlledvocabulary.language.koorete=Koorete +controlledvocabulary.language.kopar=Kopar +controlledvocabulary.language.kopkaka=Kopkaka +controlledvocabulary.language.korafe-yegha=Korafe-Yegha +controlledvocabulary.language.korak=Korak +controlledvocabulary.language.korana=Korana +controlledvocabulary.language.korandje=Korandje +controlledvocabulary.language.korean=Korean +controlledvocabulary.language.korean_sign_language=Korean Sign Language +controlledvocabulary.language.koreguaje=Koreguaje +controlledvocabulary.language.koresh-e_rostam=Koresh-e Rostam +controlledvocabulary.language.korku=Korku +controlledvocabulary.language.korlai_creole_portuguese=Korlai Creole Portuguese +controlledvocabulary.language.koro_(c�te_d'ivoire)=Koro (C�te d'Ivoire) +controlledvocabulary.language.koro_(india)=Koro (India) +controlledvocabulary.language.koro_(papua_new_guinea)=Koro (Papua New Guinea) +controlledvocabulary.language.koro_(vanuatu)=Koro (Vanuatu) +controlledvocabulary.language.koro_nulu=Koro Nulu +controlledvocabulary.language.koro_wachi=Koro Wachi +controlledvocabulary.language.koro_zuba=Koro Zuba +controlledvocabulary.language.koromf�=Koromf� +controlledvocabulary.language.koromira=Koromira +controlledvocabulary.language.koronadal_blaan=Koronadal Blaan +controlledvocabulary.language.koroni=Koroni +controlledvocabulary.language.korop�=Korop� +controlledvocabulary.language.koroshi=Koroshi +controlledvocabulary.language.korowai=Korowai +controlledvocabulary.language.korra_koraga=Korra Koraga +controlledvocabulary.language.korubo=Korubo +controlledvocabulary.language.korupun-sela=Korupun-Sela +controlledvocabulary.language.korwa=Korwa +controlledvocabulary.language.koryak=Koryak +controlledvocabulary.language.kosadle=Kosadle +controlledvocabulary.language.kosarek_yale=Kosarek Yale +controlledvocabulary.language.kosena=Kosena +controlledvocabulary.language.koshin=Koshin +controlledvocabulary.language.kosraean=Kosraean +controlledvocabulary.language.kota_(gabon)=Kota (Gabon) +controlledvocabulary.language.kota_(india)=Kota (India) +controlledvocabulary.language.kota_bangun_kutai_malay=Kota Bangun Kutai Malay +controlledvocabulary.language.kota_marudu_talantang=Kota Marudu Talantang +controlledvocabulary.language.kotafon_gbe=Kotafon Gbe +controlledvocabulary.language.kotava=Kotava +controlledvocabulary.language.koti=Koti +controlledvocabulary.language.kott=Kott +controlledvocabulary.language.kou=Kou +controlledvocabulary.language.kouya=Kouya +controlledvocabulary.language.kovai=Kovai +controlledvocabulary.language.kove=Kove +controlledvocabulary.language.kowaki=Kowaki +controlledvocabulary.language.kowiai=Kowiai +controlledvocabulary.language.koy_sanjaq_surat=Koy Sanjaq Surat +controlledvocabulary.language.koya=Koya +controlledvocabulary.language.koyaga=Koyaga +controlledvocabulary.language.koyo=Koyo +controlledvocabulary.language.koyra_chiini_songhay=Koyra Chiini Songhay +controlledvocabulary.language.koyraboro_senni_songhai=Koyraboro Senni Songhai +controlledvocabulary.language.koyukon=Koyukon +controlledvocabulary.language.kpagua=Kpagua +controlledvocabulary.language.kpala=Kpala +controlledvocabulary.language.kpan=Kpan +controlledvocabulary.language.kpasam=Kpasam +controlledvocabulary.language.kpati=Kpati +controlledvocabulary.language.kpatili=Kpatili +controlledvocabulary.language.kpeego=Kpeego +controlledvocabulary.language.kpelle=Kpelle +controlledvocabulary.language.kpessi=Kpessi +controlledvocabulary.language.kplang=Kplang +controlledvocabulary.language.krache=Krache +controlledvocabulary.language.krah�=Krah� +controlledvocabulary.language.kraol=Kraol +controlledvocabulary.language.krenak=Krenak +controlledvocabulary.language.krevinian=Krevinian +controlledvocabulary.language.kreye=Kreye +controlledvocabulary.language.kriang=Kriang +controlledvocabulary.language.krikati-timbira=Krikati-Timbira +controlledvocabulary.language.krio=Krio +controlledvocabulary.language.kriol=Kriol +controlledvocabulary.language.krisa=Krisa +controlledvocabulary.language.krobu=Krobu +controlledvocabulary.language.krongo=Krongo +controlledvocabulary.language.krung=Krung +controlledvocabulary.language.krymchak=Krymchak +controlledvocabulary.language.kryts=Kryts +controlledvocabulary.language.kua=Kua +controlledvocabulary.language.kua-nsi=Kua-nsi +controlledvocabulary.language.kuamasi=Kuamasi +controlledvocabulary.language.kuan=Kuan +controlledvocabulary.language.kuanhua=Kuanhua +controlledvocabulary.language.kuanua=Kuanua +controlledvocabulary.language.kuanyama,_kwanyama=Kuanyama, Kwanyama +controlledvocabulary.language.kubachi=Kubachi +controlledvocabulary.language.kube=Kube +controlledvocabulary.language.kubi=Kubi +controlledvocabulary.language.kubo=Kubo +controlledvocabulary.language.kubu=Kubu +controlledvocabulary.language.kucong=Kucong +controlledvocabulary.language.kudiya=Kudiya +controlledvocabulary.language.kudmali=Kudmali +controlledvocabulary.language.kudu-camo=Kudu-Camo +controlledvocabulary.language.kufr_qassem_sign_language_(kqsl)=Kufr Qassem Sign Language (KQSL) +controlledvocabulary.language.kugama=Kugama +controlledvocabulary.language.kugbo=Kugbo +controlledvocabulary.language.kugu-muminh=Kugu-Muminh +controlledvocabulary.language.kui_(india)=Kui (India) +controlledvocabulary.language.kui_(indonesia)=Kui (Indonesia) +controlledvocabulary.language.kuijau=Kuijau +controlledvocabulary.language.kuik�ro-kalap�lo=Kuik�ro-Kalap�lo +controlledvocabulary.language.kujarge=Kujarge +controlledvocabulary.language.kuk=Kuk +controlledvocabulary.language.kukatja=Kukatja +controlledvocabulary.language.kuke=Kuke +controlledvocabulary.language.kukele=Kukele +controlledvocabulary.language.kukna=Kukna +controlledvocabulary.language.kuku=Kuku +controlledvocabulary.language.kuku-mangk=Kuku-Mangk +controlledvocabulary.language.kuku-mu'inh=Kuku-Mu'inh +controlledvocabulary.language.kuku-ugbanh=Kuku-Ugbanh +controlledvocabulary.language.kuku-uwanh=Kuku-Uwanh +controlledvocabulary.language.kuku-yalanji=Kuku-Yalanji +controlledvocabulary.language.kula=Kula +controlledvocabulary.language.kulere=Kulere +controlledvocabulary.language.kulfa=Kulfa +controlledvocabulary.language.kulina_pano=Kulina Pano +controlledvocabulary.language.kulisusu=Kulisusu +controlledvocabulary.language.kullu_pahari=Kullu Pahari +controlledvocabulary.language.kulon=Kulon +controlledvocabulary.language.kulung_(nepal)=Kulung (Nepal) +controlledvocabulary.language.kulung_(nigeria)=Kulung (Nigeria) +controlledvocabulary.language.kumalu=Kumalu +controlledvocabulary.language.kumam=Kumam +controlledvocabulary.language.kuman_(papua_new_guinea)=Kuman (Papua New Guinea) +controlledvocabulary.language.kuman_(russia)=Kuman (Russia) +controlledvocabulary.language.kumaoni=Kumaoni +controlledvocabulary.language.kumarbhag_paharia=Kumarbhag Paharia +controlledvocabulary.language.kumba=Kumba +controlledvocabulary.language.kumbainggar=Kumbainggar +controlledvocabulary.language.kumbaran=Kumbaran +controlledvocabulary.language.kumbewaha=Kumbewaha +controlledvocabulary.language.kumhali=Kumhali +controlledvocabulary.language.kumiai=Kumiai +controlledvocabulary.language.kumukio=Kumukio +controlledvocabulary.language.kumyk=Kumyk +controlledvocabulary.language.kumzari=Kumzari +controlledvocabulary.language.kunama=Kunama +controlledvocabulary.language.kunbarlang=Kunbarlang +controlledvocabulary.language.kunda=Kunda +controlledvocabulary.language.kundal_shahi=Kundal Shahi +controlledvocabulary.language.kunduvadi=Kunduvadi +controlledvocabulary.language.kung=Kung +controlledvocabulary.language.kung-ekoka=Kung-Ekoka +controlledvocabulary.language.kungarakany=Kungarakany +controlledvocabulary.language.kungardutyi=Kungardutyi +controlledvocabulary.language.kunggari=Kunggari +controlledvocabulary.language.kungkari=Kungkari +controlledvocabulary.language.kuni=Kuni +controlledvocabulary.language.kuni-boazi=Kuni-Boazi +controlledvocabulary.language.kunigami=Kunigami +controlledvocabulary.language.kunimaipa=Kunimaipa +controlledvocabulary.language.kunja=Kunja +controlledvocabulary.language.kunjen=Kunjen +controlledvocabulary.language.kunyi=Kunyi +controlledvocabulary.language.kunza=Kunza +controlledvocabulary.language.kuo=Kuo +controlledvocabulary.language.kuot=Kuot +controlledvocabulary.language.kupa=Kupa +controlledvocabulary.language.kupang_malay=Kupang Malay +controlledvocabulary.language.kupia=Kupia +controlledvocabulary.language.kupsabiny=Kupsabiny +controlledvocabulary.language.kur=Kur +controlledvocabulary.language.kura_ede_nago=Kura Ede Nago +controlledvocabulary.language.kurama=Kurama +controlledvocabulary.language.kuranko=Kuranko +controlledvocabulary.language.kurdish=Kurdish +controlledvocabulary.language.kuri=Kuri +controlledvocabulary.language.kuria=Kuria +controlledvocabulary.language.kurichiya=Kurichiya +controlledvocabulary.language.kurmukar=Kurmukar +controlledvocabulary.language.kurnai=Kurnai +controlledvocabulary.language.kurrama=Kurrama +controlledvocabulary.language.kurti=Kurti +controlledvocabulary.language.kurtokha=Kurtokha +controlledvocabulary.language.kurudu=Kurudu +controlledvocabulary.language.kurukh=Kurukh +controlledvocabulary.language.kuru�ya=Kuru�ya +controlledvocabulary.language.kusaal=Kusaal +controlledvocabulary.language.kusaghe=Kusaghe +controlledvocabulary.language.kushi=Kushi +controlledvocabulary.language.kusu=Kusu +controlledvocabulary.language.kusunda=Kusunda +controlledvocabulary.language.kutenai=Kutenai +controlledvocabulary.language.kutep=Kutep +controlledvocabulary.language.kuthant=Kuthant +controlledvocabulary.language.kutong=Kutong +controlledvocabulary.language.kutto=Kutto +controlledvocabulary.language.kutu=Kutu +controlledvocabulary.language.kuturmi=Kuturmi +controlledvocabulary.language.kuuk_thaayorre=Kuuk Thaayorre +controlledvocabulary.language.kuuk-yak=Kuuk-Yak +controlledvocabulary.language.kuuku-ya'u=Kuuku-Ya'u +controlledvocabulary.language.kuvale=Kuvale +controlledvocabulary.language.kuvi=Kuvi +controlledvocabulary.language.kuwaa=Kuwaa +controlledvocabulary.language.kuwaataay=Kuwaataay +controlledvocabulary.language.kuwema=Kuwema +controlledvocabulary.language.kuy=Kuy +controlledvocabulary.language.kven_finnish=Kven Finnish +controlledvocabulary.language.kw'adza=Kw'adza +controlledvocabulary.language.kwa=Kwa +controlledvocabulary.language.kwa'=Kwa' +controlledvocabulary.language.kwaami=Kwaami +controlledvocabulary.language.kwadi=Kwadi +controlledvocabulary.language.kwaio=Kwaio +controlledvocabulary.language.kwaja=Kwaja +controlledvocabulary.language.kwakiutl=Kwakiutl +controlledvocabulary.language.kwakum=Kwakum +controlledvocabulary.language.kwalhioqua-tlatskanai=Kwalhioqua-Tlatskanai +controlledvocabulary.language.kwama=Kwama +controlledvocabulary.language.kwambi=Kwambi +controlledvocabulary.language.kwamera=Kwamera +controlledvocabulary.language.kwami=Kwami +controlledvocabulary.language.kwamtim_one=Kwamtim One +controlledvocabulary.language.kwandu=Kwandu +controlledvocabulary.language.kwang=Kwang +controlledvocabulary.language.kwanga=Kwanga +controlledvocabulary.language.kwangali=Kwangali +controlledvocabulary.language.kwanja=Kwanja +controlledvocabulary.language.kwara'ae=Kwara'ae +controlledvocabulary.language.kwasio=Kwasio +controlledvocabulary.language.kwaya=Kwaya +controlledvocabulary.language.kwaza=Kwaza +controlledvocabulary.language.kwegu=Kwegu +controlledvocabulary.language.kwer=Kwer +controlledvocabulary.language.kwerba=Kwerba +controlledvocabulary.language.kwerba_mamberamo=Kwerba Mamberamo +controlledvocabulary.language.kwere=Kwere +controlledvocabulary.language.kwerisa=Kwerisa +controlledvocabulary.language.kwese=Kwese +controlledvocabulary.language.kwesten=Kwesten +controlledvocabulary.language.kwini=Kwini +controlledvocabulary.language.kwinsu=Kwinsu +controlledvocabulary.language.kwinti=Kwinti +controlledvocabulary.language.kwoma=Kwoma +controlledvocabulary.language.kwomtari=Kwomtari +controlledvocabulary.language.kxoe=Kxoe +controlledvocabulary.language.kyak=Kyak +controlledvocabulary.language.kyaka=Kyaka +controlledvocabulary.language.kyan-karyaw_naga=Kyan-Karyaw Naga +controlledvocabulary.language.kyanga=Kyanga +controlledvocabulary.language.kyenele=Kyenele +controlledvocabulary.language.kyerung=Kyerung +controlledvocabulary.language.k�te=K�te +controlledvocabulary.language.k�l�=K�l� +controlledvocabulary.language.k�lsch=K�lsch +controlledvocabulary.language.klngaxo_bozo=K?l?ngaxo Bozo +controlledvocabulary.language.la'bi=La'bi +controlledvocabulary.language.laal=Laal +controlledvocabulary.language.laari=Laari +controlledvocabulary.language.laarim=Laarim +controlledvocabulary.language.laba=Laba +controlledvocabulary.language.label=Label +controlledvocabulary.language.labir=Labir +controlledvocabulary.language.labo=Labo +controlledvocabulary.language.labo_phowa=Labo Phowa +controlledvocabulary.language.labu=Labu +controlledvocabulary.language.labuk-kinabatangan_kadazan=Labuk-Kinabatangan Kadazan +controlledvocabulary.language.lacandon=Lacandon +controlledvocabulary.language.lachi=Lachi +controlledvocabulary.language.lachiguiri_zapotec=Lachiguiri Zapotec +controlledvocabulary.language.lachix�o_zapotec=Lachix�o Zapotec +controlledvocabulary.language.ladakhi=Ladakhi +controlledvocabulary.language.ladin=Ladin +controlledvocabulary.language.ladino=Ladino +controlledvocabulary.language.ladji_ladji=Ladji Ladji +controlledvocabulary.language.laeko-libuat=Laeko-Libuat +controlledvocabulary.language.lafofa=Lafofa +controlledvocabulary.language.laghu=Laghu +controlledvocabulary.language.laghuu=Laghuu +controlledvocabulary.language.lagwan=Lagwan +controlledvocabulary.language.laha_(indonesia)=Laha (Indonesia) +controlledvocabulary.language.laha_(viet_nam)=Laha (Viet Nam) +controlledvocabulary.language.lahanan=Lahanan +controlledvocabulary.language.lahnda=Lahnda +controlledvocabulary.language.lahta_karen=Lahta Karen +controlledvocabulary.language.lahu=Lahu +controlledvocabulary.language.lahu_shi=Lahu Shi +controlledvocabulary.language.lahul_lohar=Lahul Lohar +controlledvocabulary.language.laimbue=Laimbue +controlledvocabulary.language.laitu_chin=Laitu Chin +controlledvocabulary.language.laiyolo=Laiyolo +controlledvocabulary.language.lak=Lak +controlledvocabulary.language.laka_(chad)=Laka (Chad) +controlledvocabulary.language.lakalei=Lakalei +controlledvocabulary.language.lake_miwok=Lake Miwok +controlledvocabulary.language.lakha=Lakha +controlledvocabulary.language.laki=Laki +controlledvocabulary.language.lakkia=Lakkia +controlledvocabulary.language.lakon=Lakon +controlledvocabulary.language.lakond�=Lakond� +controlledvocabulary.language.lakota=Lakota +controlledvocabulary.language.lakota_dida=Lakota Dida +controlledvocabulary.language.lakurumau=Lakurumau +controlledvocabulary.language.lala=Lala +controlledvocabulary.language.lala-bisa=Lala-Bisa +controlledvocabulary.language.lala-roba=Lala-Roba +controlledvocabulary.language.lalana_chinantec=Lalana Chinantec +controlledvocabulary.language.lalia=Lalia +controlledvocabulary.language.lama_(togo)=Lama (Togo) +controlledvocabulary.language.lama_bai=Lama Bai +controlledvocabulary.language.lamaholot=Lamaholot +controlledvocabulary.language.lamalama=Lamalama +controlledvocabulary.language.lamalera=Lamalera +controlledvocabulary.language.lamang=Lamang +controlledvocabulary.language.lamatuka=Lamatuka +controlledvocabulary.language.lamba=Lamba +controlledvocabulary.language.lambadi=Lambadi +controlledvocabulary.language.lambayeque_quechua=Lambayeque Quechua +controlledvocabulary.language.lambichhong=Lambichhong +controlledvocabulary.language.lamboya=Lamboya +controlledvocabulary.language.lambya=Lambya +controlledvocabulary.language.lame=Lame +controlledvocabulary.language.lamenu=Lamenu +controlledvocabulary.language.lamja-dengsa-tola=Lamja-Dengsa-Tola +controlledvocabulary.language.lamkang=Lamkang +controlledvocabulary.language.lamma=Lamma +controlledvocabulary.language.lamnso'=Lamnso' +controlledvocabulary.language.lamogai=Lamogai +controlledvocabulary.language.lampung_api=Lampung Api +controlledvocabulary.language.lampung_nyo=Lampung Nyo +controlledvocabulary.language.lamu=Lamu +controlledvocabulary.language.lanas_lobu=Lanas Lobu +controlledvocabulary.language.landoma=Landoma +controlledvocabulary.language.lang'e=Lang'e +controlledvocabulary.language.langam=Langam +controlledvocabulary.language.langbashe=Langbashe +controlledvocabulary.language.langnian_buyang=Langnian Buyang +controlledvocabulary.language.lango_(south_sudan)=Lango (South Sudan) +controlledvocabulary.language.lango_(uganda)=Lango (Uganda) +controlledvocabulary.language.langobardic=Langobardic +controlledvocabulary.language.langue_des_signes_de_belgique_francophone=Langue des signes de Belgique Francophone +controlledvocabulary.language.lanima=Lanima +controlledvocabulary.language.lanoh=Lanoh +controlledvocabulary.language.lao=Lao +controlledvocabulary.language.lao_naga=Lao Naga +controlledvocabulary.language.laomian=Laomian +controlledvocabulary.language.laopang=Laopang +controlledvocabulary.language.laos_sign_language=Laos Sign Language +controlledvocabulary.language.lapagu�a-guivini_zapotec=Lapagu�a-Guivini Zapotec +controlledvocabulary.language.laragia=Laragia +controlledvocabulary.language.larantuka_malay=Larantuka Malay +controlledvocabulary.language.lardil=Lardil +controlledvocabulary.language.larevat=Larevat +controlledvocabulary.language.large_flowery_miao=Large Flowery Miao +controlledvocabulary.language.lari=Lari +controlledvocabulary.language.larike-wakasihu=Larike-Wakasihu +controlledvocabulary.language.laro=Laro +controlledvocabulary.language.larteh=Larteh +controlledvocabulary.language.laru=Laru +controlledvocabulary.language.las_delicias_zapotec=Las Delicias Zapotec +controlledvocabulary.language.lasalimu=Lasalimu +controlledvocabulary.language.lasgerdi=Lasgerdi +controlledvocabulary.language.lashi=Lashi +controlledvocabulary.language.lasi=Lasi +controlledvocabulary.language.late_middle_chinese=Late Middle Chinese +controlledvocabulary.language.latgalian=Latgalian +controlledvocabulary.language.latin=Latin +controlledvocabulary.language.latu=Latu +controlledvocabulary.language.latund�=Latund� +controlledvocabulary.language.latvian=Latvian +controlledvocabulary.language.latvian_sign_language=Latvian Sign Language +controlledvocabulary.language.lau=Lau +controlledvocabulary.language.laua=Laua +controlledvocabulary.language.lauan=Lauan +controlledvocabulary.language.lauje=Lauje +controlledvocabulary.language.laura=Laura +controlledvocabulary.language.laurentian=Laurentian +controlledvocabulary.language.lautu_chin=Lautu Chin +controlledvocabulary.language.lavatbura-lamusong=Lavatbura-Lamusong +controlledvocabulary.language.laven=Laven +controlledvocabulary.language.lavi=Lavi +controlledvocabulary.language.lavukaleve=Lavukaleve +controlledvocabulary.language.lawangan=Lawangan +controlledvocabulary.language.lawu=Lawu +controlledvocabulary.language.lawunuia=Lawunuia +controlledvocabulary.language.layakha=Layakha +controlledvocabulary.language.laz=Laz +controlledvocabulary.language.lealao_chinantec=Lealao Chinantec +controlledvocabulary.language.leco=Leco +controlledvocabulary.language.ledo_kaili=Ledo Kaili +controlledvocabulary.language.leelau=Leelau +controlledvocabulary.language.lefa=Lefa +controlledvocabulary.language.lega-mwenga=Lega-Mwenga +controlledvocabulary.language.lega-shabunda=Lega-Shabunda +controlledvocabulary.language.legbo=Legbo +controlledvocabulary.language.legenyem=Legenyem +controlledvocabulary.language.lehali=Lehali +controlledvocabulary.language.lehalurup=Lehalurup +controlledvocabulary.language.lehar=Lehar +controlledvocabulary.language.leinong_naga=Leinong Naga +controlledvocabulary.language.leipon=Leipon +controlledvocabulary.language.lelak=Lelak +controlledvocabulary.language.lele_(chad)=Lele (Chad) +controlledvocabulary.language.lele_(democratic_republic_of_congo)=Lele (Democratic Republic of Congo) +controlledvocabulary.language.lele_(guinea)=Lele (Guinea) +controlledvocabulary.language.lele_(papua_new_guinea)=Lele (Papua New Guinea) +controlledvocabulary.language.lelemi=Lelemi +controlledvocabulary.language.lelepa=Lelepa +controlledvocabulary.language.lembena=Lembena +controlledvocabulary.language.lemerig=Lemerig +controlledvocabulary.language.lemio=Lemio +controlledvocabulary.language.lemnian=Lemnian +controlledvocabulary.language.lemolang=Lemolang +controlledvocabulary.language.lemoro=Lemoro +controlledvocabulary.language.lenakel=Lenakel +controlledvocabulary.language.lenca=Lenca +controlledvocabulary.language.lendu=Lendu +controlledvocabulary.language.lengilu=Lengilu +controlledvocabulary.language.lengo=Lengo +controlledvocabulary.language.lengola=Lengola +controlledvocabulary.language.leningitij=Leningitij +controlledvocabulary.language.lenje=Lenje +controlledvocabulary.language.lenkau=Lenkau +controlledvocabulary.language.lenyima=Lenyima +controlledvocabulary.language.lepcha=Lepcha +controlledvocabulary.language.lepki=Lepki +controlledvocabulary.language.lepontic=Lepontic +controlledvocabulary.language.lere=Lere +controlledvocabulary.language.lese=Lese +controlledvocabulary.language.lesing-gelimi=Lesing-Gelimi +controlledvocabulary.language.letemboi=Letemboi +controlledvocabulary.language.leti_(cameroon)=Leti (Cameroon) +controlledvocabulary.language.leti_(indonesia)=Leti (Indonesia) +controlledvocabulary.language.levantine_arabic=Levantine Arabic +controlledvocabulary.language.levuka=Levuka +controlledvocabulary.language.lewo=Lewo +controlledvocabulary.language.lewo_eleng=Lewo Eleng +controlledvocabulary.language.lewotobi=Lewotobi +controlledvocabulary.language.leyigha=Leyigha +controlledvocabulary.language.lezghian=Lezghian +controlledvocabulary.language.lhokpu=Lhokpu +controlledvocabulary.language.lhomi=Lhomi +controlledvocabulary.language.li'o=Li'o +controlledvocabulary.language.liabuku=Liabuku +controlledvocabulary.language.liana-seti=Liana-Seti +controlledvocabulary.language.liangmai_naga=Liangmai Naga +controlledvocabulary.language.lianshan_zhuang=Lianshan Zhuang +controlledvocabulary.language.liberia_kpelle=Liberia Kpelle +controlledvocabulary.language.liberian_english=Liberian English +controlledvocabulary.language.libido=Libido +controlledvocabulary.language.libinza=Libinza +controlledvocabulary.language.libon_bikol=Libon Bikol +controlledvocabulary.language.liburnian=Liburnian +controlledvocabulary.language.libyan_arabic=Libyan Arabic +controlledvocabulary.language.libyan_sign_language=Libyan Sign Language +controlledvocabulary.language.lidzonka=Lidzonka +controlledvocabulary.language.ligbi=Ligbi +controlledvocabulary.language.ligenza=Ligenza +controlledvocabulary.language.ligurian=Ligurian +controlledvocabulary.language.ligurian_(ancient)=Ligurian (Ancient) +controlledvocabulary.language.lihir=Lihir +controlledvocabulary.language.lijili=Lijili +controlledvocabulary.language.lika=Lika +controlledvocabulary.language.liki=Liki +controlledvocabulary.language.likila=Likila +controlledvocabulary.language.likuba=Likuba +controlledvocabulary.language.likum=Likum +controlledvocabulary.language.likwala=Likwala +controlledvocabulary.language.lilau=Lilau +controlledvocabulary.language.lillooet=Lillooet +controlledvocabulary.language.limassa=Limassa +controlledvocabulary.language.limbu=Limbu +controlledvocabulary.language.limbum=Limbum +controlledvocabulary.language.limburgan,_limburger,_limburgish=Limburgan, Limburger, Limburgish +controlledvocabulary.language.limi=Limi +controlledvocabulary.language.limilngan=Limilngan +controlledvocabulary.language.limos_kalinga=Limos Kalinga +controlledvocabulary.language.linear_a=Linear A +controlledvocabulary.language.lingala=Lingala +controlledvocabulary.language.lingao=Lingao +controlledvocabulary.language.lingarak=Lingarak +controlledvocabulary.language.lingua_franca=Lingua Franca +controlledvocabulary.language.lingua_franca_nova=Lingua Franca Nova +controlledvocabulary.language.lipan_apache=Lipan Apache +controlledvocabulary.language.lipo=Lipo +controlledvocabulary.language.lisabata-nuniali=Lisabata-Nuniali +controlledvocabulary.language.lisela=Lisela +controlledvocabulary.language.lish=Lish +controlledvocabulary.language.lishana_deni=Lishana Deni +controlledvocabulary.language.lishanid_noshan=Lishanid Noshan +controlledvocabulary.language.lish�n_did�n=Lish�n Did�n +controlledvocabulary.language.lisu=Lisu +controlledvocabulary.language.literary_chinese=Literary Chinese +controlledvocabulary.language.lithuanian=Lithuanian +controlledvocabulary.language.lithuanian_sign_language=Lithuanian Sign Language +controlledvocabulary.language.litzlitz=Litzlitz +controlledvocabulary.language.liujiang_zhuang=Liujiang Zhuang +controlledvocabulary.language.liuqian_zhuang=Liuqian Zhuang +controlledvocabulary.language.liv=Liv +controlledvocabulary.language.livvi=Livvi +controlledvocabulary.language.lo-toga=Lo-Toga +controlledvocabulary.language.loarki=Loarki +controlledvocabulary.language.lobala=Lobala +controlledvocabulary.language.lobi=Lobi +controlledvocabulary.language.lodhi=Lodhi +controlledvocabulary.language.logba=Logba +controlledvocabulary.language.logir=Logir +controlledvocabulary.language.logo=Logo +controlledvocabulary.language.logol=Logol +controlledvocabulary.language.logooli=Logooli +controlledvocabulary.language.logorik=Logorik +controlledvocabulary.language.lohorung=Lohorung +controlledvocabulary.language.loja_highland_quichua=Loja Highland Quichua +controlledvocabulary.language.lojban=Lojban +controlledvocabulary.language.lokaa=Lokaa +controlledvocabulary.language.loke=Loke +controlledvocabulary.language.loko=Loko +controlledvocabulary.language.lokoya=Lokoya +controlledvocabulary.language.lola=Lola +controlledvocabulary.language.lolak=Lolak +controlledvocabulary.language.lole=Lole +controlledvocabulary.language.lolo=Lolo +controlledvocabulary.language.loloda=Loloda +controlledvocabulary.language.lolopo=Lolopo +controlledvocabulary.language.loma_(c�te_d'ivoire)=Loma (C�te d'Ivoire) +controlledvocabulary.language.loma_(liberia)=Loma (Liberia) +controlledvocabulary.language.lomaiviti=Lomaiviti +controlledvocabulary.language.lomavren=Lomavren +controlledvocabulary.language.lombard=Lombard +controlledvocabulary.language.lombi=Lombi +controlledvocabulary.language.lombo=Lombo +controlledvocabulary.language.lomwe=Lomwe +controlledvocabulary.language.loncong=Loncong +controlledvocabulary.language.long_phuri_naga=Long Phuri Naga +controlledvocabulary.language.long_wat=Long Wat +controlledvocabulary.language.longgu=Longgu +controlledvocabulary.language.longto=Longto +controlledvocabulary.language.longuda=Longuda +controlledvocabulary.language.loniu=Loniu +controlledvocabulary.language.lonwolwol=Lonwolwol +controlledvocabulary.language.lonzo=Lonzo +controlledvocabulary.language.loo=Loo +controlledvocabulary.language.lopa=Lopa +controlledvocabulary.language.lopi=Lopi +controlledvocabulary.language.lopit=Lopit +controlledvocabulary.language.lorang=Lorang +controlledvocabulary.language.lorediakarkar=Lorediakarkar +controlledvocabulary.language.loreto-ucayali_spanish=Loreto-Ucayali Spanish +controlledvocabulary.language.lote=Lote +controlledvocabulary.language.lotha_naga=Lotha Naga +controlledvocabulary.language.lotud=Lotud +controlledvocabulary.language.lou=Lou +controlledvocabulary.language.louisiana_creole=Louisiana Creole +controlledvocabulary.language.loun=Loun +controlledvocabulary.language.loup_a=Loup A +controlledvocabulary.language.loup_b=Loup B +controlledvocabulary.language.low_german=Low German +controlledvocabulary.language.lower_burdekin=Lower Burdekin +controlledvocabulary.language.lower_chehalis=Lower Chehalis +controlledvocabulary.language.lower_grand_valley_dani=Lower Grand Valley Dani +controlledvocabulary.language.lower_nossob=Lower Nossob +controlledvocabulary.language.lower_silesian=Lower Silesian +controlledvocabulary.language.lower_sorbian=Lower Sorbian +controlledvocabulary.language.lower_southern_aranda=Lower Southern Aranda +controlledvocabulary.language.lower_ta'oih=Lower Ta'oih +controlledvocabulary.language.lower_tanana=Lower Tanana +controlledvocabulary.language.lowland_oaxaca_chontal=Lowland Oaxaca Chontal +controlledvocabulary.language.lowland_tarahumara=Lowland Tarahumara +controlledvocabulary.language.loxicha_zapotec=Loxicha Zapotec +controlledvocabulary.language.lozi=Lozi +controlledvocabulary.language.luang=Luang +controlledvocabulary.language.luba-katanga=Luba-Katanga +controlledvocabulary.language.luba-lulua=Luba-Lulua +controlledvocabulary.language.lubila=Lubila +controlledvocabulary.language.lubu=Lubu +controlledvocabulary.language.lubuagan_kalinga=Lubuagan Kalinga +controlledvocabulary.language.luchazi=Luchazi +controlledvocabulary.language.lucumi=Lucumi +controlledvocabulary.language.ludian=Ludian +controlledvocabulary.language.lufu=Lufu +controlledvocabulary.language.lugbara=Lugbara +controlledvocabulary.language.luguru=Luguru +controlledvocabulary.language.luhu=Luhu +controlledvocabulary.language.luimbi=Luimbi +controlledvocabulary.language.luiseno=Luiseno +controlledvocabulary.language.lukpa=Lukpa +controlledvocabulary.language.lule=Lule +controlledvocabulary.language.lule_sami=Lule Sami +controlledvocabulary.language.lumba-yakkha=Lumba-Yakkha +controlledvocabulary.language.lumbu=Lumbu +controlledvocabulary.language.lumun=Lumun +controlledvocabulary.language.luna=Luna +controlledvocabulary.language.lunanakha=Lunanakha +controlledvocabulary.language.lunda=Lunda +controlledvocabulary.language.lundayeh=Lundayeh +controlledvocabulary.language.lungalunga=Lungalunga +controlledvocabulary.language.lungga=Lungga +controlledvocabulary.language.luo_(cameroon)=Luo (Cameroon) +controlledvocabulary.language.luo_(kenya_and_tanzania)=Luo (Kenya and Tanzania) +controlledvocabulary.language.luopohe_hmong=Luopohe Hmong +controlledvocabulary.language.luri=Luri +controlledvocabulary.language.lusengo=Lusengo +controlledvocabulary.language.lushai=Lushai +controlledvocabulary.language.lushootseed=Lushootseed +controlledvocabulary.language.lusi=Lusi +controlledvocabulary.language.lusitanian=Lusitanian +controlledvocabulary.language.lutos=Lutos +controlledvocabulary.language.luvale=Luvale +controlledvocabulary.language.luwati=Luwati +controlledvocabulary.language.luwo=Luwo +controlledvocabulary.language.luxembourgish,_letzeburgesch=Luxembourgish, Letzeburgesch +controlledvocabulary.language.luyana=Luyana +controlledvocabulary.language.luyia=Luyia +controlledvocabulary.language.lwalu=Lwalu +controlledvocabulary.language.lwel=Lwel +controlledvocabulary.language.lycian=Lycian +controlledvocabulary.language.lydian=Lydian +controlledvocabulary.language.lyngngam=Lyngngam +controlledvocabulary.language.ly�l�=Ly�l� +controlledvocabulary.language.l�adan=L�adan +controlledvocabulary.language.l��_l��_bwamu=L�� L�� Bwamu +controlledvocabulary.language.l�=L� +controlledvocabulary.language.ma_(democratic_republic_of_congo)=Ma (Democratic Republic of Congo) +controlledvocabulary.language.ma_(papua_new_guinea)=Ma (Papua New Guinea) +controlledvocabulary.language.ma_manda=Ma Manda +controlledvocabulary.language.ma'anyan=Ma'anyan +controlledvocabulary.language.ma'di=Ma'di +controlledvocabulary.language.ma'ya=Ma'ya +controlledvocabulary.language.maa=Maa +controlledvocabulary.language.maaka=Maaka +controlledvocabulary.language.maasina_fulfulde=Maasina Fulfulde +controlledvocabulary.language.maay=Maay +controlledvocabulary.language.maba_(chad)=Maba (Chad) +controlledvocabulary.language.maba_(indonesia)=Maba (Indonesia) +controlledvocabulary.language.mabaale=Mabaale +controlledvocabulary.language.mabaan=Mabaan +controlledvocabulary.language.mabaka_valley_kalinga=Mabaka Valley Kalinga +controlledvocabulary.language.mabire=Mabire +controlledvocabulary.language.maca=Maca +controlledvocabulary.language.macaguaje=Macaguaje +controlledvocabulary.language.macagu�n=Macagu�n +controlledvocabulary.language.macanese=Macanese +controlledvocabulary.language.macedo-romanian=Macedo-Romanian +controlledvocabulary.language.macedonian=Macedonian +controlledvocabulary.language.machame=Machame +controlledvocabulary.language.machiguenga=Machiguenga +controlledvocabulary.language.machinere=Machinere +controlledvocabulary.language.machinga=Machinga +controlledvocabulary.language.maco=Maco +controlledvocabulary.language.macuna=Macuna +controlledvocabulary.language.macushi=Macushi +controlledvocabulary.language.mada_(cameroon)=Mada (Cameroon) +controlledvocabulary.language.mada_(nigeria)=Mada (Nigeria) +controlledvocabulary.language.madagascar_sign_language=Madagascar Sign Language +controlledvocabulary.language.madak=Madak +controlledvocabulary.language.madhi_madhi=Madhi Madhi +controlledvocabulary.language.madi=Madi +controlledvocabulary.language.madurese=Madurese +controlledvocabulary.language.mae=Mae +controlledvocabulary.language.maek=Maek +controlledvocabulary.language.maeng_itneg=Maeng Itneg +controlledvocabulary.language.mafa=Mafa +controlledvocabulary.language.mafea=Mafea +controlledvocabulary.language.mag-indi_ayta=Mag-Indi Ayta +controlledvocabulary.language.mag-antsi_ayta=Mag-antsi Ayta +controlledvocabulary.language.magahi=Magahi +controlledvocabulary.language.magbukun_ayta=Magbukun Ayta +controlledvocabulary.language.magdalena_pe�asco_mixtec=Magdalena Pe�asco Mixtec +controlledvocabulary.language.magoma=Magoma +controlledvocabulary.language.magori=Magori +controlledvocabulary.language.maguindanaon=Maguindanaon +controlledvocabulary.language.mag_(madang_province)=Mag? (Madang Province) +controlledvocabulary.language.magyi=Mag?yi +controlledvocabulary.language.mahali=Mahali +controlledvocabulary.language.mahasu_pahari=Mahasu Pahari +controlledvocabulary.language.mahican=Mahican +controlledvocabulary.language.mahongwe=Mahongwe +controlledvocabulary.language.mahou=Mahou +controlledvocabulary.language.mai_brat=Mai Brat +controlledvocabulary.language.maia=Maia +controlledvocabulary.language.maiadomu=Maiadomu +controlledvocabulary.language.maiani=Maiani +controlledvocabulary.language.maii=Maii +controlledvocabulary.language.mailu=Mailu +controlledvocabulary.language.maindo=Maindo +controlledvocabulary.language.mainfr�nkisch=Mainfr�nkisch +controlledvocabulary.language.mainstream_kenyah=Mainstream Kenyah +controlledvocabulary.language.mairasi=Mairasi +controlledvocabulary.language.maisin=Maisin +controlledvocabulary.language.maithili=Maithili +controlledvocabulary.language.maiwa_(indonesia)=Maiwa (Indonesia) +controlledvocabulary.language.maiwa_(papua_new_guinea)=Maiwa (Papua New Guinea) +controlledvocabulary.language.maiwala=Maiwala +controlledvocabulary.language.majang=Majang +controlledvocabulary.language.majera=Majera +controlledvocabulary.language.majhi=Majhi +controlledvocabulary.language.majhwar=Majhwar +controlledvocabulary.language.majukayang_kalinga=Majukayang Kalinga +controlledvocabulary.language.mak_(china)=Mak (China) +controlledvocabulary.language.mak_(nigeria)=Mak (Nigeria) +controlledvocabulary.language.makaa=Makaa +controlledvocabulary.language.makah=Makah +controlledvocabulary.language.makalero=Makalero +controlledvocabulary.language.makasae=Makasae +controlledvocabulary.language.makasar=Makasar +controlledvocabulary.language.makassar_malay=Makassar Malay +controlledvocabulary.language.makayam=Makayam +controlledvocabulary.language.makhuwa=Makhuwa +controlledvocabulary.language.makhuwa-marrevone=Makhuwa-Marrevone +controlledvocabulary.language.makhuwa-meetto=Makhuwa-Meetto +controlledvocabulary.language.makhuwa-moniga=Makhuwa-Moniga +controlledvocabulary.language.makhuwa-saka=Makhuwa-Saka +controlledvocabulary.language.makhuwa-shirima=Makhuwa-Shirima +controlledvocabulary.language.maklew=Maklew +controlledvocabulary.language.makolkol=Makolkol +controlledvocabulary.language.makonde=Makonde +controlledvocabulary.language.maku'a=Maku'a +controlledvocabulary.language.makuri_naga=Makuri Naga +controlledvocabulary.language.makur�p=Makur�p +controlledvocabulary.language.makwe=Makwe +controlledvocabulary.language.makyan_naga=Makyan Naga +controlledvocabulary.language.mal=Mal +controlledvocabulary.language.mal_paharia=Mal Paharia +controlledvocabulary.language.mala_(nigeria)=Mala (Nigeria) +controlledvocabulary.language.mala_(papua_new_guinea)=Mala (Papua New Guinea) +controlledvocabulary.language.mala_malasar=Mala Malasar +controlledvocabulary.language.malaccan_creole_malay=Malaccan Creole Malay +controlledvocabulary.language.malaccan_creole_portuguese=Malaccan Creole Portuguese +controlledvocabulary.language.malagasy=Malagasy +controlledvocabulary.language.malak_malak=Malak Malak +controlledvocabulary.language.malalamai=Malalamai +controlledvocabulary.language.malango=Malango +controlledvocabulary.language.malankuravan=Malankuravan +controlledvocabulary.language.malapandaram=Malapandaram +controlledvocabulary.language.malaryan=Malaryan +controlledvocabulary.language.malas=Malas +controlledvocabulary.language.malasar=Malasar +controlledvocabulary.language.malavedan=Malavedan +controlledvocabulary.language.malawi_lomwe=Malawi Lomwe +controlledvocabulary.language.malawi_sena=Malawi Sena +controlledvocabulary.language.malawian_sign_language=Malawian Sign Language +controlledvocabulary.language.malay=Malay +controlledvocabulary.language.malay_(individual_language)=Malay (individual language) +controlledvocabulary.language.malayalam=Malayalam +controlledvocabulary.language.malayic_dayak=Malayic Dayak +controlledvocabulary.language.malaynon=Malaynon +controlledvocabulary.language.malayo=Malayo +controlledvocabulary.language.malaysian_sign_language=Malaysian Sign Language +controlledvocabulary.language.malba_birifor=Malba Birifor +controlledvocabulary.language.maldivian,_dhivehi,_divehi=Maldivian, Dhivehi, Divehi +controlledvocabulary.language.male_(ethiopia)=Male (Ethiopia) +controlledvocabulary.language.male_(papua_new_guinea)=Male (Papua New Guinea) +controlledvocabulary.language.malecite-passamaquoddy=Malecite-Passamaquoddy +controlledvocabulary.language.maleng=Maleng +controlledvocabulary.language.maleu-kilenge=Maleu-Kilenge +controlledvocabulary.language.malfaxal=Malfaxal +controlledvocabulary.language.malgana=Malgana +controlledvocabulary.language.malgbe=Malgbe +controlledvocabulary.language.mali=Mali +controlledvocabulary.language.malila=Malila +controlledvocabulary.language.malimba=Malimba +controlledvocabulary.language.malimpung=Malimpung +controlledvocabulary.language.malinaltepec_me'phaa=Malinaltepec Me'phaa +controlledvocabulary.language.malo=Malo +controlledvocabulary.language.malol=Malol +controlledvocabulary.language.maltese=Maltese +controlledvocabulary.language.maltese_sign_language=Maltese Sign Language +controlledvocabulary.language.malua_bay=Malua Bay +controlledvocabulary.language.malvi=Malvi +controlledvocabulary.language.malyangapa=Malyangapa +controlledvocabulary.language.mal�ku_ja�ka=Mal�ku Ja�ka +controlledvocabulary.language.mam=Mam +controlledvocabulary.language.mama=Mama +controlledvocabulary.language.mamaa=Mamaa +controlledvocabulary.language.mamaind�=Mamaind� +controlledvocabulary.language.mamanwa=Mamanwa +controlledvocabulary.language.mamara_senoufo=Mamara Senoufo +controlledvocabulary.language.mamasa=Mamasa +controlledvocabulary.language.mambae=Mambae +controlledvocabulary.language.mambai=Mambai +controlledvocabulary.language.mamboru=Mamboru +controlledvocabulary.language.mambwe-lungu=Mambwe-Lungu +controlledvocabulary.language.mampruli=Mampruli +controlledvocabulary.language.mamuju=Mamuju +controlledvocabulary.language.mamulique=Mamulique +controlledvocabulary.language.mamusi=Mamusi +controlledvocabulary.language.mamvu=Mamvu +controlledvocabulary.language.man_met=Man Met +controlledvocabulary.language.manado_malay=Manado Malay +controlledvocabulary.language.manam=Manam +controlledvocabulary.language.manambu=Manambu +controlledvocabulary.language.manangba=Manangba +controlledvocabulary.language.manangkari=Manangkari +controlledvocabulary.language.manchu=Manchu +controlledvocabulary.language.manda_(australia)=Manda (Australia) +controlledvocabulary.language.manda_(india)=Manda (India) +controlledvocabulary.language.manda_(tanzania)=Manda (Tanzania) +controlledvocabulary.language.mandahuaca=Mandahuaca +controlledvocabulary.language.mandaic=Mandaic +controlledvocabulary.language.mandan=Mandan +controlledvocabulary.language.mandandanyi=Mandandanyi +controlledvocabulary.language.mandar=Mandar +controlledvocabulary.language.mandara=Mandara +controlledvocabulary.language.mandari=Mandari +controlledvocabulary.language.mandarin_chinese=Mandarin Chinese +controlledvocabulary.language.mandaya=Mandaya +controlledvocabulary.language.mandeali=Mandeali +controlledvocabulary.language.mander=Mander +controlledvocabulary.language.mandingo=Mandingo +controlledvocabulary.language.mandinka=Mandinka +controlledvocabulary.language.mandjak=Mandjak +controlledvocabulary.language.mandobo_atas=Mandobo Atas +controlledvocabulary.language.mandobo_bawah=Mandobo Bawah +controlledvocabulary.language.manem=Manem +controlledvocabulary.language.mang=Mang +controlledvocabulary.language.manga_kanuri=Manga Kanuri +controlledvocabulary.language.mangala=Mangala +controlledvocabulary.language.mangareva=Mangareva +controlledvocabulary.language.mangarrayi=Mangarrayi +controlledvocabulary.language.mangas=Mangas +controlledvocabulary.language.mangayat=Mangayat +controlledvocabulary.language.mangbetu=Mangbetu +controlledvocabulary.language.mangbutu=Mangbutu +controlledvocabulary.language.mangerr=Mangerr +controlledvocabulary.language.mangga_buang=Mangga Buang +controlledvocabulary.language.manggarai=Manggarai +controlledvocabulary.language.mango=Mango +controlledvocabulary.language.mangole=Mangole +controlledvocabulary.language.mangseng=Mangseng +controlledvocabulary.language.mangue=Mangue +controlledvocabulary.language.manichaean_middle_persian=Manichaean Middle Persian +controlledvocabulary.language.manide=Manide +controlledvocabulary.language.manikion=Manikion +controlledvocabulary.language.manipa=Manipa +controlledvocabulary.language.manipuri=Manipuri +controlledvocabulary.language.mankanya=Mankanya +controlledvocabulary.language.mankiyali=Mankiyali +controlledvocabulary.language.manna-dora=Manna-Dora +controlledvocabulary.language.mannan=Mannan +controlledvocabulary.language.mano=Mano +controlledvocabulary.language.manombai=Manombai +controlledvocabulary.language.mansaka=Mansaka +controlledvocabulary.language.mansi=Mansi +controlledvocabulary.language.mansoanka=Mansoanka +controlledvocabulary.language.manta=Manta +controlledvocabulary.language.mantsi=Mantsi +controlledvocabulary.language.manumanaw_karen=Manumanaw Karen +controlledvocabulary.language.manx=Manx +controlledvocabulary.language.manya=Manya +controlledvocabulary.language.manyawa=Manyawa +controlledvocabulary.language.manyika=Manyika +controlledvocabulary.language.manza=Manza +controlledvocabulary.language.mao_naga=Mao Naga +controlledvocabulary.language.maonan=Maonan +controlledvocabulary.language.maore_comorian=Maore Comorian +controlledvocabulary.language.mape=Mape +controlledvocabulary.language.mapena=Mapena +controlledvocabulary.language.mapia=Mapia +controlledvocabulary.language.mapidian=Mapidian +controlledvocabulary.language.mapos_buang=Mapos Buang +controlledvocabulary.language.mapoyo=Mapoyo +controlledvocabulary.language.mapudungun=Mapudungun +controlledvocabulary.language.mapun=Mapun +controlledvocabulary.language.maquiritari=Maquiritari +controlledvocabulary.language.mara_chin=Mara Chin +controlledvocabulary.language.marachi=Marachi +controlledvocabulary.language.maraghei=Maraghei +controlledvocabulary.language.maragus=Maragus +controlledvocabulary.language.maram_naga=Maram Naga +controlledvocabulary.language.marama=Marama +controlledvocabulary.language.maranao=Maranao +controlledvocabulary.language.maranunggu=Maranunggu +controlledvocabulary.language.mararit=Mararit +controlledvocabulary.language.marathi_(marh)=Marathi (Mar??h?) +controlledvocabulary.language.marau=Marau +controlledvocabulary.language.marba=Marba +controlledvocabulary.language.mardin_sign_language=Mardin Sign Language +controlledvocabulary.language.maremgi=Maremgi +controlledvocabulary.language.marenje=Marenje +controlledvocabulary.language.marfa=Marfa +controlledvocabulary.language.margany=Margany +controlledvocabulary.language.marghi_central=Marghi Central +controlledvocabulary.language.marghi_south=Marghi South +controlledvocabulary.language.margos-yarowilca-lauricocha_quechua=Margos-Yarowilca-Lauricocha Quechua +controlledvocabulary.language.margu=Margu +controlledvocabulary.language.mari_(east_sepik_province)=Mari (East Sepik Province) +controlledvocabulary.language.mari_(madang_province)=Mari (Madang Province) +controlledvocabulary.language.mari_(russia)=Mari (Russia) +controlledvocabulary.language.maria_(india)=Maria (India) +controlledvocabulary.language.maria_(papua_new_guinea)=Maria (Papua New Guinea) +controlledvocabulary.language.maricopa=Maricopa +controlledvocabulary.language.maridan=Maridan +controlledvocabulary.language.maridjabin=Maridjabin +controlledvocabulary.language.marik=Marik +controlledvocabulary.language.marimanindji=Marimanindji +controlledvocabulary.language.marind=Marind +controlledvocabulary.language.maring=Maring +controlledvocabulary.language.maring_naga=Maring Naga +controlledvocabulary.language.maringarr=Maringarr +controlledvocabulary.language.marino=Marino +controlledvocabulary.language.mariri=Mariri +controlledvocabulary.language.maritime_sign_language=Maritime Sign Language +controlledvocabulary.language.maritsau�=Maritsau� +controlledvocabulary.language.mariyedi=Mariyedi +controlledvocabulary.language.marka=Marka +controlledvocabulary.language.markweeta=Markweeta +controlledvocabulary.language.marma=Marma +controlledvocabulary.language.marovo=Marovo +controlledvocabulary.language.marra=Marra +controlledvocabulary.language.marriammu=Marriammu +controlledvocabulary.language.marrithiyel=Marrithiyel +controlledvocabulary.language.marrucinian=Marrucinian +controlledvocabulary.language.marshallese=Marshallese +controlledvocabulary.language.marsian=Marsian +controlledvocabulary.language.martha's_vineyard_sign_language=Martha's Vineyard Sign Language +controlledvocabulary.language.marti_ke=Marti Ke +controlledvocabulary.language.martu_wangka=Martu Wangka +controlledvocabulary.language.martuyhunira=Martuyhunira +controlledvocabulary.language.maru=Maru +controlledvocabulary.language.marwari=Marwari +controlledvocabulary.language.marwari_(india)=Marwari (India) +controlledvocabulary.language.marwari_(pakistan)=Marwari (Pakistan) +controlledvocabulary.language.mar�bo=Mar�bo +controlledvocabulary.language.masaaba=Masaaba +controlledvocabulary.language.masadiit_itneg=Masadiit Itneg +controlledvocabulary.language.masai=Masai +controlledvocabulary.language.masalit=Masalit +controlledvocabulary.language.masana=Masana +controlledvocabulary.language.masbatenyo=Masbatenyo +controlledvocabulary.language.mashco_piro=Mashco Piro +controlledvocabulary.language.mashi_(nigeria)=Mashi (Nigeria) +controlledvocabulary.language.mashi_(zambia)=Mashi (Zambia) +controlledvocabulary.language.masikoro_malagasy=Masikoro Malagasy +controlledvocabulary.language.masimasi=Masimasi +controlledvocabulary.language.masiwang=Masiwang +controlledvocabulary.language.maskelynes=Maskelynes +controlledvocabulary.language.maslam=Maslam +controlledvocabulary.language.masmaje=Masmaje +controlledvocabulary.language.massalat=Massalat +controlledvocabulary.language.massep=Massep +controlledvocabulary.language.matagalpa=Matagalpa +controlledvocabulary.language.matal=Matal +controlledvocabulary.language.matambwe=Matambwe +controlledvocabulary.language.matbat=Matbat +controlledvocabulary.language.matengo=Matengo +controlledvocabulary.language.matepi=Matepi +controlledvocabulary.language.matigsalug_manobo=Matigsalug Manobo +controlledvocabulary.language.matipuhy=Matipuhy +controlledvocabulary.language.matngala=Matngala +controlledvocabulary.language.mato=Mato +controlledvocabulary.language.mato_grosso_ar�ra=Mato Grosso Ar�ra +controlledvocabulary.language.mator=Mator +controlledvocabulary.language.mats�s=Mats�s +controlledvocabulary.language.mattole=Mattole +controlledvocabulary.language.matu_chin=Matu Chin +controlledvocabulary.language.matukar=Matukar +controlledvocabulary.language.matumbi=Matumbi +controlledvocabulary.language.matya_samo=Matya Samo +controlledvocabulary.language.mat�s=Mat�s +controlledvocabulary.language.maung=Maung +controlledvocabulary.language.mauritian_sign_language=Mauritian Sign Language +controlledvocabulary.language.mauwake=Mauwake +controlledvocabulary.language.mawa_(chad)=Mawa (Chad) +controlledvocabulary.language.mawa_(nigeria)=Mawa (Nigeria) +controlledvocabulary.language.mawak=Mawak +controlledvocabulary.language.mawan=Mawan +controlledvocabulary.language.mawayana=Mawayana +controlledvocabulary.language.mawchi=Mawchi +controlledvocabulary.language.mawes=Mawes +controlledvocabulary.language.maxakal�=Maxakal� +controlledvocabulary.language.maxi_gbe=Maxi Gbe +controlledvocabulary.language.maya_samo=Maya Samo +controlledvocabulary.language.mayaguduna=Mayaguduna +controlledvocabulary.language.mayangna=Mayangna +controlledvocabulary.language.mayawali=Mayawali +controlledvocabulary.language.mayeka=Mayeka +controlledvocabulary.language.mayi-kulan=Mayi-Kulan +controlledvocabulary.language.mayi-thakurti=Mayi-Thakurti +controlledvocabulary.language.mayi-yapi=Mayi-Yapi +controlledvocabulary.language.mayo=Mayo +controlledvocabulary.language.mayogo=Mayogo +controlledvocabulary.language.mayoyao_ifugao=Mayoyao Ifugao +controlledvocabulary.language.mazagway=Mazagway +controlledvocabulary.language.mazaltepec_zapotec=Mazaltepec Zapotec +controlledvocabulary.language.mazanderani=Mazanderani +controlledvocabulary.language.mazatl�n_mazatec=Mazatl�n Mazatec +controlledvocabulary.language.mazatl�n_mixe=Mazatl�n Mixe +controlledvocabulary.language.mba=Mba +controlledvocabulary.language.mbala=Mbala +controlledvocabulary.language.mbalanhu=Mbalanhu +controlledvocabulary.language.mbandja=Mbandja +controlledvocabulary.language.mbangala=Mbangala +controlledvocabulary.language.mbangi=Mbangi +controlledvocabulary.language.mbangwe=Mbangwe +controlledvocabulary.language.mbara_(australia)=Mbara (Australia) +controlledvocabulary.language.mbara_(chad)=Mbara (Chad) +controlledvocabulary.language.mbariman-gudhinma=Mbariman-Gudhinma +controlledvocabulary.language.mbati=Mbati +controlledvocabulary.language.mbato=Mbato +controlledvocabulary.language.mbay=Mbay +controlledvocabulary.language.mbe=Mbe +controlledvocabulary.language.mbe'=Mbe' +controlledvocabulary.language.mbelime=Mbelime +controlledvocabulary.language.mbere=Mbere +controlledvocabulary.language.mbesa=Mbesa +controlledvocabulary.language.mbessa=Mbessa +controlledvocabulary.language.mbo_(cameroon)=Mbo (Cameroon) +controlledvocabulary.language.mbo_(democratic_republic_of_congo)=Mbo (Democratic Republic of Congo) +controlledvocabulary.language.mboi=Mboi +controlledvocabulary.language.mboko=Mboko +controlledvocabulary.language.mbole=Mbole +controlledvocabulary.language.mbonga=Mbonga +controlledvocabulary.language.mbongno=Mbongno +controlledvocabulary.language.mbosi=Mbosi +controlledvocabulary.language.mbowe=Mbowe +controlledvocabulary.language.mbre=Mbre +controlledvocabulary.language.mbudum=Mbudum +controlledvocabulary.language.mbugu=Mbugu +controlledvocabulary.language.mbugwe=Mbugwe +controlledvocabulary.language.mbuk=Mbuk +controlledvocabulary.language.mbuko=Mbuko +controlledvocabulary.language.mbukushu=Mbukushu +controlledvocabulary.language.mbula=Mbula +controlledvocabulary.language.mbula-bwazza=Mbula-Bwazza +controlledvocabulary.language.mbule=Mbule +controlledvocabulary.language.mbulungish=Mbulungish +controlledvocabulary.language.mbum=Mbum +controlledvocabulary.language.mbunda=Mbunda +controlledvocabulary.language.mbunga=Mbunga +controlledvocabulary.language.mburku=Mburku +controlledvocabulary.language.mbwela=Mbwela +controlledvocabulary.language.mby�_guaran�=Mby� Guaran� +controlledvocabulary.language.me'en=Me'en +controlledvocabulary.language.medebur=Medebur +controlledvocabulary.language.medefaidrin=Medefaidrin +controlledvocabulary.language.media_lengua=Media Lengua +controlledvocabulary.language.median=Median +controlledvocabulary.language.mednyj_aleut=Mednyj Aleut +controlledvocabulary.language.medumba=Medumba +controlledvocabulary.language.mefele=Mefele +controlledvocabulary.language.megam=Megam +controlledvocabulary.language.megleno_romanian=Megleno Romanian +controlledvocabulary.language.mehek=Mehek +controlledvocabulary.language.mehin�ku=Mehin�ku +controlledvocabulary.language.mehri=Mehri +controlledvocabulary.language.mekeo=Mekeo +controlledvocabulary.language.mekmek=Mekmek +controlledvocabulary.language.mekwei=Mekwei +controlledvocabulary.language.mel-khaonh=Mel-Khaonh +controlledvocabulary.language.mele-fila=Mele-Fila +controlledvocabulary.language.melo=Melo +controlledvocabulary.language.melpa=Melpa +controlledvocabulary.language.memoni=Memoni +controlledvocabulary.language.mendalam_kayan=Mendalam Kayan +controlledvocabulary.language.mendankwe-nkwen=Mendankwe-Nkwen +controlledvocabulary.language.mende_(papua_new_guinea)=Mende (Papua New Guinea) +controlledvocabulary.language.mende_(sierra_leone)=Mende (Sierra Leone) +controlledvocabulary.language.mengaka=Mengaka +controlledvocabulary.language.mengen=Mengen +controlledvocabulary.language.mengisa=Mengisa +controlledvocabulary.language.menka=Menka +controlledvocabulary.language.menominee=Menominee +controlledvocabulary.language.mentawai=Mentawai +controlledvocabulary.language.menya=Menya +controlledvocabulary.language.meoswar=Meoswar +controlledvocabulary.language.mer=Mer +controlledvocabulary.language.meramera=Meramera +controlledvocabulary.language.merei=Merei +controlledvocabulary.language.merey=Merey +controlledvocabulary.language.meriam_mir=Meriam Mir +controlledvocabulary.language.merlav=Merlav +controlledvocabulary.language.meroitic=Meroitic +controlledvocabulary.language.meru=Meru +controlledvocabulary.language.merwari=Merwari +controlledvocabulary.language.mesaka=Mesaka +controlledvocabulary.language.mescalero-chiricahua_apache=Mescalero-Chiricahua Apache +controlledvocabulary.language.mese=Mese +controlledvocabulary.language.meskwaki=Meskwaki +controlledvocabulary.language.mesme=Mesme +controlledvocabulary.language.mesmes=Mesmes +controlledvocabulary.language.mesopotamian_arabic=Mesopotamian Arabic +controlledvocabulary.language.mesqan=Mesqan +controlledvocabulary.language.messapic=Messapic +controlledvocabulary.language.meta'=Meta' +controlledvocabulary.language.metlat�noc_mixtec=Metlat�noc Mixtec +controlledvocabulary.language.mewari=Mewari +controlledvocabulary.language.mewati=Mewati +controlledvocabulary.language.mexican_sign_language=Mexican Sign Language +controlledvocabulary.language.meyah=Meyah +controlledvocabulary.language.mezontla_popoloca=Mezontla Popoloca +controlledvocabulary.language.mezquital_otomi=Mezquital Otomi +controlledvocabulary.language.mfinu=Mfinu +controlledvocabulary.language.mfumte=Mfumte +controlledvocabulary.language.mgbolizhia=Mgbolizhia +controlledvocabulary.language.mi'kmaq=Mi'kmaq +controlledvocabulary.language.miahuatl�n_zapotec=Miahuatl�n Zapotec +controlledvocabulary.language.miami=Miami +controlledvocabulary.language.mian=Mian +controlledvocabulary.language.miani=Miani +controlledvocabulary.language.michif=Michif +controlledvocabulary.language.michigamea=Michigamea +controlledvocabulary.language.michoac�n_mazahua=Michoac�n Mazahua +controlledvocabulary.language.michoac�n_nahuatl=Michoac�n Nahuatl +controlledvocabulary.language.mid_grand_valley_dani=Mid Grand Valley Dani +controlledvocabulary.language.mid-southern_banda=Mid-Southern Banda +controlledvocabulary.language.middle_armenian=Middle Armenian +controlledvocabulary.language.middle_breton=Middle Breton +controlledvocabulary.language.middle_cornish=Middle Cornish +controlledvocabulary.language.middle_dutch_(ca._1050-1350)=Middle Dutch (ca. 1050-1350) +controlledvocabulary.language.middle_english_(1100-1500)=Middle English (1100-1500) +controlledvocabulary.language.middle_french_(ca._1400-1600)=Middle French (ca. 1400-1600) +controlledvocabulary.language.middle_high_german_(ca._1050-1500)=Middle High German (ca. 1050-1500) +controlledvocabulary.language.middle_hittite=Middle Hittite +controlledvocabulary.language.middle_irish_(900-1200)=Middle Irish (900-1200) +controlledvocabulary.language.middle_khmer_(1400_to_1850_ce)=Middle Khmer (1400 to 1850 CE) +controlledvocabulary.language.middle_korean_(10th-16th_cent.)=Middle Korean (10th-16th cent.) +controlledvocabulary.language.middle_low_german=Middle Low German +controlledvocabulary.language.middle_mongolian=Middle Mongolian +controlledvocabulary.language.middle_newar=Middle Newar +controlledvocabulary.language.middle_watut=Middle Watut +controlledvocabulary.language.middle_welsh=Middle Welsh +controlledvocabulary.language.midob=Midob +controlledvocabulary.language.migaama=Migaama +controlledvocabulary.language.migabac=Migabac +controlledvocabulary.language.migum=Migum +controlledvocabulary.language.miju-mishmi=Miju-Mishmi +controlledvocabulary.language.mikasuki=Mikasuki +controlledvocabulary.language.mili=Mili +controlledvocabulary.language.miltu=Miltu +controlledvocabulary.language.miluk=Miluk +controlledvocabulary.language.milyan=Milyan +controlledvocabulary.language.min_bei_chinese=Min Bei Chinese +controlledvocabulary.language.min_dong_chinese=Min Dong Chinese +controlledvocabulary.language.min_nan_chinese=Min Nan Chinese +controlledvocabulary.language.min_zhong_chinese=Min Zhong Chinese +controlledvocabulary.language.mina_(cameroon)=Mina (Cameroon) +controlledvocabulary.language.minaean=Minaean +controlledvocabulary.language.minang=Minang +controlledvocabulary.language.minangkabau=Minangkabau +controlledvocabulary.language.minanibai=Minanibai +controlledvocabulary.language.minaveha=Minaveha +controlledvocabulary.language.minderico=Minderico +controlledvocabulary.language.mindiri=Mindiri +controlledvocabulary.language.mingang_doso=Mingang Doso +controlledvocabulary.language.mingrelian=Mingrelian +controlledvocabulary.language.minica_huitoto=Minica Huitoto +controlledvocabulary.language.minidien=Minidien +controlledvocabulary.language.minjungbal=Minjungbal +controlledvocabulary.language.minkin=Minkin +controlledvocabulary.language.minoan=Minoan +controlledvocabulary.language.minokok=Minokok +controlledvocabulary.language.minriq=Minriq +controlledvocabulary.language.mintil=Mintil +controlledvocabulary.language.minz_zhuang=Minz Zhuang +controlledvocabulary.language.miqie=Miqie +controlledvocabulary.language.mirandese=Mirandese +controlledvocabulary.language.miraya_bikol=Miraya Bikol +controlledvocabulary.language.mirgan=Mirgan +controlledvocabulary.language.miriti=Miriti +controlledvocabulary.language.miriwoong=Miriwoong +controlledvocabulary.language.miriwoong_sign_language=Miriwoong Sign Language +controlledvocabulary.language.mirning=Mirning +controlledvocabulary.language.miship=Miship +controlledvocabulary.language.misima-panaeati=Misima-Panaeati +controlledvocabulary.language.mising=Mising +controlledvocabulary.language.mitla_zapotec=Mitla Zapotec +controlledvocabulary.language.mitlatongo_mixtec=Mitlatongo Mixtec +controlledvocabulary.language.mittu=Mittu +controlledvocabulary.language.mituku=Mituku +controlledvocabulary.language.miu=Miu +controlledvocabulary.language.miwa=Miwa +controlledvocabulary.language.mixed_great_andamanese=Mixed Great Andamanese +controlledvocabulary.language.mixtepec_mixtec=Mixtepec Mixtec +controlledvocabulary.language.mixtepec_zapotec=Mixtepec Zapotec +controlledvocabulary.language.miya=Miya +controlledvocabulary.language.miyako=Miyako +controlledvocabulary.language.miyakubo_sign_language=Miyakubo Sign Language +controlledvocabulary.language.miyobe=Miyobe +controlledvocabulary.language.mlabri=Mlabri +controlledvocabulary.language.mlahs�=Mlahs� +controlledvocabulary.language.mlap=Mlap +controlledvocabulary.language.mlomp=Mlomp +controlledvocabulary.language.mmaala=Mmaala +controlledvocabulary.language.mmen=Mmen +controlledvocabulary.language.mo'da=Mo'da +controlledvocabulary.language.moabite=Moabite +controlledvocabulary.language.moba=Moba +controlledvocabulary.language.mobilian=Mobilian +controlledvocabulary.language.mobumrin_aizi=Mobumrin Aizi +controlledvocabulary.language.mobwa_karen=Mobwa Karen +controlledvocabulary.language.mochi=Mochi +controlledvocabulary.language.mochica=Mochica +controlledvocabulary.language.mocho=Mocho +controlledvocabulary.language.mocov�=Mocov� +controlledvocabulary.language.modang=Modang +controlledvocabulary.language.modole=Modole +controlledvocabulary.language.moere=Moere +controlledvocabulary.language.mofu-gudur=Mofu-Gudur +controlledvocabulary.language.mogholi=Mogholi +controlledvocabulary.language.mogofin=Mogofin +controlledvocabulary.language.mogum=Mogum +controlledvocabulary.language.mohave=Mohave +controlledvocabulary.language.mohawk=Mohawk +controlledvocabulary.language.mohegan-pequot=Mohegan-Pequot +controlledvocabulary.language.moi_(congo)=Moi (Congo) +controlledvocabulary.language.moi_(indonesia)=Moi (Indonesia) +controlledvocabulary.language.moikodi=Moikodi +controlledvocabulary.language.moingi=Moingi +controlledvocabulary.language.moji=Moji +controlledvocabulary.language.mok=Mok +controlledvocabulary.language.mokati=Mokati +controlledvocabulary.language.moken=Moken +controlledvocabulary.language.mokerang=Mokerang +controlledvocabulary.language.mokilese=Mokilese +controlledvocabulary.language.moklen=Moklen +controlledvocabulary.language.mokole=Mokole +controlledvocabulary.language.mokpwe=Mokpwe +controlledvocabulary.language.moksela=Moksela +controlledvocabulary.language.moksha=Moksha +controlledvocabulary.language.molale=Molale +controlledvocabulary.language.molbog=Molbog +controlledvocabulary.language.moldova_sign_language=Moldova Sign Language +controlledvocabulary.language.molengue=Molengue +controlledvocabulary.language.molima=Molima +controlledvocabulary.language.molmo_one=Molmo One +controlledvocabulary.language.molo=Molo +controlledvocabulary.language.molof=Molof +controlledvocabulary.language.moloko=Moloko +controlledvocabulary.language.mom_jango=Mom Jango +controlledvocabulary.language.moma=Moma +controlledvocabulary.language.momare=Momare +controlledvocabulary.language.mombo_dogon=Mombo Dogon +controlledvocabulary.language.mombum=Mombum +controlledvocabulary.language.momina=Momina +controlledvocabulary.language.momuna=Momuna +controlledvocabulary.language.mon=Mon +controlledvocabulary.language.monastic_sign_language=Monastic Sign Language +controlledvocabulary.language.mondropolon=Mondropolon +controlledvocabulary.language.mond�=Mond� +controlledvocabulary.language.mongo=Mongo +controlledvocabulary.language.mongol=Mongol +controlledvocabulary.language.mongolia_buriat=Mongolia Buriat +controlledvocabulary.language.mongolian=Mongolian +controlledvocabulary.language.mongolian_sign_language=Mongolian Sign Language +controlledvocabulary.language.mongondow=Mongondow +controlledvocabulary.language.moni=Moni +controlledvocabulary.language.mono_(cameroon)=Mono (Cameroon) +controlledvocabulary.language.mono_(democratic_republic_of_congo)=Mono (Democratic Republic of Congo) +controlledvocabulary.language.mono_(solomon_islands)=Mono (Solomon Islands) +controlledvocabulary.language.mono_(usa)=Mono (USA) +controlledvocabulary.language.monom=Monom +controlledvocabulary.language.monsang_naga=Monsang Naga +controlledvocabulary.language.montenegrin=Montenegrin +controlledvocabulary.language.montol=Montol +controlledvocabulary.language.monumbo=Monumbo +controlledvocabulary.language.monzombo=Monzombo +controlledvocabulary.language.moo=Moo +controlledvocabulary.language.moose_cree=Moose Cree +controlledvocabulary.language.mop�n_maya=Mop�n Maya +controlledvocabulary.language.mor_(bomberai_peninsula)=Mor (Bomberai Peninsula) +controlledvocabulary.language.mor_(mor_islands)=Mor (Mor Islands) +controlledvocabulary.language.moraid=Moraid +controlledvocabulary.language.morawa=Morawa +controlledvocabulary.language.morelos_nahuatl=Morelos Nahuatl +controlledvocabulary.language.morerebi=Morerebi +controlledvocabulary.language.moresada=Moresada +controlledvocabulary.language.mori_atas=Mori Atas +controlledvocabulary.language.mori_bawah=Mori Bawah +controlledvocabulary.language.morigi=Morigi +controlledvocabulary.language.moriori=Moriori +controlledvocabulary.language.morisyen=Morisyen +controlledvocabulary.language.moro=Moro +controlledvocabulary.language.moroccan_arabic=Moroccan Arabic +controlledvocabulary.language.moroccan_sign_language=Moroccan Sign Language +controlledvocabulary.language.morokodo=Morokodo +controlledvocabulary.language.morom=Morom +controlledvocabulary.language.moronene=Moronene +controlledvocabulary.language.morori=Morori +controlledvocabulary.language.morouas=Morouas +controlledvocabulary.language.morrobalama=Morrobalama +controlledvocabulary.language.mortlockese=Mortlockese +controlledvocabulary.language.moru=Moru +controlledvocabulary.language.mosimo=Mosimo +controlledvocabulary.language.moskona=Moskona +controlledvocabulary.language.mossi=Mossi +controlledvocabulary.language.mota=Mota +controlledvocabulary.language.motlav=Motlav +controlledvocabulary.language.motu=Motu +controlledvocabulary.language.mouk-aria=Mouk-Aria +controlledvocabulary.language.moundadan_chetty=Moundadan Chetty +controlledvocabulary.language.mountain_koiali=Mountain Koiali +controlledvocabulary.language.mouwase=Mouwase +controlledvocabulary.language.movima=Movima +controlledvocabulary.language.moyadan_itneg=Moyadan Itneg +controlledvocabulary.language.moyon_naga=Moyon Naga +controlledvocabulary.language.mozambican_sign_language=Mozambican Sign Language +controlledvocabulary.language.mozarabic=Mozarabic +controlledvocabulary.language.mpade=Mpade +controlledvocabulary.language.mpalitjanh=Mpalitjanh +controlledvocabulary.language.mpi=Mpi +controlledvocabulary.language.mpiemo=Mpiemo +controlledvocabulary.language.mpinda=Mpinda +controlledvocabulary.language.mpoto=Mpoto +controlledvocabulary.language.mpotovoro=Mpotovoro +controlledvocabulary.language.mpumpong=Mpumpong +controlledvocabulary.language.mpuono=Mpuono +controlledvocabulary.language.mpur=Mpur +controlledvocabulary.language.mro-khimi_chin=Mro-Khimi Chin +controlledvocabulary.language.mru=Mru +controlledvocabulary.language.mser=Mser +controlledvocabulary.language.mt._iraya_agta=Mt. Iraya Agta +controlledvocabulary.language.mt._iriga_agta=Mt. Iriga Agta +controlledvocabulary.language.muak_sa-aak=Muak Sa-aak +controlledvocabulary.language.mualang=Mualang +controlledvocabulary.language.mubami=Mubami +controlledvocabulary.language.mubi=Mubi +controlledvocabulary.language.muda=Muda +controlledvocabulary.language.mudburra=Mudburra +controlledvocabulary.language.mudhili_gadaba=Mudhili Gadaba +controlledvocabulary.language.mudu_koraga=Mudu Koraga +controlledvocabulary.language.muduga=Muduga +controlledvocabulary.language.mufian=Mufian +controlledvocabulary.language.mugom=Mugom +controlledvocabulary.language.muinane=Muinane +controlledvocabulary.language.mukha-dora=Mukha-Dora +controlledvocabulary.language.mukulu=Mukulu +controlledvocabulary.language.mulaha=Mulaha +controlledvocabulary.language.mulam=Mulam +controlledvocabulary.language.mulao=Mulao +controlledvocabulary.language.mulgi=Mulgi +controlledvocabulary.language.mullu_kurumba=Mullu Kurumba +controlledvocabulary.language.multiple_languages=Multiple languages +controlledvocabulary.language.muluridyi=Muluridyi +controlledvocabulary.language.mum=Mum +controlledvocabulary.language.mumuye=Mumuye +controlledvocabulary.language.muna=Muna +controlledvocabulary.language.munda=Munda +controlledvocabulary.language.mundabli=Mundabli +controlledvocabulary.language.mundang=Mundang +controlledvocabulary.language.mundani=Mundani +controlledvocabulary.language.mundari=Mundari +controlledvocabulary.language.mundat=Mundat +controlledvocabulary.language.munduruk�=Munduruk� +controlledvocabulary.language.mungaka=Mungaka +controlledvocabulary.language.munggui=Munggui +controlledvocabulary.language.mungkip=Mungkip +controlledvocabulary.language.muniche=Muniche +controlledvocabulary.language.munit=Munit +controlledvocabulary.language.munji=Munji +controlledvocabulary.language.munsee=Munsee +controlledvocabulary.language.muong=Muong +controlledvocabulary.language.mur_pano=Mur Pano +controlledvocabulary.language.muratayak=Muratayak +controlledvocabulary.language.murik_(malaysia)=Murik (Malaysia) +controlledvocabulary.language.murik_(papua_new_guinea)=Murik (Papua New Guinea) +controlledvocabulary.language.murkim=Murkim +controlledvocabulary.language.murle=Murle +controlledvocabulary.language.murrinh-patha=Murrinh-Patha +controlledvocabulary.language.mursi=Mursi +controlledvocabulary.language.murui_huitoto=Murui Huitoto +controlledvocabulary.language.murupi=Murupi +controlledvocabulary.language.muruwari=Muruwari +controlledvocabulary.language.musak=Musak +controlledvocabulary.language.musar=Musar +controlledvocabulary.language.musasa=Musasa +controlledvocabulary.language.musey=Musey +controlledvocabulary.language.musgu=Musgu +controlledvocabulary.language.mushungulu=Mushungulu +controlledvocabulary.language.musi=Musi +controlledvocabulary.language.muskum=Muskum +controlledvocabulary.language.muslim_tat=Muslim Tat +controlledvocabulary.language.musom=Musom +controlledvocabulary.language.mussau-emira=Mussau-Emira +controlledvocabulary.language.muthuvan=Muthuvan +controlledvocabulary.language.mutu=Mutu +controlledvocabulary.language.muyang=Muyang +controlledvocabulary.language.muyuw=Muyuw +controlledvocabulary.language.muzi=Muzi +controlledvocabulary.language.mvanip=Mvanip +controlledvocabulary.language.mvuba=Mvuba +controlledvocabulary.language.mwaghavul=Mwaghavul +controlledvocabulary.language.mwali_comorian=Mwali Comorian +controlledvocabulary.language.mwan=Mwan +controlledvocabulary.language.mwani=Mwani +controlledvocabulary.language.mwatebu=Mwatebu +controlledvocabulary.language.mwera_(chimwera)=Mwera (Chimwera) +controlledvocabulary.language.mwera_(nyasa)=Mwera (Nyasa) +controlledvocabulary.language.mwimbi-muthambi=Mwimbi-Muthambi +controlledvocabulary.language.myanmar_sign_language=Myanmar Sign Language +controlledvocabulary.language.mycenaean_greek=Mycenaean Greek +controlledvocabulary.language.myene=Myene +controlledvocabulary.language.mysian=Mysian +controlledvocabulary.language.mzieme_naga=Mzieme Naga +controlledvocabulary.language.m�ghd�=M�ghd� +controlledvocabulary.language.m�ku=M�ku +controlledvocabulary.language.m�nik=M�nik +controlledvocabulary.language.m�skito=M�skito +controlledvocabulary.language.m�cheno=M�cheno +controlledvocabulary.language.m�n_chin=M�n Chin +controlledvocabulary.language.m�nd�=M�nd� +controlledvocabulary.language.mhrri_prkrit=M?h?r???ri Pr?krit +controlledvocabulary.language.mori=M?ori +controlledvocabulary.language.n'ko=N'Ko +controlledvocabulary.language.na=Na +controlledvocabulary.language.na-kara=Na-kara +controlledvocabulary.language.naaba=Naaba +controlledvocabulary.language.naami=Naami +controlledvocabulary.language.naasioi=Naasioi +controlledvocabulary.language.naba=Naba +controlledvocabulary.language.nabak=Nabak +controlledvocabulary.language.nabi=Nabi +controlledvocabulary.language.nachering=Nachering +controlledvocabulary.language.nadruvian=Nadruvian +controlledvocabulary.language.nad�b=Nad�b +controlledvocabulary.language.nafaanra=Nafaanra +controlledvocabulary.language.nafi=Nafi +controlledvocabulary.language.nafri=Nafri +controlledvocabulary.language.nafusi=Nafusi +controlledvocabulary.language.naga_pidgin=Naga Pidgin +controlledvocabulary.language.nagarchal=Nagarchal +controlledvocabulary.language.nage=Nage +controlledvocabulary.language.nagumi=Nagumi +controlledvocabulary.language.nahali=Nahali +controlledvocabulary.language.nahari=Nahari +controlledvocabulary.language.nai=Nai +controlledvocabulary.language.najdi_arabic=Najdi Arabic +controlledvocabulary.language.naka'ela=Naka'ela +controlledvocabulary.language.nakai=Nakai +controlledvocabulary.language.nakame=Nakame +controlledvocabulary.language.nakanai=Nakanai +controlledvocabulary.language.nake=Nake +controlledvocabulary.language.naki=Naki +controlledvocabulary.language.nakwi=Nakwi +controlledvocabulary.language.nalca=Nalca +controlledvocabulary.language.nali=Nali +controlledvocabulary.language.nalik=Nalik +controlledvocabulary.language.nalu=Nalu +controlledvocabulary.language.naluo_yi=Naluo Yi +controlledvocabulary.language.nal�go=Nal�go +controlledvocabulary.language.nama_(papua_new_guinea)=Nama (Papua New Guinea) +controlledvocabulary.language.namakura=Namakura +controlledvocabulary.language.namat=Namat +controlledvocabulary.language.nambo=Nambo +controlledvocabulary.language.nambya=Nambya +controlledvocabulary.language.namia=Namia +controlledvocabulary.language.namiae=Namiae +controlledvocabulary.language.namibian_sign_language=Namibian Sign Language +controlledvocabulary.language.namla=Namla +controlledvocabulary.language.namo=Namo +controlledvocabulary.language.namonuito=Namonuito +controlledvocabulary.language.namosi-naitasiri-serua=Namosi-Naitasiri-Serua +controlledvocabulary.language.namuyi=Namuyi +controlledvocabulary.language.nanai=Nanai +controlledvocabulary.language.nancere=Nancere +controlledvocabulary.language.nande=Nande +controlledvocabulary.language.nandi=Nandi +controlledvocabulary.language.nanerig�_s�noufo=Nanerig� S�noufo +controlledvocabulary.language.nanga_dama_dogon=Nanga Dama Dogon +controlledvocabulary.language.nankina=Nankina +controlledvocabulary.language.nanti=Nanti +controlledvocabulary.language.nanticoke=Nanticoke +controlledvocabulary.language.nanubae=Nanubae +controlledvocabulary.language.napo_lowland_quechua=Napo Lowland Quechua +controlledvocabulary.language.napu=Napu +controlledvocabulary.language.nar_phu=Nar Phu +controlledvocabulary.language.nara=Nara +controlledvocabulary.language.narak=Narak +controlledvocabulary.language.narango=Narango +controlledvocabulary.language.nari_nari=Nari Nari +controlledvocabulary.language.naro=Naro +controlledvocabulary.language.narom=Narom +controlledvocabulary.language.narragansett=Narragansett +controlledvocabulary.language.narua=Narua +controlledvocabulary.language.narungga=Narungga +controlledvocabulary.language.nasal=Nasal +controlledvocabulary.language.nasarian=Nasarian +controlledvocabulary.language.naskapi=Naskapi +controlledvocabulary.language.natanzi=Natanzi +controlledvocabulary.language.natchez=Natchez +controlledvocabulary.language.nateni=Nateni +controlledvocabulary.language.nathembo=Nathembo +controlledvocabulary.language.natioro=Natioro +controlledvocabulary.language.nat�gu=Nat�gu +controlledvocabulary.language.nauete=Nauete +controlledvocabulary.language.naukan_yupik=Naukan Yupik +controlledvocabulary.language.nauna=Nauna +controlledvocabulary.language.nauo=Nauo +controlledvocabulary.language.nauru=Nauru +controlledvocabulary.language.navajo,_navaho=Navajo, Navaho +controlledvocabulary.language.navut=Navut +controlledvocabulary.language.nawaru=Nawaru +controlledvocabulary.language.nawathinehena=Nawathinehena +controlledvocabulary.language.nawdm=Nawdm +controlledvocabulary.language.nawuri=Nawuri +controlledvocabulary.language.naxi=Naxi +controlledvocabulary.language.nayi=Nayi +controlledvocabulary.language.nayini=Nayini +controlledvocabulary.language.ncane=Ncane +controlledvocabulary.language.nchumbulu=Nchumbulu +controlledvocabulary.language.nda'nda'=Nda'nda' +controlledvocabulary.language.ndai=Ndai +controlledvocabulary.language.ndaka=Ndaka +controlledvocabulary.language.ndali=Ndali +controlledvocabulary.language.ndam=Ndam +controlledvocabulary.language.ndamba=Ndamba +controlledvocabulary.language.ndambomo=Ndambomo +controlledvocabulary.language.ndasa=Ndasa +controlledvocabulary.language.ndau=Ndau +controlledvocabulary.language.nde-gbite=Nde-Gbite +controlledvocabulary.language.nde-nsele-nta=Nde-Nsele-Nta +controlledvocabulary.language.ndemli=Ndemli +controlledvocabulary.language.ndendeule=Ndendeule +controlledvocabulary.language.ndengereko=Ndengereko +controlledvocabulary.language.nding=Nding +controlledvocabulary.language.ndo=Ndo +controlledvocabulary.language.ndobo=Ndobo +controlledvocabulary.language.ndoe=Ndoe +controlledvocabulary.language.ndogo=Ndogo +controlledvocabulary.language.ndolo=Ndolo +controlledvocabulary.language.ndom=Ndom +controlledvocabulary.language.ndombe=Ndombe +controlledvocabulary.language.ndonde_hamba=Ndonde Hamba +controlledvocabulary.language.ndonga=Ndonga +controlledvocabulary.language.ndoola=Ndoola +controlledvocabulary.language.ndra'ngith=Ndra'ngith +controlledvocabulary.language.ndrulo=Ndrulo +controlledvocabulary.language.nduga=Nduga +controlledvocabulary.language.ndumu=Ndumu +controlledvocabulary.language.ndunda=Ndunda +controlledvocabulary.language.ndunga=Ndunga +controlledvocabulary.language.ndut=Ndut +controlledvocabulary.language.ndwewe=Ndwewe +controlledvocabulary.language.ndyuka-trio_pidgin=Ndyuka-Trio Pidgin +controlledvocabulary.language.ndzwani_comorian=Ndzwani Comorian +controlledvocabulary.language.neapolitan=Neapolitan +controlledvocabulary.language.nedebang=Nedebang +controlledvocabulary.language.nefamese=Nefamese +controlledvocabulary.language.negerhollands=Negerhollands +controlledvocabulary.language.negeri_sembilan_malay=Negeri Sembilan Malay +controlledvocabulary.language.negidal=Negidal +controlledvocabulary.language.nehan=Nehan +controlledvocabulary.language.nek=Nek +controlledvocabulary.language.nekgini=Nekgini +controlledvocabulary.language.neko=Neko +controlledvocabulary.language.neku=Neku +controlledvocabulary.language.nema=Nema +controlledvocabulary.language.neme=Neme +controlledvocabulary.language.nemi=Nemi +controlledvocabulary.language.nen=Nen +controlledvocabulary.language.nend=Nend +controlledvocabulary.language.nenets=Nenets +controlledvocabulary.language.nengone=Nengone +controlledvocabulary.language.neo=Neo +controlledvocabulary.language.neo-hittite=Neo-Hittite +controlledvocabulary.language.nepalese_sign_language=Nepalese Sign Language +controlledvocabulary.language.nepali=Nepali +controlledvocabulary.language.nepali_(individual_language)=Nepali (individual language) +controlledvocabulary.language.nete=Nete +controlledvocabulary.language.new_caledonian_javanese=New Caledonian Javanese +controlledvocabulary.language.new_zealand_sign_language=New Zealand Sign Language +controlledvocabulary.language.newari=Newari +controlledvocabulary.language.neyo=Neyo +controlledvocabulary.language.nez_perce=Nez Perce +controlledvocabulary.language.ngaanyatjarra=Ngaanyatjarra +controlledvocabulary.language.ngad'a=Ngad'a +controlledvocabulary.language.ngadjunmaya=Ngadjunmaya +controlledvocabulary.language.ngadjuri=Ngadjuri +controlledvocabulary.language.ngaing=Ngaing +controlledvocabulary.language.ngaju=Ngaju +controlledvocabulary.language.ngala=Ngala +controlledvocabulary.language.ngalakgan=Ngalakgan +controlledvocabulary.language.ngalum=Ngalum +controlledvocabulary.language.ngam=Ngam +controlledvocabulary.language.ngamambo=Ngamambo +controlledvocabulary.language.ngambay=Ngambay +controlledvocabulary.language.ngamini=Ngamini +controlledvocabulary.language.ngamo=Ngamo +controlledvocabulary.language.ngan'gityemerri=Ngan'gityemerri +controlledvocabulary.language.nganakarti=Nganakarti +controlledvocabulary.language.nganasan=Nganasan +controlledvocabulary.language.ngandi=Ngandi +controlledvocabulary.language.ngando_(central_african_republic)=Ngando (Central African Republic) +controlledvocabulary.language.ngando_(democratic_republic_of_congo)=Ngando (Democratic Republic of Congo) +controlledvocabulary.language.ngandyera=Ngandyera +controlledvocabulary.language.ngangam=Ngangam +controlledvocabulary.language.ngantangarra=Ngantangarra +controlledvocabulary.language.nganyaywana=Nganyaywana +controlledvocabulary.language.ngardi=Ngardi +controlledvocabulary.language.ngarigu=Ngarigu +controlledvocabulary.language.ngarinyin=Ngarinyin +controlledvocabulary.language.ngarinyman=Ngarinyman +controlledvocabulary.language.ngarla=Ngarla +controlledvocabulary.language.ngarluma=Ngarluma +controlledvocabulary.language.ngarrindjeri=Ngarrindjeri +controlledvocabulary.language.ngas=Ngas +controlledvocabulary.language.ngasa=Ngasa +controlledvocabulary.language.ngatik_men's_creole=Ngatik Men's Creole +controlledvocabulary.language.ngawn_chin=Ngawn Chin +controlledvocabulary.language.ngawun=Ngawun +controlledvocabulary.language.ngayawung=Ngayawung +controlledvocabulary.language.ngazidja_comorian=Ngazidja Comorian +controlledvocabulary.language.ngbaka=Ngbaka +controlledvocabulary.language.ngbaka_ma'bo=Ngbaka Ma'bo +controlledvocabulary.language.ngbaka_manza=Ngbaka Manza +controlledvocabulary.language.ngbee=Ngbee +controlledvocabulary.language.ngbinda=Ngbinda +controlledvocabulary.language.ngbundu=Ngbundu +controlledvocabulary.language.ngelima=Ngelima +controlledvocabulary.language.ngemba=Ngemba +controlledvocabulary.language.ngen=Ngen +controlledvocabulary.language.ngendelengo=Ngendelengo +controlledvocabulary.language.ngete=Ngete +controlledvocabulary.language.nggem=Nggem +controlledvocabulary.language.nggwahyi=Nggwahyi +controlledvocabulary.language.ngie=Ngie +controlledvocabulary.language.ngiemboon=Ngiemboon +controlledvocabulary.language.ngile=Ngile +controlledvocabulary.language.ngindo=Ngindo +controlledvocabulary.language.ngiti=Ngiti +controlledvocabulary.language.ngizim=Ngizim +controlledvocabulary.language.ngk�lmpw_kanum=Ngk�lmpw Kanum +controlledvocabulary.language.ngom=Ngom +controlledvocabulary.language.ngomba=Ngomba +controlledvocabulary.language.ngombale=Ngombale +controlledvocabulary.language.ngombe_(central_african_republic)=Ngombe (Central African Republic) +controlledvocabulary.language.ngombe_(democratic_republic_of_congo)=Ngombe (Democratic Republic of Congo) +controlledvocabulary.language.ngongo=Ngongo +controlledvocabulary.language.ngoni_(mozambique)=Ngoni (Mozambique) +controlledvocabulary.language.ngoni_(tanzania)=Ngoni (Tanzania) +controlledvocabulary.language.ngoshie=Ngoshie +controlledvocabulary.language.ngul=Ngul +controlledvocabulary.language.ngulu=Ngulu +controlledvocabulary.language.nguluwan=Nguluwan +controlledvocabulary.language.ngumbarl=Ngumbarl +controlledvocabulary.language.ngumbi=Ngumbi +controlledvocabulary.language.ngunawal=Ngunawal +controlledvocabulary.language.ngundi=Ngundi +controlledvocabulary.language.ngundu=Ngundu +controlledvocabulary.language.ngungwel=Ngungwel +controlledvocabulary.language.ngurimi=Ngurimi +controlledvocabulary.language.ngurmbur=Ngurmbur +controlledvocabulary.language.ngu�n=Ngu�n +controlledvocabulary.language.ngwaba=Ngwaba +controlledvocabulary.language.ngwe=Ngwe +controlledvocabulary.language.ngwo=Ngwo +controlledvocabulary.language.ng�bere=Ng�bere +controlledvocabulary.language.nhanda=Nhanda +controlledvocabulary.language.nhengatu=Nhengatu +controlledvocabulary.language.nhirrpi=Nhirrpi +controlledvocabulary.language.nhuwala=Nhuwala +controlledvocabulary.language.nias=Nias +controlledvocabulary.language.nicaragua_creole_english=Nicaragua Creole English +controlledvocabulary.language.nicaraguan_sign_language=Nicaraguan Sign Language +controlledvocabulary.language.niellim=Niellim +controlledvocabulary.language.nigeria_mambila=Nigeria Mambila +controlledvocabulary.language.nigerian_fulfulde=Nigerian Fulfulde +controlledvocabulary.language.nigerian_pidgin=Nigerian Pidgin +controlledvocabulary.language.nigerian_sign_language=Nigerian Sign Language +controlledvocabulary.language.nihali=Nihali +controlledvocabulary.language.nii=Nii +controlledvocabulary.language.niksek=Niksek +controlledvocabulary.language.nila=Nila +controlledvocabulary.language.nilamba=Nilamba +controlledvocabulary.language.nimadi=Nimadi +controlledvocabulary.language.nimanbur=Nimanbur +controlledvocabulary.language.nimbari=Nimbari +controlledvocabulary.language.nimboran=Nimboran +controlledvocabulary.language.nimi=Nimi +controlledvocabulary.language.nimo=Nimo +controlledvocabulary.language.nimoa=Nimoa +controlledvocabulary.language.ninam=Ninam +controlledvocabulary.language.nindi=Nindi +controlledvocabulary.language.ningera=Ningera +controlledvocabulary.language.ninggerum=Ninggerum +controlledvocabulary.language.ningil=Ningil +controlledvocabulary.language.ninia_yali=Ninia Yali +controlledvocabulary.language.ninzo=Ninzo +controlledvocabulary.language.nipsan=Nipsan +controlledvocabulary.language.nisa=Nisa +controlledvocabulary.language.nisenan=Nisenan +controlledvocabulary.language.nisga'a=Nisga'a +controlledvocabulary.language.nisi_(china)=Nisi (China) +controlledvocabulary.language.niuafo'ou=Niuafo'ou +controlledvocabulary.language.niuatoputapu=Niuatoputapu +controlledvocabulary.language.niuean=Niuean +controlledvocabulary.language.nivacl�=Nivacl� +controlledvocabulary.language.niwer_mil=Niwer Mil +controlledvocabulary.language.njalgulgule=Njalgulgule +controlledvocabulary.language.njebi=Njebi +controlledvocabulary.language.njen=Njen +controlledvocabulary.language.njerep=Njerep +controlledvocabulary.language.njyem=Njyem +controlledvocabulary.language.nkami=Nkami +controlledvocabulary.language.nkangala=Nkangala +controlledvocabulary.language.nkari=Nkari +controlledvocabulary.language.nkem-nkum=Nkem-Nkum +controlledvocabulary.language.nkhumbi=Nkhumbi +controlledvocabulary.language.nkongho=Nkongho +controlledvocabulary.language.nkonya=Nkonya +controlledvocabulary.language.nkoroo=Nkoroo +controlledvocabulary.language.nkoya=Nkoya +controlledvocabulary.language.nkukoli=Nkukoli +controlledvocabulary.language.nkutu=Nkutu +controlledvocabulary.language.nnam=Nnam +controlledvocabulary.language.no_linguistic_content=No linguistic content +controlledvocabulary.language.nobiin=Nobiin +controlledvocabulary.language.nobonob=Nobonob +controlledvocabulary.language.nocte_naga=Nocte Naga +controlledvocabulary.language.nogai=Nogai +controlledvocabulary.language.noipx=Noipx +controlledvocabulary.language.noiri=Noiri +controlledvocabulary.language.nokuku=Nokuku +controlledvocabulary.language.nomaande=Nomaande +controlledvocabulary.language.nomane=Nomane +controlledvocabulary.language.nomatsiguenga=Nomatsiguenga +controlledvocabulary.language.nomlaki=Nomlaki +controlledvocabulary.language.nomu=Nomu +controlledvocabulary.language.nong_zhuang=Nong Zhuang +controlledvocabulary.language.nonuya=Nonuya +controlledvocabulary.language.nooksack=Nooksack +controlledvocabulary.language.noon=Noon +controlledvocabulary.language.noone=Noone +controlledvocabulary.language.nopala_chatino=Nopala Chatino +controlledvocabulary.language.noric=Noric +controlledvocabulary.language.norn=Norn +controlledvocabulary.language.norra=Norra +controlledvocabulary.language.north_alaskan_inupiatun=North Alaskan Inupiatun +controlledvocabulary.language.north_ambrym=North Ambrym +controlledvocabulary.language.north_asmat=North Asmat +controlledvocabulary.language.north_awyu=North Awyu +controlledvocabulary.language.north_azerbaijani=North Azerbaijani +controlledvocabulary.language.north_babar=North Babar +controlledvocabulary.language.north_bolivian_quechua=North Bolivian Quechua +controlledvocabulary.language.north_central_mixe=North Central Mixe +controlledvocabulary.language.north_efate=North Efate +controlledvocabulary.language.north_fali=North Fali +controlledvocabulary.language.north_giziga=North Giziga +controlledvocabulary.language.north_jun�n_quechua=North Jun�n Quechua +controlledvocabulary.language.north_marquesan=North Marquesan +controlledvocabulary.language.north_mesopotamian_arabic=North Mesopotamian Arabic +controlledvocabulary.language.north_midlands_tasmanian=North Midlands Tasmanian +controlledvocabulary.language.north_mofu=North Mofu +controlledvocabulary.language.north_moluccan_malay=North Moluccan Malay +controlledvocabulary.language.north_muyu=North Muyu +controlledvocabulary.language.north_nuaulu=North Nuaulu +controlledvocabulary.language.north_picene=North Picene +controlledvocabulary.language.north_slavey=North Slavey +controlledvocabulary.language.north_tairora=North Tairora +controlledvocabulary.language.north_tanna=North Tanna +controlledvocabulary.language.north_wahgi=North Wahgi +controlledvocabulary.language.north_watut=North Watut +controlledvocabulary.language.northeast_kiwai=Northeast Kiwai +controlledvocabulary.language.northeast_maidu=Northeast Maidu +controlledvocabulary.language.northeast_pashai=Northeast Pashai +controlledvocabulary.language.northeastern_dinka=Northeastern Dinka +controlledvocabulary.language.northeastern_pomo=Northeastern Pomo +controlledvocabulary.language.northeastern_tasmanian=Northeastern Tasmanian +controlledvocabulary.language.northeastern_thai=Northeastern Thai +controlledvocabulary.language.northern_alta=Northern Alta +controlledvocabulary.language.northern_altai=Northern Altai +controlledvocabulary.language.northern_amami-oshima=Northern Amami-Oshima +controlledvocabulary.language.northern_betsimisaraka_malagasy=Northern Betsimisaraka Malagasy +controlledvocabulary.language.northern_binukidnon=Northern Binukidnon +controlledvocabulary.language.northern_bobo_madar�=Northern Bobo Madar� +controlledvocabulary.language.northern_bontok=Northern Bontok +controlledvocabulary.language.northern_catanduanes_bikol=Northern Catanduanes Bikol +controlledvocabulary.language.northern_conchucos_ancash_quechua=Northern Conchucos Ancash Quechua +controlledvocabulary.language.northern_dagara=Northern Dagara +controlledvocabulary.language.northern_dong=Northern Dong +controlledvocabulary.language.northern_east_cree=Northern East Cree +controlledvocabulary.language.northern_ember�=Northern Ember� +controlledvocabulary.language.northern_frisian=Northern Frisian +controlledvocabulary.language.northern_ghale=Northern Ghale +controlledvocabulary.language.northern_gondi=Northern Gondi +controlledvocabulary.language.northern_grebo=Northern Grebo +controlledvocabulary.language.northern_guiyang_hmong=Northern Guiyang Hmong +controlledvocabulary.language.northern_haida=Northern Haida +controlledvocabulary.language.northern_hindko=Northern Hindko +controlledvocabulary.language.northern_huishui_hmong=Northern Huishui Hmong +controlledvocabulary.language.northern_kalapuya=Northern Kalapuya +controlledvocabulary.language.northern_kankanay=Northern Kankanay +controlledvocabulary.language.northern_katang=Northern Katang +controlledvocabulary.language.northern_khmer=Northern Khmer +controlledvocabulary.language.northern_kissi=Northern Kissi +controlledvocabulary.language.northern_kurdish=Northern Kurdish +controlledvocabulary.language.northern_luri=Northern Luri +controlledvocabulary.language.northern_mashan_hmong=Northern Mashan Hmong +controlledvocabulary.language.northern_muji=Northern Muji +controlledvocabulary.language.northern_nago=Northern Nago +controlledvocabulary.language.northern_ndebele=Northern Ndebele +controlledvocabulary.language.northern_ngbandi=Northern Ngbandi +controlledvocabulary.language.northern_nisu=Northern Nisu +controlledvocabulary.language.northern_nuni=Northern Nuni +controlledvocabulary.language.northern_oaxaca_nahuatl=Northern Oaxaca Nahuatl +controlledvocabulary.language.northern_ohlone=Northern Ohlone +controlledvocabulary.language.northern_one=Northern One +controlledvocabulary.language.northern_paiute=Northern Paiute +controlledvocabulary.language.northern_pame=Northern Pame +controlledvocabulary.language.northern_pashto=Northern Pashto +controlledvocabulary.language.northern_pastaza_quichua=Northern Pastaza Quichua +controlledvocabulary.language.northern_ping_chinese=Northern Ping Chinese +controlledvocabulary.language.northern_pomo=Northern Pomo +controlledvocabulary.language.northern_puebla_nahuatl=Northern Puebla Nahuatl +controlledvocabulary.language.northern_pumi=Northern Pumi +controlledvocabulary.language.northern_qiandong_miao=Northern Qiandong Miao +controlledvocabulary.language.northern_qiang=Northern Qiang +controlledvocabulary.language.northern_rengma_naga=Northern Rengma Naga +controlledvocabulary.language.northern_roglai=Northern Roglai +controlledvocabulary.language.northern_sami=Northern Sami +controlledvocabulary.language.northern_sierra_miwok=Northern Sierra Miwok +controlledvocabulary.language.northern_sorsoganon=Northern Sorsoganon +controlledvocabulary.language.northern_subanen=Northern Subanen +controlledvocabulary.language.northern_tarahumara=Northern Tarahumara +controlledvocabulary.language.northern_tasmanian=Northern Tasmanian +controlledvocabulary.language.northern_tepehuan=Northern Tepehuan +controlledvocabulary.language.northern_thai=Northern Thai +controlledvocabulary.language.northern_tidung=Northern Tidung +controlledvocabulary.language.northern_tiwa=Northern Tiwa +controlledvocabulary.language.northern_tlaxiaco_mixtec=Northern Tlaxiaco Mixtec +controlledvocabulary.language.northern_toussian=Northern Toussian +controlledvocabulary.language.northern_tujia=Northern Tujia +controlledvocabulary.language.northern_tutchone=Northern Tutchone +controlledvocabulary.language.northern_uzbek=Northern Uzbek +controlledvocabulary.language.northern_yukaghir=Northern Yukaghir +controlledvocabulary.language.northwest_alaska_inupiatun=Northwest Alaska Inupiatun +controlledvocabulary.language.northwest_gbaya=Northwest Gbaya +controlledvocabulary.language.northwest_maidu=Northwest Maidu +controlledvocabulary.language.northwest_oaxaca_mixtec=Northwest Oaxaca Mixtec +controlledvocabulary.language.northwest_pashai=Northwest Pashai +controlledvocabulary.language.northwestern_dinka=Northwestern Dinka +controlledvocabulary.language.northwestern_fars=Northwestern Fars +controlledvocabulary.language.northwestern_kolami=Northwestern Kolami +controlledvocabulary.language.northwestern_nisu=Northwestern Nisu +controlledvocabulary.language.northwestern_ojibwa=Northwestern Ojibwa +controlledvocabulary.language.northwestern_tasmanian=Northwestern Tasmanian +controlledvocabulary.language.norwegian=Norwegian +controlledvocabulary.language.norwegian_bokm�l=Norwegian Bokm�l +controlledvocabulary.language.norwegian_nynorsk=Norwegian Nynorsk +controlledvocabulary.language.norwegian_sign_language=Norwegian Sign Language +controlledvocabulary.language.notre=Notre +controlledvocabulary.language.notsi=Notsi +controlledvocabulary.language.nottoway=Nottoway +controlledvocabulary.language.nottoway-meherrin=Nottoway-Meherrin +controlledvocabulary.language.novial=Novial +controlledvocabulary.language.noy=Noy +controlledvocabulary.language.nsenga=Nsenga +controlledvocabulary.language.nshi=Nshi +controlledvocabulary.language.nsongo=Nsongo +controlledvocabulary.language.ntcham=Ntcham +controlledvocabulary.language.nteng=Nteng +controlledvocabulary.language.ntomba=Ntomba +controlledvocabulary.language.nubaca=Nubaca +controlledvocabulary.language.nubi=Nubi +controlledvocabulary.language.nubri=Nubri +controlledvocabulary.language.nuer=Nuer +controlledvocabulary.language.nugunu_(australia)=Nugunu (Australia) +controlledvocabulary.language.nugunu_(cameroon)=Nugunu (Cameroon) +controlledvocabulary.language.nuk=Nuk +controlledvocabulary.language.nukak_mak�=Nukak Mak� +controlledvocabulary.language.nukna=Nukna +controlledvocabulary.language.nukuini=Nukuini +controlledvocabulary.language.nukumanu=Nukumanu +controlledvocabulary.language.nukunul=Nukunul +controlledvocabulary.language.nukuoro=Nukuoro +controlledvocabulary.language.nukuria=Nukuria +controlledvocabulary.language.numana=Numana +controlledvocabulary.language.numanggang=Numanggang +controlledvocabulary.language.numbami=Numbami +controlledvocabulary.language.nume=Nume +controlledvocabulary.language.numidian=Numidian +controlledvocabulary.language.num��=Num�� +controlledvocabulary.language.nung_(viet_nam)=Nung (Viet Nam) +controlledvocabulary.language.nungali=Nungali +controlledvocabulary.language.nunggubuyu=Nunggubuyu +controlledvocabulary.language.nungu=Nungu +controlledvocabulary.language.nuosu=Nuosu +controlledvocabulary.language.nupbikha=Nupbikha +controlledvocabulary.language.nupe-nupe-tako=Nupe-Nupe-Tako +controlledvocabulary.language.nusa_laut=Nusa Laut +controlledvocabulary.language.nusu=Nusu +controlledvocabulary.language.nuu-chah-nulth=Nuu-chah-nulth +controlledvocabulary.language.nyabwa=Nyabwa +controlledvocabulary.language.nyaheun=Nyaheun +controlledvocabulary.language.nyahkur=Nyahkur +controlledvocabulary.language.nyakyusa-ngonde=Nyakyusa-Ngonde +controlledvocabulary.language.nyali=Nyali +controlledvocabulary.language.nyam=Nyam +controlledvocabulary.language.nyamal=Nyamal +controlledvocabulary.language.nyambo=Nyambo +controlledvocabulary.language.nyamusa-molo=Nyamusa-Molo +controlledvocabulary.language.nyamwanga=Nyamwanga +controlledvocabulary.language.nyamwezi=Nyamwezi +controlledvocabulary.language.nyaneka=Nyaneka +controlledvocabulary.language.nyang'i=Nyang'i +controlledvocabulary.language.nyanga=Nyanga +controlledvocabulary.language.nyanga-li=Nyanga-li +controlledvocabulary.language.nyangatom=Nyangatom +controlledvocabulary.language.nyangbo=Nyangbo +controlledvocabulary.language.nyangga=Nyangga +controlledvocabulary.language.nyangumarta=Nyangumarta +controlledvocabulary.language.nyankole=Nyankole +controlledvocabulary.language.nyankpa=Nyankpa +controlledvocabulary.language.nyarafolo_senoufo=Nyarafolo Senoufo +controlledvocabulary.language.nyaturu=Nyaturu +controlledvocabulary.language.nyaw=Nyaw +controlledvocabulary.language.nyawaygi=Nyawaygi +controlledvocabulary.language.nyemba=Nyemba +controlledvocabulary.language.nyengo=Nyengo +controlledvocabulary.language.nyenkha=Nyenkha +controlledvocabulary.language.nyeu=Nyeu +controlledvocabulary.language.nyiha_(malawi)=Nyiha (Malawi) +controlledvocabulary.language.nyiha_(tanzania)=Nyiha (Tanzania) +controlledvocabulary.language.nyika_(malawi_and_zambia)=Nyika (Malawi and Zambia) +controlledvocabulary.language.nyika_(tanzania)=Nyika (Tanzania) +controlledvocabulary.language.nyikina=Nyikina +controlledvocabulary.language.nyindrou=Nyindrou +controlledvocabulary.language.nyindu=Nyindu +controlledvocabulary.language.nyishi=Nyishi +controlledvocabulary.language.nyiyaparli=Nyiyaparli +controlledvocabulary.language.nyokon=Nyokon +controlledvocabulary.language.nyole=Nyole +controlledvocabulary.language.nyong=Nyong +controlledvocabulary.language.nyore=Nyore +controlledvocabulary.language.nyoro=Nyoro +controlledvocabulary.language.nyulnyul=Nyulnyul +controlledvocabulary.language.nyungar=Nyungar +controlledvocabulary.language.nyungwe=Nyungwe +controlledvocabulary.language.ny�layu=Ny�layu +controlledvocabulary.language.nzadi=Nzadi +controlledvocabulary.language.nzakambay=Nzakambay +controlledvocabulary.language.nzakara=Nzakara +controlledvocabulary.language.nzanyi=Nzanyi +controlledvocabulary.language.nzima=Nzima +controlledvocabulary.language.n�-meo=N�-Meo +controlledvocabulary.language.n�l�mwa-nixumwak=N�l�mwa-Nixumwak +controlledvocabulary.language.n�pode_huitoto=N�pode Huitoto +controlledvocabulary.language.nng=N?ng +controlledvocabulary.language.o'chi'chi'=O'chi'chi' +controlledvocabulary.language.o'du=O'du +controlledvocabulary.language.obanliku=Obanliku +controlledvocabulary.language.obispe�o=Obispe�o +controlledvocabulary.language.oblo=Oblo +controlledvocabulary.language.obo_manobo=Obo Manobo +controlledvocabulary.language.obokuitai=Obokuitai +controlledvocabulary.language.obolo=Obolo +controlledvocabulary.language.obulom=Obulom +controlledvocabulary.language.ocaina=Ocaina +controlledvocabulary.language.occitan=Occitan +controlledvocabulary.language.ocotepec_mixtec=Ocotepec Mixtec +controlledvocabulary.language.ocotl�n_zapotec=Ocotl�n Zapotec +controlledvocabulary.language.od=Od +controlledvocabulary.language.odia=Odia +controlledvocabulary.language.odiai=Odiai +controlledvocabulary.language.odoodee=Odoodee +controlledvocabulary.language.odual=Odual +controlledvocabulary.language.odut=Odut +controlledvocabulary.language.ofay�=Ofay� +controlledvocabulary.language.official_aramaic_(700-300_bce)=Official Aramaic (700-300 BCE) +controlledvocabulary.language.ofo=Ofo +controlledvocabulary.language.ogbah=Ogbah +controlledvocabulary.language.ogbia=Ogbia +controlledvocabulary.language.ogbogolo=Ogbogolo +controlledvocabulary.language.ogbronuagum=Ogbronuagum +controlledvocabulary.language.ogea=Ogea +controlledvocabulary.language.oirata=Oirata +controlledvocabulary.language.ojibwe,_ojibwa=Ojibwe, Ojibwa +controlledvocabulary.language.ojitl�n_chinantec=Ojitl�n Chinantec +controlledvocabulary.language.okanagan=Okanagan +controlledvocabulary.language.oki-no-erabu=Oki-No-Erabu +controlledvocabulary.language.okiek=Okiek +controlledvocabulary.language.oko-eni-osayen=Oko-Eni-Osayen +controlledvocabulary.language.oko-juwoi=Oko-Juwoi +controlledvocabulary.language.okobo=Okobo +controlledvocabulary.language.okodia=Okodia +controlledvocabulary.language.okolie=Okolie +controlledvocabulary.language.okolod=Okolod +controlledvocabulary.language.okpamheri=Okpamheri +controlledvocabulary.language.okpe_(northwestern_edo)=Okpe (Northwestern Edo) +controlledvocabulary.language.okpe_(southwestern_edo)=Okpe (Southwestern Edo) +controlledvocabulary.language.oksapmin=Oksapmin +controlledvocabulary.language.oku=Oku +controlledvocabulary.language.old_aramaic_(up_to_700_bce)=Old Aramaic (up to 700 BCE) +controlledvocabulary.language.old_avar=Old Avar +controlledvocabulary.language.old_breton=Old Breton +controlledvocabulary.language.old_burmese=Old Burmese +controlledvocabulary.language.old_cham=Old Cham +controlledvocabulary.language.old_chinese=Old Chinese +controlledvocabulary.language.old_church_slavonic,_church_slavonic,_old_bulgarian=Old Church Slavonic, Church Slavonic, Old Bulgarian +controlledvocabulary.language.old_cornish=Old Cornish +controlledvocabulary.language.old_dutch=Old Dutch +controlledvocabulary.language.old_english_(ca._450-1100)=Old English (ca. 450-1100) +controlledvocabulary.language.old_french_(842-ca._1400)=Old French (842-ca. 1400) +controlledvocabulary.language.old_frisian=Old Frisian +controlledvocabulary.language.old_georgian=Old Georgian +controlledvocabulary.language.old_high_german_(ca._750-1050)=Old High German (ca. 750-1050) +controlledvocabulary.language.old_hittite=Old Hittite +controlledvocabulary.language.old_hungarian=Old Hungarian +controlledvocabulary.language.old_irish_(to_900)=Old Irish (to 900) +controlledvocabulary.language.old_japanese=Old Japanese +controlledvocabulary.language.old_kentish_sign_language=Old Kentish Sign Language +controlledvocabulary.language.old_khmer=Old Khmer +controlledvocabulary.language.old_korean_(3rd-9th_cent.)=Old Korean (3rd-9th cent.) +controlledvocabulary.language.old_lithuanian=Old Lithuanian +controlledvocabulary.language.old_malay=Old Malay +controlledvocabulary.language.old_manipuri=Old Manipuri +controlledvocabulary.language.old_marathi=Old Marathi +controlledvocabulary.language.old_mon=Old Mon +controlledvocabulary.language.old_norse=Old Norse +controlledvocabulary.language.old_nubian=Old Nubian +controlledvocabulary.language.old_ossetic=Old Ossetic +controlledvocabulary.language.old_persian_(ca._600-400_b.c.)=Old Persian (ca. 600-400 B.C.) +controlledvocabulary.language.old_proven�al_(to_1500)=Old Proven�al (to 1500) +controlledvocabulary.language.old_russian=Old Russian +controlledvocabulary.language.old_saxon=Old Saxon +controlledvocabulary.language.old_spanish=Old Spanish +controlledvocabulary.language.old_sundanese=Old Sundanese +controlledvocabulary.language.old_tamil=Old Tamil +controlledvocabulary.language.old_tibetan=Old Tibetan +controlledvocabulary.language.old_turkish=Old Turkish +controlledvocabulary.language.old_uighur=Old Uighur +controlledvocabulary.language.old_welsh=Old Welsh +controlledvocabulary.language.olekha=Olekha +controlledvocabulary.language.olkol=Olkol +controlledvocabulary.language.olo=Olo +controlledvocabulary.language.oloma=Oloma +controlledvocabulary.language.olrat=Olrat +controlledvocabulary.language.olu'bo=Olu'bo +controlledvocabulary.language.olulumo-ikom=Olulumo-Ikom +controlledvocabulary.language.oluta_popoluca=Oluta Popoluca +controlledvocabulary.language.omagua=Omagua +controlledvocabulary.language.omaha-ponca=Omaha-Ponca +controlledvocabulary.language.omani_arabic=Omani Arabic +controlledvocabulary.language.ombamba=Ombamba +controlledvocabulary.language.ombo=Ombo +controlledvocabulary.language.ometepec_nahuatl=Ometepec Nahuatl +controlledvocabulary.language.omi=Omi +controlledvocabulary.language.omok=Omok +controlledvocabulary.language.omotik=Omotik +controlledvocabulary.language.omurano=Omurano +controlledvocabulary.language.ona=Ona +controlledvocabulary.language.oneida=Oneida +controlledvocabulary.language.ong=Ong +controlledvocabulary.language.onin=Onin +controlledvocabulary.language.onin_based_pidgin=Onin Based Pidgin +controlledvocabulary.language.onjob=Onjob +controlledvocabulary.language.ono=Ono +controlledvocabulary.language.onobasulu=Onobasulu +controlledvocabulary.language.onondaga=Onondaga +controlledvocabulary.language.ontenu=Ontenu +controlledvocabulary.language.ontong_java=Ontong Java +controlledvocabulary.language.oorlams=Oorlams +controlledvocabulary.language.opao=Opao +controlledvocabulary.language.opata=Opata +controlledvocabulary.language.orang_kanaq=Orang Kanaq +controlledvocabulary.language.orang_seletar=Orang Seletar +controlledvocabulary.language.oraon_sadri=Oraon Sadri +controlledvocabulary.language.orej�n=Orej�n +controlledvocabulary.language.oring=Oring +controlledvocabulary.language.oriya=Oriya +controlledvocabulary.language.orizaba_nahuatl=Orizaba Nahuatl +controlledvocabulary.language.orma=Orma +controlledvocabulary.language.ormu=Ormu +controlledvocabulary.language.ormuri=Ormuri +controlledvocabulary.language.oro=Oro +controlledvocabulary.language.oro_win=Oro Win +controlledvocabulary.language.oroch=Oroch +controlledvocabulary.language.oroha=Oroha +controlledvocabulary.language.orok=Orok +controlledvocabulary.language.orokaiva=Orokaiva +controlledvocabulary.language.oroko=Oroko +controlledvocabulary.language.orokolo=Orokolo +controlledvocabulary.language.oromo=Oromo +controlledvocabulary.language.oroqen=Oroqen +controlledvocabulary.language.orowe=Orowe +controlledvocabulary.language.oruma=Oruma +controlledvocabulary.language.orya=Orya +controlledvocabulary.language.osage=Osage +controlledvocabulary.language.osatu=Osatu +controlledvocabulary.language.oscan=Oscan +controlledvocabulary.language.osing=Osing +controlledvocabulary.language.ososo=Ososo +controlledvocabulary.language.ossetian,_ossetic=Ossetian, Ossetic +controlledvocabulary.language.ot_danum=Ot Danum +controlledvocabulary.language.otank=Otank +controlledvocabulary.language.oti=Oti +controlledvocabulary.language.otoro=Otoro +controlledvocabulary.language.ottawa=Ottawa +controlledvocabulary.language.ottoman_turkish_(1500-1928)=Ottoman Turkish (1500-1928) +controlledvocabulary.language.otuho=Otuho +controlledvocabulary.language.otuke=Otuke +controlledvocabulary.language.ouma=Ouma +controlledvocabulary.language.oune=Oune +controlledvocabulary.language.owa=Owa +controlledvocabulary.language.owenia=Owenia +controlledvocabulary.language.owiniga=Owiniga +controlledvocabulary.language.oy=Oy +controlledvocabulary.language.oya'oya=Oya'oya +controlledvocabulary.language.oyda=Oyda +controlledvocabulary.language.oyster_bay_tasmanian=Oyster Bay Tasmanian +controlledvocabulary.language.ozolotepec_zapotec=Ozolotepec Zapotec +controlledvocabulary.language.ozumac�n_chinantec=Ozumac�n Chinantec +controlledvocabulary.language.pa_di=Pa Di +controlledvocabulary.language.pa'a=Pa'a +controlledvocabulary.language.pa'o_karen=Pa'o Karen +controlledvocabulary.language.pa-hng=Pa-Hng +controlledvocabulary.language.paakantyi=Paakantyi +controlledvocabulary.language.paama=Paama +controlledvocabulary.language.paasaal=Paasaal +controlledvocabulary.language.pacahuara=Pacahuara +controlledvocabulary.language.pacaraos_quechua=Pacaraos Quechua +controlledvocabulary.language.pacific_gulf_yupik=Pacific Gulf Yupik +controlledvocabulary.language.pacoh=Pacoh +controlledvocabulary.language.padoe=Padoe +controlledvocabulary.language.paekche=Paekche +controlledvocabulary.language.paelignian=Paelignian +controlledvocabulary.language.pagi=Pagi +controlledvocabulary.language.pagibete=Pagibete +controlledvocabulary.language.pagu=Pagu +controlledvocabulary.language.pahanan_agta=Pahanan Agta +controlledvocabulary.language.pahari=Pahari +controlledvocabulary.language.pahari-potwari=Pahari-Potwari +controlledvocabulary.language.pahi=Pahi +controlledvocabulary.language.pahlavani=Pahlavani +controlledvocabulary.language.pahlavi=Pahlavi +controlledvocabulary.language.pai_tavytera=Pai Tavytera +controlledvocabulary.language.paic�=Paic� +controlledvocabulary.language.paipai=Paipai +controlledvocabulary.language.paite_chin=Paite Chin +controlledvocabulary.language.paiwan=Paiwan +controlledvocabulary.language.pak-tong=Pak-Tong +controlledvocabulary.language.pakanha=Pakanha +controlledvocabulary.language.paka�snovos=Paka�snovos +controlledvocabulary.language.pakistan_sign_language=Pakistan Sign Language +controlledvocabulary.language.paku=Paku +controlledvocabulary.language.paku_karen=Paku Karen +controlledvocabulary.language.pal=Pal +controlledvocabulary.language.palaic=Palaic +controlledvocabulary.language.palaka_senoufo=Palaka Senoufo +controlledvocabulary.language.palantla_chinantec=Palantla Chinantec +controlledvocabulary.language.palauan=Palauan +controlledvocabulary.language.paleni=Paleni +controlledvocabulary.language.palenquero=Palenquero +controlledvocabulary.language.palik�r=Palik�r +controlledvocabulary.language.paliyan=Paliyan +controlledvocabulary.language.pallanganmiddang=Pallanganmiddang +controlledvocabulary.language.paloor=Paloor +controlledvocabulary.language.palu'e=Palu'e +controlledvocabulary.language.paluan=Paluan +controlledvocabulary.language.palya_bareli=Palya Bareli +controlledvocabulary.language.pam=Pam +controlledvocabulary.language.pambia=Pambia +controlledvocabulary.language.pamona=Pamona +controlledvocabulary.language.pamosu=Pamosu +controlledvocabulary.language.pampanga=Pampanga +controlledvocabulary.language.pamplona_atta=Pamplona Atta +controlledvocabulary.language.pana_(burkina_faso)=Pana (Burkina Faso) +controlledvocabulary.language.pana_(central_african_republic)=Pana (Central African Republic) +controlledvocabulary.language.panamanian_sign_language=Panamanian Sign Language +controlledvocabulary.language.panamint=Panamint +controlledvocabulary.language.panao_hu�nuco_quechua=Panao Hu�nuco Quechua +controlledvocabulary.language.panar�=Panar� +controlledvocabulary.language.panasuan=Panasuan +controlledvocabulary.language.panawa=Panawa +controlledvocabulary.language.pancana=Pancana +controlledvocabulary.language.panchpargania=Panchpargania +controlledvocabulary.language.pande=Pande +controlledvocabulary.language.pangasinan=Pangasinan +controlledvocabulary.language.pangseng=Pangseng +controlledvocabulary.language.pangu=Pangu +controlledvocabulary.language.pangutaran_sama=Pangutaran Sama +controlledvocabulary.language.pangwa=Pangwa +controlledvocabulary.language.pangwali=Pangwali +controlledvocabulary.language.panim=Panim +controlledvocabulary.language.paniya=Paniya +controlledvocabulary.language.panjabi,_punjabi=Panjabi, Punjabi +controlledvocabulary.language.pankarar�=Pankarar� +controlledvocabulary.language.pankarar�=Pankarar� +controlledvocabulary.language.pankhu=Pankhu +controlledvocabulary.language.pannei=Pannei +controlledvocabulary.language.pano=Pano +controlledvocabulary.language.panoan_katuk�na=Panoan Katuk�na +controlledvocabulary.language.panobo=Panobo +controlledvocabulary.language.panyi_bai=Panyi Bai +controlledvocabulary.language.papantla_totonac=Papantla Totonac +controlledvocabulary.language.papapana=Papapana +controlledvocabulary.language.papar=Papar +controlledvocabulary.language.papasena=Papasena +controlledvocabulary.language.papel=Papel +controlledvocabulary.language.papi=Papi +controlledvocabulary.language.papiamento=Papiamento +controlledvocabulary.language.papora=Papora +controlledvocabulary.language.papua_new_guinean_sign_language=Papua New Guinean Sign Language +controlledvocabulary.language.papuan_malay=Papuan Malay +controlledvocabulary.language.papuma=Papuma +controlledvocabulary.language.parachi=Parachi +controlledvocabulary.language.paraguayan_guaran�=Paraguayan Guaran� +controlledvocabulary.language.paraguayan_sign_language=Paraguayan Sign Language +controlledvocabulary.language.parakan�=Parakan� +controlledvocabulary.language.paranan=Paranan +controlledvocabulary.language.paranaw�t=Paranaw�t +controlledvocabulary.language.paraujano=Paraujano +controlledvocabulary.language.parauk=Parauk +controlledvocabulary.language.parawen=Parawen +controlledvocabulary.language.pardhan=Pardhan +controlledvocabulary.language.pardhi=Pardhi +controlledvocabulary.language.pare=Pare +controlledvocabulary.language.parec�s=Parec�s +controlledvocabulary.language.parenga=Parenga +controlledvocabulary.language.parkari_koli=Parkari Koli +controlledvocabulary.language.parkwa=Parkwa +controlledvocabulary.language.parsi-dari=Parsi-Dari +controlledvocabulary.language.parthian=Parthian +controlledvocabulary.language.parya=Parya +controlledvocabulary.language.par�_ar�ra=Par� Ar�ra +controlledvocabulary.language.par�_gavi�o=Par� Gavi�o +controlledvocabulary.language.pashto,_pushto=Pashto, Pushto +controlledvocabulary.language.pasi=Pasi +controlledvocabulary.language.pass_valley_yali=Pass Valley Yali +controlledvocabulary.language.patamona=Patamona +controlledvocabulary.language.patani=Patani +controlledvocabulary.language.patax�_h�-ha-h�e=Patax� H�-Ha-H�e +controlledvocabulary.language.patep=Patep +controlledvocabulary.language.pathiya=Pathiya +controlledvocabulary.language.patpatar=Patpatar +controlledvocabulary.language.pattani=Pattani +controlledvocabulary.language.pattani_malay=Pattani Malay +controlledvocabulary.language.pattapu=Pattapu +controlledvocabulary.language.patwin=Patwin +controlledvocabulary.language.paulohi=Paulohi +controlledvocabulary.language.paumar�=Paumar� +controlledvocabulary.language.paunaka=Paunaka +controlledvocabulary.language.pauri_bareli=Pauri Bareli +controlledvocabulary.language.pauserna=Pauserna +controlledvocabulary.language.pawaia=Pawaia +controlledvocabulary.language.pawnee=Pawnee +controlledvocabulary.language.paynamar=Paynamar +controlledvocabulary.language.pazeh=Pazeh +controlledvocabulary.language.pe=Pe +controlledvocabulary.language.pear=Pear +controlledvocabulary.language.pech=Pech +controlledvocabulary.language.pecheneg=Pecheneg +controlledvocabulary.language.pedi=Pedi +controlledvocabulary.language.pei=Pei +controlledvocabulary.language.pekal=Pekal +controlledvocabulary.language.pela=Pela +controlledvocabulary.language.pele-ata=Pele-Ata +controlledvocabulary.language.pelende=Pelende +controlledvocabulary.language.pemon=Pemon +controlledvocabulary.language.penang_sign_language=Penang Sign Language +controlledvocabulary.language.penchal=Penchal +controlledvocabulary.language.pendau=Pendau +controlledvocabulary.language.pengo=Pengo +controlledvocabulary.language.pennsylvania_german=Pennsylvania German +controlledvocabulary.language.penrhyn=Penrhyn +controlledvocabulary.language.pentlatch=Pentlatch +controlledvocabulary.language.perai=Perai +controlledvocabulary.language.peranakan_indonesian=Peranakan Indonesian +controlledvocabulary.language.pere=Pere +controlledvocabulary.language.peripheral_mongolian=Peripheral Mongolian +controlledvocabulary.language.pero=Pero +controlledvocabulary.language.persian_(farsi)=Persian (Farsi) +controlledvocabulary.language.peruvian_sign_language=Peruvian Sign Language +controlledvocabulary.language.pesse=Pesse +controlledvocabulary.language.petapa_zapotec=Petapa Zapotec +controlledvocabulary.language.petats=Petats +controlledvocabulary.language.petjo=Petjo +controlledvocabulary.language.pe�oles_mixtec=Pe�oles Mixtec +controlledvocabulary.language.pfaelzisch=Pfaelzisch +controlledvocabulary.language.phai=Phai +controlledvocabulary.language.phake=Phake +controlledvocabulary.language.phala=Phala +controlledvocabulary.language.phalura=Phalura +controlledvocabulary.language.phana'=Phana' +controlledvocabulary.language.phangduwali=Phangduwali +controlledvocabulary.language.phende=Phende +controlledvocabulary.language.philippine_sign_language=Philippine Sign Language +controlledvocabulary.language.phimbi=Phimbi +controlledvocabulary.language.phoenician=Phoenician +controlledvocabulary.language.phola=Phola +controlledvocabulary.language.pholo=Pholo +controlledvocabulary.language.phom_naga=Phom Naga +controlledvocabulary.language.phong-kniang=Phong-Kniang +controlledvocabulary.language.phrae_pwo_karen=Phrae Pwo Karen +controlledvocabulary.language.phrygian=Phrygian +controlledvocabulary.language.phu_thai=Phu Thai +controlledvocabulary.language.phuan=Phuan +controlledvocabulary.language.phudagi=Phudagi +controlledvocabulary.language.phuie=Phuie +controlledvocabulary.language.phukha=Phukha +controlledvocabulary.language.phuma=Phuma +controlledvocabulary.language.phunoi=Phunoi +controlledvocabulary.language.phuong=Phuong +controlledvocabulary.language.phupa=Phupa +controlledvocabulary.language.phupha=Phupha +controlledvocabulary.language.phuza=Phuza +controlledvocabulary.language.piamatsina=Piamatsina +controlledvocabulary.language.piame=Piame +controlledvocabulary.language.piapoco=Piapoco +controlledvocabulary.language.piaroa=Piaroa +controlledvocabulary.language.picard=Picard +controlledvocabulary.language.pichis_ash�ninka=Pichis Ash�ninka +controlledvocabulary.language.pictish=Pictish +controlledvocabulary.language.pidgin_delaware=Pidgin Delaware +controlledvocabulary.language.piemontese=Piemontese +controlledvocabulary.language.pijao=Pijao +controlledvocabulary.language.pije=Pije +controlledvocabulary.language.pijin=Pijin +controlledvocabulary.language.pilag�=Pilag� +controlledvocabulary.language.pileni=Pileni +controlledvocabulary.language.pima_bajo=Pima Bajo +controlledvocabulary.language.pimbwe=Pimbwe +controlledvocabulary.language.pinai-hagahai=Pinai-Hagahai +controlledvocabulary.language.pindiini=Pindiini +controlledvocabulary.language.pingelapese=Pingelapese +controlledvocabulary.language.pinigura=Pinigura +controlledvocabulary.language.pinjarup=Pinjarup +controlledvocabulary.language.pinji=Pinji +controlledvocabulary.language.pinotepa_nacional_mixtec=Pinotepa Nacional Mixtec +controlledvocabulary.language.pintupi-luritja=Pintupi-Luritja +controlledvocabulary.language.pinyin=Pinyin +controlledvocabulary.language.pipil=Pipil +controlledvocabulary.language.pirah�=Pirah� +controlledvocabulary.language.piratapuyo=Piratapuyo +controlledvocabulary.language.pirlatapa=Pirlatapa +controlledvocabulary.language.piro=Piro +controlledvocabulary.language.pirriya=Pirriya +controlledvocabulary.language.pisabo=Pisabo +controlledvocabulary.language.pisaflores_tepehua=Pisaflores Tepehua +controlledvocabulary.language.piscataway=Piscataway +controlledvocabulary.language.pisidian=Pisidian +controlledvocabulary.language.pitcairn-norfolk=Pitcairn-Norfolk +controlledvocabulary.language.pite_sami=Pite Sami +controlledvocabulary.language.piti=Piti +controlledvocabulary.language.pitjantjatjara=Pitjantjatjara +controlledvocabulary.language.pitta_pitta=Pitta Pitta +controlledvocabulary.language.piu=Piu +controlledvocabulary.language.piya-kwonci=Piya-Kwonci +controlledvocabulary.language.plains_cree=Plains Cree +controlledvocabulary.language.plains_indian_sign_language=Plains Indian Sign Language +controlledvocabulary.language.plains_miwok=Plains Miwok +controlledvocabulary.language.plapo_krumen=Plapo Krumen +controlledvocabulary.language.plateau_malagasy=Plateau Malagasy +controlledvocabulary.language.plautdietsch=Plautdietsch +controlledvocabulary.language.playero=Playero +controlledvocabulary.language.pnar=Pnar +controlledvocabulary.language.pochuri_naga=Pochuri Naga +controlledvocabulary.language.pochutec=Pochutec +controlledvocabulary.language.podena=Podena +controlledvocabulary.language.pogolo=Pogolo +controlledvocabulary.language.pohnpeian=Pohnpeian +controlledvocabulary.language.pokang�=Pokang� +controlledvocabulary.language.poke=Poke +controlledvocabulary.language.pokomo=Pokomo +controlledvocabulary.language.polabian=Polabian +controlledvocabulary.language.polari=Polari +controlledvocabulary.language.polish=Polish +controlledvocabulary.language.polish_sign_language=Polish Sign Language +controlledvocabulary.language.polonombauk=Polonombauk +controlledvocabulary.language.pom=Pom +controlledvocabulary.language.pomo=Pomo +controlledvocabulary.language.ponam=Ponam +controlledvocabulary.language.ponosakan=Ponosakan +controlledvocabulary.language.pontic=Pontic +controlledvocabulary.language.ponyo-gongwang_naga=Ponyo-Gongwang Naga +controlledvocabulary.language.popti'=Popti' +controlledvocabulary.language.poqomam=Poqomam +controlledvocabulary.language.poqomchi'=Poqomchi' +controlledvocabulary.language.porohanon=Porohanon +controlledvocabulary.language.port_sandwich=Port Sandwich +controlledvocabulary.language.port_sorell_tasmanian=Port Sorell Tasmanian +controlledvocabulary.language.port_vato=Port Vato +controlledvocabulary.language.portuguese=Portuguese +controlledvocabulary.language.portuguese_sign_language=Portuguese Sign Language +controlledvocabulary.language.potawatomi=Potawatomi +controlledvocabulary.language.potigu�ra=Potigu�ra +controlledvocabulary.language.pottangi_ollar_gadaba=Pottangi Ollar Gadaba +controlledvocabulary.language.poumei_naga=Poumei Naga +controlledvocabulary.language.pouye=Pouye +controlledvocabulary.language.powari=Powari +controlledvocabulary.language.powhatan=Powhatan +controlledvocabulary.language.poyan�wa=Poyan�wa +controlledvocabulary.language.prasuni=Prasuni +controlledvocabulary.language.primitive_irish=Primitive Irish +controlledvocabulary.language.principense=Principense +controlledvocabulary.language.providencia_sign_language=Providencia Sign Language +controlledvocabulary.language.prussian=Prussian +controlledvocabulary.language.psikye=Psikye +controlledvocabulary.language.pu-xian_chinese=Pu-Xian Chinese +controlledvocabulary.language.puare=Puare +controlledvocabulary.language.pudtol_atta=Pudtol Atta +controlledvocabulary.language.puebla_mazatec=Puebla Mazatec +controlledvocabulary.language.puelche=Puelche +controlledvocabulary.language.puerto_rican_sign_language=Puerto Rican Sign Language +controlledvocabulary.language.puimei_naga=Puimei Naga +controlledvocabulary.language.puinave=Puinave +controlledvocabulary.language.pukapuka=Pukapuka +controlledvocabulary.language.pulaar=Pulaar +controlledvocabulary.language.pulabu=Pulabu +controlledvocabulary.language.pular=Pular +controlledvocabulary.language.puluwatese=Puluwatese +controlledvocabulary.language.puma=Puma +controlledvocabulary.language.pumpokol=Pumpokol +controlledvocabulary.language.pum�=Pum� +controlledvocabulary.language.punan_aput=Punan Aput +controlledvocabulary.language.punan_bah-biau=Punan Bah-Biau +controlledvocabulary.language.punan_batu_1=Punan Batu 1 +controlledvocabulary.language.punan_merah=Punan Merah +controlledvocabulary.language.punan_merap=Punan Merap +controlledvocabulary.language.punan_tubu=Punan Tubu +controlledvocabulary.language.punic=Punic +controlledvocabulary.language.puno_quechua=Puno Quechua +controlledvocabulary.language.punthamara=Punthamara +controlledvocabulary.language.punu=Punu +controlledvocabulary.language.puoc=Puoc +controlledvocabulary.language.puquina=Puquina +controlledvocabulary.language.puragi=Puragi +controlledvocabulary.language.purari=Purari +controlledvocabulary.language.purepecha=Purepecha +controlledvocabulary.language.puri=Puri +controlledvocabulary.language.purik=Purik +controlledvocabulary.language.purisime�o=Purisime�o +controlledvocabulary.language.puroik=Puroik +controlledvocabulary.language.purubor�=Purubor� +controlledvocabulary.language.purum=Purum +controlledvocabulary.language.putai=Putai +controlledvocabulary.language.putoh=Putoh +controlledvocabulary.language.putukwam=Putukwam +controlledvocabulary.language.puyo=Puyo +controlledvocabulary.language.puyo-paekche=Puyo-Paekche +controlledvocabulary.language.puyuma=Puyuma +controlledvocabulary.language.pwaamei=Pwaamei +controlledvocabulary.language.pwapw�=Pwapw� +controlledvocabulary.language.pwo_eastern_karen=Pwo Eastern Karen +controlledvocabulary.language.pwo_northern_karen=Pwo Northern Karen +controlledvocabulary.language.pwo_western_karen=Pwo Western Karen +controlledvocabulary.language.pyapun=Pyapun +controlledvocabulary.language.pye_krumen=Pye Krumen +controlledvocabulary.language.pyen=Pyen +controlledvocabulary.language.pyu_(myanmar)=Pyu (Myanmar) +controlledvocabulary.language.pyu_(papua_new_guinea)=Pyu (Papua New Guinea) +controlledvocabulary.language.p�ez=P�ez +controlledvocabulary.language.p��fang=P��fang +controlledvocabulary.language.p�ri=P�ri +controlledvocabulary.language.p�mono=P�mono +controlledvocabulary.language.p�v�=P�v� +controlledvocabulary.language.p�koot=P�koot +controlledvocabulary.language.pli=P?li +controlledvocabulary.language.q'anjob'al=Q'anjob'al +controlledvocabulary.language.qabiao=Qabiao +controlledvocabulary.language.qaqet=Qaqet +controlledvocabulary.language.qashqa'i=Qashqa'i +controlledvocabulary.language.qatabanian=Qatabanian +controlledvocabulary.language.qau=Qau +controlledvocabulary.language.qawasqar=Qawasqar +controlledvocabulary.language.qila_muji=Qila Muji +controlledvocabulary.language.qimant=Qimant +controlledvocabulary.language.qiubei_zhuang=Qiubei Zhuang +controlledvocabulary.language.quapaw=Quapaw +controlledvocabulary.language.quebec_sign_language=Quebec Sign Language +controlledvocabulary.language.quechan=Quechan +controlledvocabulary.language.quechua=Quechua +controlledvocabulary.language.quenya=Quenya +controlledvocabulary.language.quer�taro_otomi=Quer�taro Otomi +controlledvocabulary.language.quetzaltepec_mixe=Quetzaltepec Mixe +controlledvocabulary.language.queyu=Queyu +controlledvocabulary.language.quiavicuzas_zapotec=Quiavicuzas Zapotec +controlledvocabulary.language.quileute=Quileute +controlledvocabulary.language.quinault=Quinault +controlledvocabulary.language.quinqui=Quinqui +controlledvocabulary.language.quioquitani-quier�_zapotec=Quioquitani-Quier� Zapotec +controlledvocabulary.language.quiotepec_chinantec=Quiotepec Chinantec +controlledvocabulary.language.quiripi=Quiripi +controlledvocabulary.language.rabha=Rabha +controlledvocabulary.language.rade=Rade +controlledvocabulary.language.raetic=Raetic +controlledvocabulary.language.rahambuu=Rahambuu +controlledvocabulary.language.rajah_kabunsuwan_manobo=Rajah Kabunsuwan Manobo +controlledvocabulary.language.rajasthani=Rajasthani +controlledvocabulary.language.rajbanshi=Rajbanshi +controlledvocabulary.language.raji=Raji +controlledvocabulary.language.rajong=Rajong +controlledvocabulary.language.rajput_garasia=Rajput Garasia +controlledvocabulary.language.rakahanga-manihiki=Rakahanga-Manihiki +controlledvocabulary.language.rakhine=Rakhine +controlledvocabulary.language.ralte=Ralte +controlledvocabulary.language.rama=Rama +controlledvocabulary.language.ramoaaina=Ramoaaina +controlledvocabulary.language.ramopa=Ramopa +controlledvocabulary.language.rampi=Rampi +controlledvocabulary.language.rana_tharu=Rana Tharu +controlledvocabulary.language.rang=Rang +controlledvocabulary.language.rangi=Rangi +controlledvocabulary.language.rangkas=Rangkas +controlledvocabulary.language.ranglong=Ranglong +controlledvocabulary.language.rangpuri=Rangpuri +controlledvocabulary.language.rao=Rao +controlledvocabulary.language.rapa=Rapa +controlledvocabulary.language.rapanui=Rapanui +controlledvocabulary.language.rapoisi=Rapoisi +controlledvocabulary.language.rapting=Rapting +controlledvocabulary.language.rara_bakati'=Rara Bakati' +controlledvocabulary.language.rarotongan=Rarotongan +controlledvocabulary.language.rasawa=Rasawa +controlledvocabulary.language.ratagnon=Ratagnon +controlledvocabulary.language.ratahan=Ratahan +controlledvocabulary.language.rathawi=Rathawi +controlledvocabulary.language.rathwi_bareli=Rathwi Bareli +controlledvocabulary.language.raute=Raute +controlledvocabulary.language.ravula=Ravula +controlledvocabulary.language.rawa=Rawa +controlledvocabulary.language.rawang=Rawang +controlledvocabulary.language.rawat=Rawat +controlledvocabulary.language.rawngtu_chin=Rawngtu Chin +controlledvocabulary.language.rawo=Rawo +controlledvocabulary.language.ray�n_zoque=Ray�n Zoque +controlledvocabulary.language.razajerdi=Razajerdi +controlledvocabulary.language.red_gelao=Red Gelao +controlledvocabulary.language.reel=Reel +controlledvocabulary.language.rejang=Rejang +controlledvocabulary.language.rejang_kayan=Rejang Kayan +controlledvocabulary.language.reli=Reli +controlledvocabulary.language.rema=Rema +controlledvocabulary.language.rembarrnga=Rembarrnga +controlledvocabulary.language.rembong=Rembong +controlledvocabulary.language.remo=Remo +controlledvocabulary.language.remontado_dumagat=Remontado Dumagat +controlledvocabulary.language.rempi=Rempi +controlledvocabulary.language.remun=Remun +controlledvocabulary.language.rendille=Rendille +controlledvocabulary.language.rengao=Rengao +controlledvocabulary.language.rennell-bellona=Rennell-Bellona +controlledvocabulary.language.repanbitip=Repanbitip +controlledvocabulary.language.rer_bare=Rer Bare +controlledvocabulary.language.rerau=Rerau +controlledvocabulary.language.rerep=Rerep +controlledvocabulary.language.reshe=Reshe +controlledvocabulary.language.res�garo=Res�garo +controlledvocabulary.language.retta=Retta +controlledvocabulary.language.reyesano=Reyesano +controlledvocabulary.language.riang_(india)=Riang (India) +controlledvocabulary.language.riang_lai=Riang Lai +controlledvocabulary.language.riang_lang=Riang Lang +controlledvocabulary.language.riantana=Riantana +controlledvocabulary.language.ribun=Ribun +controlledvocabulary.language.rigwe=Rigwe +controlledvocabulary.language.rikbaktsa=Rikbaktsa +controlledvocabulary.language.rinconada_bikol=Rinconada Bikol +controlledvocabulary.language.rinc�n_zapotec=Rinc�n Zapotec +controlledvocabulary.language.ringgou=Ringgou +controlledvocabulary.language.ririo=Ririo +controlledvocabulary.language.rishiwa=Rishiwa +controlledvocabulary.language.ritharrngu=Ritharrngu +controlledvocabulary.language.riung=Riung +controlledvocabulary.language.riverain_sango=Riverain Sango +controlledvocabulary.language.rmeet=Rmeet +controlledvocabulary.language.rogo=Rogo +controlledvocabulary.language.rohingya=Rohingya +controlledvocabulary.language.roma=Roma +controlledvocabulary.language.romagnol=Romagnol +controlledvocabulary.language.romam=Romam +controlledvocabulary.language.romanian=Romanian +controlledvocabulary.language.romanian_sign_language=Romanian Sign Language +controlledvocabulary.language.romano-greek=Romano-Greek +controlledvocabulary.language.romano-serbian=Romano-Serbian +controlledvocabulary.language.romanova=Romanova +controlledvocabulary.language.romansh=Romansh +controlledvocabulary.language.romany=Romany +controlledvocabulary.language.romblomanon=Romblomanon +controlledvocabulary.language.rombo=Rombo +controlledvocabulary.language.romkun=Romkun +controlledvocabulary.language.ron=Ron +controlledvocabulary.language.ronga=Ronga +controlledvocabulary.language.rongga=Rongga +controlledvocabulary.language.rongmei_naga=Rongmei Naga +controlledvocabulary.language.rongpo=Rongpo +controlledvocabulary.language.ronji=Ronji +controlledvocabulary.language.roon=Roon +controlledvocabulary.language.roria=Roria +controlledvocabulary.language.rotokas=Rotokas +controlledvocabulary.language.rotuman=Rotuman +controlledvocabulary.language.roviana=Roviana +controlledvocabulary.language.ruching_palaung=Ruching Palaung +controlledvocabulary.language.rudbari=Rudbari +controlledvocabulary.language.rufiji=Rufiji +controlledvocabulary.language.ruga=Ruga +controlledvocabulary.language.rukai=Rukai +controlledvocabulary.language.ruma=Ruma +controlledvocabulary.language.rumai_palaung=Rumai Palaung +controlledvocabulary.language.rumu=Rumu +controlledvocabulary.language.runga=Runga +controlledvocabulary.language.rungtu_chin=Rungtu Chin +controlledvocabulary.language.rungus=Rungus +controlledvocabulary.language.rungwa=Rungwa +controlledvocabulary.language.russia_buriat=Russia Buriat +controlledvocabulary.language.russian=Russian +controlledvocabulary.language.russian_sign_language=Russian Sign Language +controlledvocabulary.language.rusyn=Rusyn +controlledvocabulary.language.ruthenian=Ruthenian +controlledvocabulary.language.rutul=Rutul +controlledvocabulary.language.ruuli=Ruuli +controlledvocabulary.language.ruund=Ruund +controlledvocabulary.language.ruwila=Ruwila +controlledvocabulary.language.rwa=Rwa +controlledvocabulary.language.rwandan_sign_language=Rwandan Sign Language +controlledvocabulary.language.r�union_creole_french=R�union Creole French +controlledvocabulary.language.rzi=R?zi?? +controlledvocabulary.language.s'gaw_karen=S'gaw Karen +controlledvocabulary.language.sa=Sa +controlledvocabulary.language.sa'a=Sa'a +controlledvocabulary.language.sa'ban=Sa'ban +controlledvocabulary.language.sa'och=Sa'och +controlledvocabulary.language.saafi-saafi=Saafi-Saafi +controlledvocabulary.language.saam=Saam +controlledvocabulary.language.saamia=Saamia +controlledvocabulary.language.saaroa=Saaroa +controlledvocabulary.language.saba=Saba +controlledvocabulary.language.sabaean=Sabaean +controlledvocabulary.language.sabah_bisaya=Sabah Bisaya +controlledvocabulary.language.sabah_malay=Sabah Malay +controlledvocabulary.language.saban�=Saban� +controlledvocabulary.language.sabaot=Sabaot +controlledvocabulary.language.sabine=Sabine +controlledvocabulary.language.sabu=Sabu +controlledvocabulary.language.sab�m=Sab�m +controlledvocabulary.language.sacapulteco=Sacapulteco +controlledvocabulary.language.sadri=Sadri +controlledvocabulary.language.saek=Saek +controlledvocabulary.language.saep=Saep +controlledvocabulary.language.safaliba=Safaliba +controlledvocabulary.language.safeyoka=Safeyoka +controlledvocabulary.language.safwa=Safwa +controlledvocabulary.language.sagala=Sagala +controlledvocabulary.language.sagalla=Sagalla +controlledvocabulary.language.saho=Saho +controlledvocabulary.language.sahu=Sahu +controlledvocabulary.language.saidi_arabic=Saidi Arabic +controlledvocabulary.language.saint_lucian_creole_french=Saint Lucian Creole French +controlledvocabulary.language.saisiyat=Saisiyat +controlledvocabulary.language.sajalong=Sajalong +controlledvocabulary.language.sajau_basap=Sajau Basap +controlledvocabulary.language.sakachep=Sakachep +controlledvocabulary.language.sakalava_malagasy=Sakalava Malagasy +controlledvocabulary.language.sakao=Sakao +controlledvocabulary.language.sakata=Sakata +controlledvocabulary.language.sake=Sake +controlledvocabulary.language.sakirabi�=Sakirabi� +controlledvocabulary.language.sakizaya=Sakizaya +controlledvocabulary.language.sala=Sala +controlledvocabulary.language.salampasu=Salampasu +controlledvocabulary.language.salar=Salar +controlledvocabulary.language.salas=Salas +controlledvocabulary.language.salasaca_highland_quichua=Salasaca Highland Quichua +controlledvocabulary.language.salawati=Salawati +controlledvocabulary.language.saleman=Saleman +controlledvocabulary.language.saliba=Saliba +controlledvocabulary.language.salinan=Salinan +controlledvocabulary.language.sallands=Sallands +controlledvocabulary.language.salt-yui=Salt-Yui +controlledvocabulary.language.saluan=Saluan +controlledvocabulary.language.salum�=Salum� +controlledvocabulary.language.salvadoran_sign_language=Salvadoran Sign Language +controlledvocabulary.language.sam=Sam +controlledvocabulary.language.samaritan=Samaritan +controlledvocabulary.language.samaritan_aramaic=Samaritan Aramaic +controlledvocabulary.language.samarokena=Samarokena +controlledvocabulary.language.samatao=Samatao +controlledvocabulary.language.samay=Samay +controlledvocabulary.language.samba=Samba +controlledvocabulary.language.samba_daka=Samba Daka +controlledvocabulary.language.samba_leko=Samba Leko +controlledvocabulary.language.sambal=Sambal +controlledvocabulary.language.sambalpuri=Sambalpuri +controlledvocabulary.language.sambe=Sambe +controlledvocabulary.language.samberigi=Samberigi +controlledvocabulary.language.samburu=Samburu +controlledvocabulary.language.samei=Samei +controlledvocabulary.language.samo=Samo +controlledvocabulary.language.samoan=Samoan +controlledvocabulary.language.samogitian=Samogitian +controlledvocabulary.language.samosa=Samosa +controlledvocabulary.language.sampang=Sampang +controlledvocabulary.language.samre=Samre +controlledvocabulary.language.samtao=Samtao +controlledvocabulary.language.samvedi=Samvedi +controlledvocabulary.language.san_agust�n_mixtepec_zapotec=San Agust�n Mixtepec Zapotec +controlledvocabulary.language.san_baltazar_loxicha_zapotec=San Baltazar Loxicha Zapotec +controlledvocabulary.language.san_blas_kuna=San Blas Kuna +controlledvocabulary.language.san_dionisio_del_mar_huave=San Dionisio Del Mar Huave +controlledvocabulary.language.san_felipe_otlaltepec_popoloca=San Felipe Otlaltepec Popoloca +controlledvocabulary.language.san_francisco_del_mar_huave=San Francisco Del Mar Huave +controlledvocabulary.language.san_francisco_matlatzinca=San Francisco Matlatzinca +controlledvocabulary.language.san_jer�nimo_tec�atl_mazatec=San Jer�nimo Tec�atl Mazatec +controlledvocabulary.language.san_juan_atzingo_popoloca=San Juan Atzingo Popoloca +controlledvocabulary.language.san_juan_colorado_mixtec=San Juan Colorado Mixtec +controlledvocabulary.language.san_juan_teita_mixtec=San Juan Teita Mixtec +controlledvocabulary.language.san_lu�s_temalacayuca_popoloca=San Lu�s Temalacayuca Popoloca +controlledvocabulary.language.san_marcos_tlacoyalco_popoloca=San Marcos Tlacoyalco Popoloca +controlledvocabulary.language.san_mart�n_itunyoso_triqui=San Mart�n Itunyoso Triqui +controlledvocabulary.language.san_mart�n_quechua=San Mart�n Quechua +controlledvocabulary.language.san_mateo_del_mar_huave=San Mateo Del Mar Huave +controlledvocabulary.language.san_miguel_creole_french=San Miguel Creole French +controlledvocabulary.language.san_miguel_el_grande_mixtec=San Miguel El Grande Mixtec +controlledvocabulary.language.san_miguel_piedras_mixtec=San Miguel Piedras Mixtec +controlledvocabulary.language.san_pedro_amuzgos_amuzgo=San Pedro Amuzgos Amuzgo +controlledvocabulary.language.san_pedro_quiatoni_zapotec=San Pedro Quiatoni Zapotec +controlledvocabulary.language.san_salvador_kongo=San Salvador Kongo +controlledvocabulary.language.san_vicente_coatl�n_zapotec=San Vicente Coatl�n Zapotec +controlledvocabulary.language.sanaani_arabic=Sanaani Arabic +controlledvocabulary.language.sanapan�=Sanapan� +controlledvocabulary.language.sandawe=Sandawe +controlledvocabulary.language.sanga_(democratic_republic_of_congo)=Sanga (Democratic Republic of Congo) +controlledvocabulary.language.sanga_(nigeria)=Sanga (Nigeria) +controlledvocabulary.language.sanggau=Sanggau +controlledvocabulary.language.sangil=Sangil +controlledvocabulary.language.sangir=Sangir +controlledvocabulary.language.sangisari=Sangisari +controlledvocabulary.language.sangkong=Sangkong +controlledvocabulary.language.sanglechi=Sanglechi +controlledvocabulary.language.sango=Sango +controlledvocabulary.language.sangtam_naga=Sangtam Naga +controlledvocabulary.language.sangu_(gabon)=Sangu (Gabon) +controlledvocabulary.language.sangu_(tanzania)=Sangu (Tanzania) +controlledvocabulary.language.sani=Sani +controlledvocabulary.language.sanie=Sanie +controlledvocabulary.language.saniyo-hiyewe=Saniyo-Hiyewe +controlledvocabulary.language.sankaran_maninka=Sankaran Maninka +controlledvocabulary.language.sansi=Sansi +controlledvocabulary.language.sanskrit_(saskta)=Sanskrit (Sa?sk?ta) +controlledvocabulary.language.santa_ana_de_tusi_pasco_quechua=Santa Ana de Tusi Pasco Quechua +controlledvocabulary.language.santa_catarina_albarradas_zapotec=Santa Catarina Albarradas Zapotec +controlledvocabulary.language.santa_in�s_ahuatempan_popoloca=Santa In�s Ahuatempan Popoloca +controlledvocabulary.language.santa_in�s_yatzechi_zapotec=Santa In�s Yatzechi Zapotec +controlledvocabulary.language.santa_luc�a_monteverde_mixtec=Santa Luc�a Monteverde Mixtec +controlledvocabulary.language.santa_mar�a_del_mar_huave=Santa Mar�a Del Mar Huave +controlledvocabulary.language.santa_mar�a_la_alta_nahuatl=Santa Mar�a La Alta Nahuatl +controlledvocabulary.language.santa_mar�a_quiegolani_zapotec=Santa Mar�a Quiegolani Zapotec +controlledvocabulary.language.santa_mar�a_zacatepec_mixtec=Santa Mar�a Zacatepec Mixtec +controlledvocabulary.language.santa_teresa_cora=Santa Teresa Cora +controlledvocabulary.language.santali=Santali +controlledvocabulary.language.santiago_xanica_zapotec=Santiago Xanica Zapotec +controlledvocabulary.language.santiago_del_estero_quichua=Santiago del Estero Quichua +controlledvocabulary.language.santo_domingo_albarradas_zapotec=Santo Domingo Albarradas Zapotec +controlledvocabulary.language.sanum�=Sanum� +controlledvocabulary.language.saparua=Saparua +controlledvocabulary.language.sapo=Sapo +controlledvocabulary.language.saponi=Saponi +controlledvocabulary.language.saposa=Saposa +controlledvocabulary.language.sapuan=Sapuan +controlledvocabulary.language.sap�=Sap� +controlledvocabulary.language.sar=Sar +controlledvocabulary.language.sara=Sara +controlledvocabulary.language.sara_kaba=Sara Kaba +controlledvocabulary.language.sara_kaba_deme=Sara Kaba Deme +controlledvocabulary.language.sara_kaba_n��=Sara Kaba N�� +controlledvocabulary.language.saraiki=Saraiki +controlledvocabulary.language.saramaccan=Saramaccan +controlledvocabulary.language.sarangani_blaan=Sarangani Blaan +controlledvocabulary.language.sarangani_manobo=Sarangani Manobo +controlledvocabulary.language.sarasira=Sarasira +controlledvocabulary.language.saraveca=Saraveca +controlledvocabulary.language.sardinian=Sardinian +controlledvocabulary.language.sari=Sari +controlledvocabulary.language.sarikoli=Sarikoli +controlledvocabulary.language.sarli=Sarli +controlledvocabulary.language.sarsi=Sarsi +controlledvocabulary.language.sartang=Sartang +controlledvocabulary.language.sarua=Sarua +controlledvocabulary.language.sarudu=Sarudu +controlledvocabulary.language.saruga=Saruga +controlledvocabulary.language.sasak=Sasak +controlledvocabulary.language.sasaru=Sasaru +controlledvocabulary.language.sassarese_sardinian=Sassarese Sardinian +controlledvocabulary.language.satawalese=Satawalese +controlledvocabulary.language.saterfriesisch=Saterfriesisch +controlledvocabulary.language.sater�-maw�=Sater�-Maw� +controlledvocabulary.language.saudi_arabian_sign_language=Saudi Arabian Sign Language +controlledvocabulary.language.sauraseni_prkrit=Sauraseni Pr?krit +controlledvocabulary.language.saurashtra=Saurashtra +controlledvocabulary.language.sauri=Sauri +controlledvocabulary.language.sauria_paharia=Sauria Paharia +controlledvocabulary.language.sause=Sause +controlledvocabulary.language.sausi=Sausi +controlledvocabulary.language.savi=Savi +controlledvocabulary.language.savosavo=Savosavo +controlledvocabulary.language.sawai=Sawai +controlledvocabulary.language.saweru=Saweru +controlledvocabulary.language.sawi=Sawi +controlledvocabulary.language.sawila=Sawila +controlledvocabulary.language.sawknah=Sawknah +controlledvocabulary.language.saxwe_gbe=Saxwe Gbe +controlledvocabulary.language.saya=Saya +controlledvocabulary.language.sayula_popoluca=Sayula Popoluca +controlledvocabulary.language.scots=Scots +controlledvocabulary.language.scythian=Scythian +controlledvocabulary.language.sea_island_creole_english=Sea Island Creole English +controlledvocabulary.language.seba=Seba +controlledvocabulary.language.sebat_bet_gurage=Sebat Bet Gurage +controlledvocabulary.language.seberuang=Seberuang +controlledvocabulary.language.sebop=Sebop +controlledvocabulary.language.sechelt=Sechelt +controlledvocabulary.language.secoya=Secoya +controlledvocabulary.language.sedang=Sedang +controlledvocabulary.language.sediq=Sediq +controlledvocabulary.language.sedoa=Sedoa +controlledvocabulary.language.seeku=Seeku +controlledvocabulary.language.segai=Segai +controlledvocabulary.language.segeju=Segeju +controlledvocabulary.language.seget=Seget +controlledvocabulary.language.sehwi=Sehwi +controlledvocabulary.language.seimat=Seimat +controlledvocabulary.language.seit-kaitetu=Seit-Kaitetu +controlledvocabulary.language.sekani=Sekani +controlledvocabulary.language.sekapan=Sekapan +controlledvocabulary.language.sekar=Sekar +controlledvocabulary.language.seke_(nepal)=Seke (Nepal) +controlledvocabulary.language.seke_(vanuatu)=Seke (Vanuatu) +controlledvocabulary.language.sekele=Sekele +controlledvocabulary.language.seki=Seki +controlledvocabulary.language.seko_padang=Seko Padang +controlledvocabulary.language.seko_tengah=Seko Tengah +controlledvocabulary.language.sekpele=Sekpele +controlledvocabulary.language.selangor_sign_language=Selangor Sign Language +controlledvocabulary.language.selaru=Selaru +controlledvocabulary.language.selayar=Selayar +controlledvocabulary.language.selee=Selee +controlledvocabulary.language.selepet=Selepet +controlledvocabulary.language.selian=Selian +controlledvocabulary.language.selkup=Selkup +controlledvocabulary.language.selungai_murut=Selungai Murut +controlledvocabulary.language.seluwasan=Seluwasan +controlledvocabulary.language.semai=Semai +controlledvocabulary.language.semandang=Semandang +controlledvocabulary.language.semaq_beri=Semaq Beri +controlledvocabulary.language.sembakung_murut=Sembakung Murut +controlledvocabulary.language.semelai=Semelai +controlledvocabulary.language.semimi=Semimi +controlledvocabulary.language.semnam=Semnam +controlledvocabulary.language.semnani=Semnani +controlledvocabulary.language.sempan=Sempan +controlledvocabulary.language.sena=Sena +controlledvocabulary.language.senara_s�noufo=Senara S�noufo +controlledvocabulary.language.senaya=Senaya +controlledvocabulary.language.sene=Sene +controlledvocabulary.language.seneca=Seneca +controlledvocabulary.language.sened=Sened +controlledvocabulary.language.sengele=Sengele +controlledvocabulary.language.senggi=Senggi +controlledvocabulary.language.sengo=Sengo +controlledvocabulary.language.sengseng=Sengseng +controlledvocabulary.language.senhaja_de_srair=Senhaja De Srair +controlledvocabulary.language.sensi=Sensi +controlledvocabulary.language.sentani=Sentani +controlledvocabulary.language.senthang_chin=Senthang Chin +controlledvocabulary.language.sentinel=Sentinel +controlledvocabulary.language.sepa_(indonesia)=Sepa (Indonesia) +controlledvocabulary.language.sepa_(papua_new_guinea)=Sepa (Papua New Guinea) +controlledvocabulary.language.sepik_iwam=Sepik Iwam +controlledvocabulary.language.sera=Sera +controlledvocabulary.language.serbian=Serbian +controlledvocabulary.language.serbo-croatian=Serbo-Croatian +controlledvocabulary.language.sere=Sere +controlledvocabulary.language.serer=Serer +controlledvocabulary.language.seri=Seri +controlledvocabulary.language.serili=Serili +controlledvocabulary.language.seroa=Seroa +controlledvocabulary.language.serrano=Serrano +controlledvocabulary.language.serua=Serua +controlledvocabulary.language.serudung_murut=Serudung Murut +controlledvocabulary.language.serui-laut=Serui-Laut +controlledvocabulary.language.seselwa_creole_french=Seselwa Creole French +controlledvocabulary.language.seta=Seta +controlledvocabulary.language.setaman=Setaman +controlledvocabulary.language.seti=Seti +controlledvocabulary.language.settla=Settla +controlledvocabulary.language.severn_ojibwa=Severn Ojibwa +controlledvocabulary.language.sewa_bay=Sewa Bay +controlledvocabulary.language.seychelles_sign_language=Seychelles Sign Language +controlledvocabulary.language.seze=Seze +controlledvocabulary.language.sha=Sha +controlledvocabulary.language.shabak=Shabak +controlledvocabulary.language.shahmirzadi=Shahmirzadi +controlledvocabulary.language.shahrudi=Shahrudi +controlledvocabulary.language.shall-zwall=Shall-Zwall +controlledvocabulary.language.shama-sambuga=Shama-Sambuga +controlledvocabulary.language.shamang=Shamang +controlledvocabulary.language.shambala=Shambala +controlledvocabulary.language.shan=Shan +controlledvocabulary.language.shanenawa=Shanenawa +controlledvocabulary.language.shanga=Shanga +controlledvocabulary.language.sharanahua=Sharanahua +controlledvocabulary.language.shark_bay=Shark Bay +controlledvocabulary.language.sharwa=Sharwa +controlledvocabulary.language.shasta=Shasta +controlledvocabulary.language.shatt=Shatt +controlledvocabulary.language.shau=Shau +controlledvocabulary.language.shawnee=Shawnee +controlledvocabulary.language.she=She +controlledvocabulary.language.shehri=Shehri +controlledvocabulary.language.shekhawati=Shekhawati +controlledvocabulary.language.shekkacho=Shekkacho +controlledvocabulary.language.sheko=Sheko +controlledvocabulary.language.shelta=Shelta +controlledvocabulary.language.shempire_senoufo=Shempire Senoufo +controlledvocabulary.language.shendu=Shendu +controlledvocabulary.language.sheni=Sheni +controlledvocabulary.language.sherbro=Sherbro +controlledvocabulary.language.sherdukpen=Sherdukpen +controlledvocabulary.language.sherpa=Sherpa +controlledvocabulary.language.sheshi_kham=Sheshi Kham +controlledvocabulary.language.shi=Shi +controlledvocabulary.language.shihhi_arabic=Shihhi Arabic +controlledvocabulary.language.shiki=Shiki +controlledvocabulary.language.shilluk=Shilluk +controlledvocabulary.language.shina=Shina +controlledvocabulary.language.shipibo-conibo=Shipibo-Conibo +controlledvocabulary.language.sholaga=Sholaga +controlledvocabulary.language.shom_peng=Shom Peng +controlledvocabulary.language.shona=Shona +controlledvocabulary.language.shoo-minda-nye=Shoo-Minda-Nye +controlledvocabulary.language.shor=Shor +controlledvocabulary.language.shoshoni=Shoshoni +controlledvocabulary.language.shua=Shua +controlledvocabulary.language.shuadit=Shuadit +controlledvocabulary.language.shuar=Shuar +controlledvocabulary.language.shubi=Shubi +controlledvocabulary.language.shughni=Shughni +controlledvocabulary.language.shuhi=Shuhi +controlledvocabulary.language.shumashti=Shumashti +controlledvocabulary.language.shumcho=Shumcho +controlledvocabulary.language.shuswap=Shuswap +controlledvocabulary.language.shwai=Shwai +controlledvocabulary.language.shwe_palaung=Shwe Palaung +controlledvocabulary.language.sialum=Sialum +controlledvocabulary.language.siamou=Siamou +controlledvocabulary.language.sian=Sian +controlledvocabulary.language.siane=Siane +controlledvocabulary.language.siang=Siang +controlledvocabulary.language.siar-lak=Siar-Lak +controlledvocabulary.language.siawi=Siawi +controlledvocabulary.language.sibe=Sibe +controlledvocabulary.language.siberian_tatar=Siberian Tatar +controlledvocabulary.language.sibu_melanau=Sibu Melanau +controlledvocabulary.language.sicanian=Sicanian +controlledvocabulary.language.sicel=Sicel +controlledvocabulary.language.sicilian=Sicilian +controlledvocabulary.language.siculo_arabic=Siculo Arabic +controlledvocabulary.language.sidamo=Sidamo +controlledvocabulary.language.sidetic=Sidetic +controlledvocabulary.language.sie=Sie +controlledvocabulary.language.sierra_leone_sign_language=Sierra Leone Sign Language +controlledvocabulary.language.sierra_negra_nahuatl=Sierra Negra Nahuatl +controlledvocabulary.language.sierra_de_ju�rez_zapotec=Sierra de Ju�rez Zapotec +controlledvocabulary.language.sighu=Sighu +controlledvocabulary.language.sihan=Sihan +controlledvocabulary.language.sihuas_ancash_quechua=Sihuas Ancash Quechua +controlledvocabulary.language.sika=Sika +controlledvocabulary.language.sikaiana=Sikaiana +controlledvocabulary.language.sikaritai=Sikaritai +controlledvocabulary.language.sikiana=Sikiana +controlledvocabulary.language.sikkimese=Sikkimese +controlledvocabulary.language.siksika=Siksika +controlledvocabulary.language.sikule=Sikule +controlledvocabulary.language.sila=Sila +controlledvocabulary.language.silacayoapan_mixtec=Silacayoapan Mixtec +controlledvocabulary.language.sileibi=Sileibi +controlledvocabulary.language.silesian=Silesian +controlledvocabulary.language.silimo=Silimo +controlledvocabulary.language.siliput=Siliput +controlledvocabulary.language.silopi=Silopi +controlledvocabulary.language.silt'e=Silt'e +controlledvocabulary.language.simaa=Simaa +controlledvocabulary.language.simba=Simba +controlledvocabulary.language.simbali=Simbali +controlledvocabulary.language.simbari=Simbari +controlledvocabulary.language.simbo=Simbo +controlledvocabulary.language.simeku=Simeku +controlledvocabulary.language.simeulue=Simeulue +controlledvocabulary.language.simte=Simte +controlledvocabulary.language.sinagen=Sinagen +controlledvocabulary.language.sinasina=Sinasina +controlledvocabulary.language.sinaugoro=Sinaugoro +controlledvocabulary.language.sindarin=Sindarin +controlledvocabulary.language.sindhi=Sindhi +controlledvocabulary.language.sindhi_bhil=Sindhi Bhil +controlledvocabulary.language.sindihui_mixtec=Sindihui Mixtec +controlledvocabulary.language.singa=Singa +controlledvocabulary.language.singapore_sign_language=Singapore Sign Language +controlledvocabulary.language.singpho=Singpho +controlledvocabulary.language.sinhala,_sinhalese=Sinhala, Sinhalese +controlledvocabulary.language.sinicahua_mixtec=Sinicahua Mixtec +controlledvocabulary.language.sininkere=Sininkere +controlledvocabulary.language.sinte_romani=Sinte Romani +controlledvocabulary.language.sinyar=Sinyar +controlledvocabulary.language.sio=Sio +controlledvocabulary.language.siona=Siona +controlledvocabulary.language.sipacapense=Sipacapense +controlledvocabulary.language.sira=Sira +controlledvocabulary.language.siraya=Siraya +controlledvocabulary.language.sirenik_yupik=Sirenik Yupik +controlledvocabulary.language.siri=Siri +controlledvocabulary.language.siriano=Siriano +controlledvocabulary.language.sirion�=Sirion� +controlledvocabulary.language.sirmauri=Sirmauri +controlledvocabulary.language.siroi=Siroi +controlledvocabulary.language.sissala=Sissala +controlledvocabulary.language.sissano=Sissano +controlledvocabulary.language.siuslaw=Siuslaw +controlledvocabulary.language.sivandi=Sivandi +controlledvocabulary.language.sivia_sign_language=Sivia Sign Language +controlledvocabulary.language.siwai=Siwai +controlledvocabulary.language.siwi=Siwi +controlledvocabulary.language.siwu=Siwu +controlledvocabulary.language.siyin_chin=Siyin Chin +controlledvocabulary.language.skagit=Skagit +controlledvocabulary.language.skalvian=Skalvian +controlledvocabulary.language.skepi_creole_dutch=Skepi Creole Dutch +controlledvocabulary.language.skolt_sami=Skolt Sami +controlledvocabulary.language.skou=Skou +controlledvocabulary.language.slave_(athapascan)=Slave (Athapascan) +controlledvocabulary.language.slavomolisano=Slavomolisano +controlledvocabulary.language.slovak=Slovak +controlledvocabulary.language.slovakian_sign_language=Slovakian Sign Language +controlledvocabulary.language.slovenian=Slovenian +controlledvocabulary.language.small_flowery_miao=Small Flowery Miao +controlledvocabulary.language.sm�rky_kanum=Sm�rky Kanum +controlledvocabulary.language.snohomish=Snohomish +controlledvocabulary.language.so_(democratic_republic_of_congo)=So (Democratic Republic of Congo) +controlledvocabulary.language.so'a=So'a +controlledvocabulary.language.sobei=Sobei +controlledvocabulary.language.sochiapam_chinantec=Sochiapam Chinantec +controlledvocabulary.language.soga=Soga +controlledvocabulary.language.sogdian=Sogdian +controlledvocabulary.language.soi=Soi +controlledvocabulary.language.sokoro=Sokoro +controlledvocabulary.language.solano=Solano +controlledvocabulary.language.soli=Soli +controlledvocabulary.language.solomon_islands_sign_language=Solomon Islands Sign Language +controlledvocabulary.language.solong=Solong +controlledvocabulary.language.solos=Solos +controlledvocabulary.language.som=Som +controlledvocabulary.language.somali=Somali +controlledvocabulary.language.somba-siawari=Somba-Siawari +controlledvocabulary.language.somrai=Somrai +controlledvocabulary.language.somray=Somray +controlledvocabulary.language.somyev=Somyev +controlledvocabulary.language.sonaga=Sonaga +controlledvocabulary.language.sonde=Sonde +controlledvocabulary.language.songe=Songe +controlledvocabulary.language.songlai_chin=Songlai Chin +controlledvocabulary.language.songo=Songo +controlledvocabulary.language.songomeno=Songomeno +controlledvocabulary.language.songoora=Songoora +controlledvocabulary.language.sonha=Sonha +controlledvocabulary.language.sonia=Sonia +controlledvocabulary.language.soninke=Soninke +controlledvocabulary.language.sonsorol=Sonsorol +controlledvocabulary.language.soo=Soo +controlledvocabulary.language.sop=Sop +controlledvocabulary.language.soqotri=Soqotri +controlledvocabulary.language.sora=Sora +controlledvocabulary.language.sori-harengan=Sori-Harengan +controlledvocabulary.language.sorkhei=Sorkhei +controlledvocabulary.language.sorothaptic=Sorothaptic +controlledvocabulary.language.sorsogon_ayta=Sorsogon Ayta +controlledvocabulary.language.sos_kundi=Sos Kundi +controlledvocabulary.language.sota_kanum=Sota Kanum +controlledvocabulary.language.sou=Sou +controlledvocabulary.language.sou_nama=Sou Nama +controlledvocabulary.language.sou_upaa=Sou Upaa +controlledvocabulary.language.south_african_sign_language=South African Sign Language +controlledvocabulary.language.south_awyu=South Awyu +controlledvocabulary.language.south_azerbaijani=South Azerbaijani +controlledvocabulary.language.south_bolivian_quechua=South Bolivian Quechua +controlledvocabulary.language.south_central_banda=South Central Banda +controlledvocabulary.language.south_central_dinka=South Central Dinka +controlledvocabulary.language.south_efate=South Efate +controlledvocabulary.language.south_fali=South Fali +controlledvocabulary.language.south_giziga=South Giziga +controlledvocabulary.language.south_lembata=South Lembata +controlledvocabulary.language.south_marquesan=South Marquesan +controlledvocabulary.language.south_muyu=South Muyu +controlledvocabulary.language.south_nuaulu=South Nuaulu +controlledvocabulary.language.south_picene=South Picene +controlledvocabulary.language.south_slavey=South Slavey +controlledvocabulary.language.south_tairora=South Tairora +controlledvocabulary.language.south_ucayali_ash�ninka=South Ucayali Ash�ninka +controlledvocabulary.language.south_watut=South Watut +controlledvocabulary.language.south_west_bay=South West Bay +controlledvocabulary.language.southeast_ambrym=Southeast Ambrym +controlledvocabulary.language.southeast_babar=Southeast Babar +controlledvocabulary.language.southeast_ijo=Southeast Ijo +controlledvocabulary.language.southeast_pashai=Southeast Pashai +controlledvocabulary.language.southeast_tasmanian=Southeast Tasmanian +controlledvocabulary.language.southeastern_dinka=Southeastern Dinka +controlledvocabulary.language.southeastern_ixtl�n_zapotec=Southeastern Ixtl�n Zapotec +controlledvocabulary.language.southeastern_kolami=Southeastern Kolami +controlledvocabulary.language.southeastern_nochixtl�n_mixtec=Southeastern Nochixtl�n Mixtec +controlledvocabulary.language.southeastern_pomo=Southeastern Pomo +controlledvocabulary.language.southeastern_puebla_nahuatl=Southeastern Puebla Nahuatl +controlledvocabulary.language.southeastern_tarahumara=Southeastern Tarahumara +controlledvocabulary.language.southeastern_tepehuan=Southeastern Tepehuan +controlledvocabulary.language.southern_alta=Southern Alta +controlledvocabulary.language.southern_altai=Southern Altai +controlledvocabulary.language.southern_amami-oshima=Southern Amami-Oshima +controlledvocabulary.language.southern_aymara=Southern Aymara +controlledvocabulary.language.southern_bai=Southern Bai +controlledvocabulary.language.southern_balochi=Southern Balochi +controlledvocabulary.language.southern_betsimisaraka_malagasy=Southern Betsimisaraka Malagasy +controlledvocabulary.language.southern_binukidnon=Southern Binukidnon +controlledvocabulary.language.southern_birifor=Southern Birifor +controlledvocabulary.language.southern_bobo_madar�=Southern Bobo Madar� +controlledvocabulary.language.southern_bontok=Southern Bontok +controlledvocabulary.language.southern_carrier=Southern Carrier +controlledvocabulary.language.southern_catanduanes_bikol=Southern Catanduanes Bikol +controlledvocabulary.language.southern_conchucos_ancash_quechua=Southern Conchucos Ancash Quechua +controlledvocabulary.language.southern_dagaare=Southern Dagaare +controlledvocabulary.language.southern_dong=Southern Dong +controlledvocabulary.language.southern_east_cree=Southern East Cree +controlledvocabulary.language.southern_ghale=Southern Ghale +controlledvocabulary.language.southern_grebo=Southern Grebo +controlledvocabulary.language.southern_guiyang_hmong=Southern Guiyang Hmong +controlledvocabulary.language.southern_haida=Southern Haida +controlledvocabulary.language.southern_hindko=Southern Hindko +controlledvocabulary.language.southern_kalapuya=Southern Kalapuya +controlledvocabulary.language.southern_kalinga=Southern Kalinga +controlledvocabulary.language.southern_katang=Southern Katang +controlledvocabulary.language.southern_kisi=Southern Kisi +controlledvocabulary.language.southern_kiwai=Southern Kiwai +controlledvocabulary.language.southern_kurdish=Southern Kurdish +controlledvocabulary.language.southern_lolopo=Southern Lolopo +controlledvocabulary.language.southern_luri=Southern Luri +controlledvocabulary.language.southern_ma'di=Southern Ma'di +controlledvocabulary.language.southern_mashan_hmong=Southern Mashan Hmong +controlledvocabulary.language.southern_mnong=Southern Mnong +controlledvocabulary.language.southern_muji=Southern Muji +controlledvocabulary.language.southern_nago=Southern Nago +controlledvocabulary.language.southern_nambiku�ra=Southern Nambiku�ra +controlledvocabulary.language.southern_ndebele=Southern Ndebele +controlledvocabulary.language.southern_ngbandi=Southern Ngbandi +controlledvocabulary.language.southern_nicobarese=Southern Nicobarese +controlledvocabulary.language.southern_nisu=Southern Nisu +controlledvocabulary.language.southern_nuni=Southern Nuni +controlledvocabulary.language.southern_ohlone=Southern Ohlone +controlledvocabulary.language.southern_one=Southern One +controlledvocabulary.language.southern_pame=Southern Pame +controlledvocabulary.language.southern_pashto=Southern Pashto +controlledvocabulary.language.southern_pastaza_quechua=Southern Pastaza Quechua +controlledvocabulary.language.southern_ping_chinese=Southern Ping Chinese +controlledvocabulary.language.southern_pomo=Southern Pomo +controlledvocabulary.language.southern_puebla_mixtec=Southern Puebla Mixtec +controlledvocabulary.language.southern_puget_sound_salish=Southern Puget Sound Salish +controlledvocabulary.language.southern_pumi=Southern Pumi +controlledvocabulary.language.southern_qiandong_miao=Southern Qiandong Miao +controlledvocabulary.language.southern_qiang=Southern Qiang +controlledvocabulary.language.southern_rengma_naga=Southern Rengma Naga +controlledvocabulary.language.southern_rincon_zapotec=Southern Rincon Zapotec +controlledvocabulary.language.southern_roglai=Southern Roglai +controlledvocabulary.language.southern_sama=Southern Sama +controlledvocabulary.language.southern_sami=Southern Sami +controlledvocabulary.language.southern_samo=Southern Samo +controlledvocabulary.language.southern_sierra_miwok=Southern Sierra Miwok +controlledvocabulary.language.southern_sorsoganon=Southern Sorsoganon +controlledvocabulary.language.southern_sotho=Southern Sotho +controlledvocabulary.language.southern_subanen=Southern Subanen +controlledvocabulary.language.southern_thai=Southern Thai +controlledvocabulary.language.southern_tidung=Southern Tidung +controlledvocabulary.language.southern_tiwa=Southern Tiwa +controlledvocabulary.language.southern_toussian=Southern Toussian +controlledvocabulary.language.southern_tujia=Southern Tujia +controlledvocabulary.language.southern_tutchone=Southern Tutchone +controlledvocabulary.language.southern_uzbek=Southern Uzbek +controlledvocabulary.language.southern_yamphu=Southern Yamphu +controlledvocabulary.language.southern_yukaghir=Southern Yukaghir +controlledvocabulary.language.southwest_gbaya=Southwest Gbaya +controlledvocabulary.language.southwest_palawano=Southwest Palawano +controlledvocabulary.language.southwest_pashai=Southwest Pashai +controlledvocabulary.language.southwest_tanna=Southwest Tanna +controlledvocabulary.language.southwestern_bontok=Southwestern Bontok +controlledvocabulary.language.southwestern_dinka=Southwestern Dinka +controlledvocabulary.language.southwestern_fars=Southwestern Fars +controlledvocabulary.language.southwestern_guiyang_hmong=Southwestern Guiyang Hmong +controlledvocabulary.language.southwestern_huishui_hmong=Southwestern Huishui Hmong +controlledvocabulary.language.southwestern_nisu=Southwestern Nisu +controlledvocabulary.language.southwestern_tarahumara=Southwestern Tarahumara +controlledvocabulary.language.southwestern_tasmanian=Southwestern Tasmanian +controlledvocabulary.language.southwestern_tepehuan=Southwestern Tepehuan +controlledvocabulary.language.southwestern_tlaxiaco_mixtec=Southwestern Tlaxiaco Mixtec +controlledvocabulary.language.sowa=Sowa +controlledvocabulary.language.sowanda=Sowanda +controlledvocabulary.language.soyaltepec_mazatec=Soyaltepec Mazatec +controlledvocabulary.language.soyaltepec_mixtec=Soyaltepec Mixtec +controlledvocabulary.language.spanish_sign_language=Spanish Sign Language +controlledvocabulary.language.spanish,_castilian=Spanish, Castilian +controlledvocabulary.language.spiti_bhoti=Spiti Bhoti +controlledvocabulary.language.spokane=Spokane +controlledvocabulary.language.squamish=Squamish +controlledvocabulary.language.sranan_tongo=Sranan Tongo +controlledvocabulary.language.sri_lankan_creole_malay=Sri Lankan Creole Malay +controlledvocabulary.language.sri_lankan_sign_language=Sri Lankan Sign Language +controlledvocabulary.language.standard_arabic=Standard Arabic +controlledvocabulary.language.standard_estonian=Standard Estonian +controlledvocabulary.language.standard_latvian=Standard Latvian +controlledvocabulary.language.standard_malay=Standard Malay +controlledvocabulary.language.standard_moroccan_tamazight=Standard Moroccan Tamazight +controlledvocabulary.language.stellingwerfs=Stellingwerfs +controlledvocabulary.language.stod_bhoti=Stod Bhoti +controlledvocabulary.language.stoney=Stoney +controlledvocabulary.language.straits_salish=Straits Salish +controlledvocabulary.language.suabo=Suabo +controlledvocabulary.language.suarmin=Suarmin +controlledvocabulary.language.suau=Suau +controlledvocabulary.language.suba=Suba +controlledvocabulary.language.suba-simbiti=Suba-Simbiti +controlledvocabulary.language.subi=Subi +controlledvocabulary.language.subiya=Subiya +controlledvocabulary.language.subtiaba=Subtiaba +controlledvocabulary.language.sudanese_arabic=Sudanese Arabic +controlledvocabulary.language.sudanese_creole_arabic=Sudanese Creole Arabic +controlledvocabulary.language.sudest=Sudest +controlledvocabulary.language.sudovian=Sudovian +controlledvocabulary.language.suena=Suena +controlledvocabulary.language.suga=Suga +controlledvocabulary.language.suganga=Suganga +controlledvocabulary.language.sugut_dusun=Sugut Dusun +controlledvocabulary.language.sui=Sui +controlledvocabulary.language.suki=Suki +controlledvocabulary.language.suku=Suku +controlledvocabulary.language.sukuma=Sukuma +controlledvocabulary.language.sukur=Sukur +controlledvocabulary.language.sukurum=Sukurum +controlledvocabulary.language.sula=Sula +controlledvocabulary.language.sulka=Sulka +controlledvocabulary.language.sulod=Sulod +controlledvocabulary.language.suma=Suma +controlledvocabulary.language.sumariup=Sumariup +controlledvocabulary.language.sumau=Sumau +controlledvocabulary.language.sumbawa=Sumbawa +controlledvocabulary.language.sumbwa=Sumbwa +controlledvocabulary.language.sumerian=Sumerian +controlledvocabulary.language.sumi_naga=Sumi Naga +controlledvocabulary.language.sumtu_chin=Sumtu Chin +controlledvocabulary.language.sunam=Sunam +controlledvocabulary.language.sundanese=Sundanese +controlledvocabulary.language.sunwar=Sunwar +controlledvocabulary.language.suoy=Suoy +controlledvocabulary.language.supyire_senoufo=Supyire Senoufo +controlledvocabulary.language.sur=Sur +controlledvocabulary.language.surbakhal=Surbakhal +controlledvocabulary.language.surgujia=Surgujia +controlledvocabulary.language.surigaonon=Surigaonon +controlledvocabulary.language.surjapuri=Surjapuri +controlledvocabulary.language.sursurunga=Sursurunga +controlledvocabulary.language.suruah�=Suruah� +controlledvocabulary.language.surubu=Surubu +controlledvocabulary.language.suru�=Suru� +controlledvocabulary.language.suru�_do_par�=Suru� Do Par� +controlledvocabulary.language.susquehannock=Susquehannock +controlledvocabulary.language.susu=Susu +controlledvocabulary.language.susuami=Susuami +controlledvocabulary.language.suundi=Suundi +controlledvocabulary.language.suwawa=Suwawa +controlledvocabulary.language.suy�=Suy� +controlledvocabulary.language.svan=Svan +controlledvocabulary.language.swabian=Swabian +controlledvocabulary.language.swahili=Swahili +controlledvocabulary.language.swahili_(individual_language)=Swahili (individual language) +controlledvocabulary.language.swampy_cree=Swampy Cree +controlledvocabulary.language.swati=Swati +controlledvocabulary.language.swedish=Swedish +controlledvocabulary.language.swedish_sign_language=Swedish Sign Language +controlledvocabulary.language.swiss_german=Swiss German +controlledvocabulary.language.swiss-french_sign_language=Swiss-French Sign Language +controlledvocabulary.language.swiss-german_sign_language=Swiss-German Sign Language +controlledvocabulary.language.swiss-italian_sign_language=Swiss-Italian Sign Language +controlledvocabulary.language.swo=Swo +controlledvocabulary.language.syenara_senoufo=Syenara Senoufo +controlledvocabulary.language.sylheti=Sylheti +controlledvocabulary.language.syriac=Syriac +controlledvocabulary.language.s�liba=S�liba +controlledvocabulary.language.s�o_paulo_kaing�ng=S�o Paulo Kaing�ng +controlledvocabulary.language.s�otomense=S�otomense +controlledvocabulary.language.s�c�t�_s�noufo=S�c�t� S�noufo +controlledvocabulary.language.s�=S� +controlledvocabulary.language.t'apo=T'apo +controlledvocabulary.language.t'en=T'en +controlledvocabulary.language.ta'izzi-adeni_arabic=Ta'izzi-Adeni Arabic +controlledvocabulary.language.taabwa=Taabwa +controlledvocabulary.language.tabaa_zapotec=Tabaa Zapotec +controlledvocabulary.language.tabaru=Tabaru +controlledvocabulary.language.tabasco_chontal=Tabasco Chontal +controlledvocabulary.language.tabasco_nahuatl=Tabasco Nahuatl +controlledvocabulary.language.tabasco_zoque=Tabasco Zoque +controlledvocabulary.language.tabassaran=Tabassaran +controlledvocabulary.language.tabla=Tabla +controlledvocabulary.language.tabo=Tabo +controlledvocabulary.language.tabriak=Tabriak +controlledvocabulary.language.tacahua_mixtec=Tacahua Mixtec +controlledvocabulary.language.tacana=Tacana +controlledvocabulary.language.tachawit=Tachawit +controlledvocabulary.language.tachelhit=Tachelhit +controlledvocabulary.language.tachoni=Tachoni +controlledvocabulary.language.tadaksahak=Tadaksahak +controlledvocabulary.language.tado=Tado +controlledvocabulary.language.tadyawan=Tadyawan +controlledvocabulary.language.tae'=Tae' +controlledvocabulary.language.tafi=Tafi +controlledvocabulary.language.tagabawa=Tagabawa +controlledvocabulary.language.tagakaulo=Tagakaulo +controlledvocabulary.language.tagal_murut=Tagal Murut +controlledvocabulary.language.tagalaka=Tagalaka +controlledvocabulary.language.tagalog=Tagalog +controlledvocabulary.language.tagargrent=Tagargrent +controlledvocabulary.language.tagbanwa=Tagbanwa +controlledvocabulary.language.tagbu=Tagbu +controlledvocabulary.language.tagdal=Tagdal +controlledvocabulary.language.tagin=Tagin +controlledvocabulary.language.tagish=Tagish +controlledvocabulary.language.tagoi=Tagoi +controlledvocabulary.language.tagwana_senoufo=Tagwana Senoufo +controlledvocabulary.language.tahaggart_tamahaq=Tahaggart Tamahaq +controlledvocabulary.language.tahitian=Tahitian +controlledvocabulary.language.tahltan=Tahltan +controlledvocabulary.language.tai=Tai +controlledvocabulary.language.tai_daeng=Tai Daeng +controlledvocabulary.language.tai_dam=Tai Dam +controlledvocabulary.language.tai_do=Tai Do +controlledvocabulary.language.tai_d�n=Tai D�n +controlledvocabulary.language.tai_hongjin=Tai Hongjin +controlledvocabulary.language.tai_laing=Tai Laing +controlledvocabulary.language.tai_loi=Tai Loi +controlledvocabulary.language.tai_long=Tai Long +controlledvocabulary.language.tai_n�a=Tai N�a +controlledvocabulary.language.tai_pao=Tai Pao +controlledvocabulary.language.tai_thanh=Tai Thanh +controlledvocabulary.language.tai_ya=Tai Ya +controlledvocabulary.language.taiap=Taiap +controlledvocabulary.language.taikat=Taikat +controlledvocabulary.language.tainae=Tainae +controlledvocabulary.language.taino=Taino +controlledvocabulary.language.tairaha=Tairaha +controlledvocabulary.language.tairuma=Tairuma +controlledvocabulary.language.taita=Taita +controlledvocabulary.language.taivoan=Taivoan +controlledvocabulary.language.taiwan_sign_language=Taiwan Sign Language +controlledvocabulary.language.taje=Taje +controlledvocabulary.language.tajik=Tajik +controlledvocabulary.language.tajiki_arabic=Tajiki Arabic +controlledvocabulary.language.tajio=Tajio +controlledvocabulary.language.tajuasohn=Tajuasohn +controlledvocabulary.language.takelma=Takelma +controlledvocabulary.language.takestani=Takestani +controlledvocabulary.language.takia=Takia +controlledvocabulary.language.takua=Takua +controlledvocabulary.language.takuu=Takuu +controlledvocabulary.language.takwane=Takwane +controlledvocabulary.language.tal=Tal +controlledvocabulary.language.tala=Tala +controlledvocabulary.language.talaud=Talaud +controlledvocabulary.language.taliabu=Taliabu +controlledvocabulary.language.talieng=Talieng +controlledvocabulary.language.talinga-bwisi=Talinga-Bwisi +controlledvocabulary.language.talise=Talise +controlledvocabulary.language.talodi=Talodi +controlledvocabulary.language.taloki=Taloki +controlledvocabulary.language.talondo'=Talondo' +controlledvocabulary.language.talossan=Talossan +controlledvocabulary.language.talu=Talu +controlledvocabulary.language.talysh=Talysh +controlledvocabulary.language.tama_(chad)=Tama (Chad) +controlledvocabulary.language.tama_(colombia)=Tama (Colombia) +controlledvocabulary.language.tamagario=Tamagario +controlledvocabulary.language.taman_(indonesia)=Taman (Indonesia) +controlledvocabulary.language.taman_(myanmar)=Taman (Myanmar) +controlledvocabulary.language.tamanaku=Tamanaku +controlledvocabulary.language.tamashek=Tamashek +controlledvocabulary.language.tamasheq=Tamasheq +controlledvocabulary.language.tamazola_mixtec=Tamazola Mixtec +controlledvocabulary.language.tambas=Tambas +controlledvocabulary.language.tambora=Tambora +controlledvocabulary.language.tambotalo=Tambotalo +controlledvocabulary.language.tami=Tami +controlledvocabulary.language.tamil=Tamil +controlledvocabulary.language.tamki=Tamki +controlledvocabulary.language.tamnim_citak=Tamnim Citak +controlledvocabulary.language.tampias_lobu=Tampias Lobu +controlledvocabulary.language.tampuan=Tampuan +controlledvocabulary.language.tampulma=Tampulma +controlledvocabulary.language.tanacross=Tanacross +controlledvocabulary.language.tanahmerah=Tanahmerah +controlledvocabulary.language.tanaina=Tanaina +controlledvocabulary.language.tanapag=Tanapag +controlledvocabulary.language.tandaganon=Tandaganon +controlledvocabulary.language.tandia=Tandia +controlledvocabulary.language.tandroy-mahafaly_malagasy=Tandroy-Mahafaly Malagasy +controlledvocabulary.language.tanema=Tanema +controlledvocabulary.language.tangale=Tangale +controlledvocabulary.language.tangchangya=Tangchangya +controlledvocabulary.language.tanggu=Tanggu +controlledvocabulary.language.tangkhul_naga_(india)=Tangkhul Naga (India) +controlledvocabulary.language.tangkhul_naga_(myanmar)=Tangkhul Naga (Myanmar) +controlledvocabulary.language.tangko=Tangko +controlledvocabulary.language.tanglang=Tanglang +controlledvocabulary.language.tangoa=Tangoa +controlledvocabulary.language.tanguat=Tanguat +controlledvocabulary.language.tangut=Tangut +controlledvocabulary.language.tanimbili=Tanimbili +controlledvocabulary.language.tanimuca-retuar�=Tanimuca-Retuar� +controlledvocabulary.language.tanjijili=Tanjijili +controlledvocabulary.language.tanosy_malagasy=Tanosy Malagasy +controlledvocabulary.language.tanudan_kalinga=Tanudan Kalinga +controlledvocabulary.language.tanzanian_sign_language=Tanzanian Sign Language +controlledvocabulary.language.tapei=Tapei +controlledvocabulary.language.tapiet�=Tapiet� +controlledvocabulary.language.tapirap�=Tapirap� +controlledvocabulary.language.tarao_naga=Tarao Naga +controlledvocabulary.language.tareng=Tareng +controlledvocabulary.language.tariana=Tariana +controlledvocabulary.language.tarifit=Tarifit +controlledvocabulary.language.tarjumo=Tarjumo +controlledvocabulary.language.tarok=Tarok +controlledvocabulary.language.tarpia=Tarpia +controlledvocabulary.language.tartessian=Tartessian +controlledvocabulary.language.taruma=Taruma +controlledvocabulary.language.tasawaq=Tasawaq +controlledvocabulary.language.tase_naga=Tase Naga +controlledvocabulary.language.tasmate=Tasmate +controlledvocabulary.language.tataltepec_chatino=Tataltepec Chatino +controlledvocabulary.language.tatana=Tatana +controlledvocabulary.language.tatar=Tatar +controlledvocabulary.language.tatuyo=Tatuyo +controlledvocabulary.language.tauade=Tauade +controlledvocabulary.language.taulil=Taulil +controlledvocabulary.language.taungyo=Taungyo +controlledvocabulary.language.taupota=Taupota +controlledvocabulary.language.tause=Tause +controlledvocabulary.language.taushiro=Taushiro +controlledvocabulary.language.tausug=Tausug +controlledvocabulary.language.tauya=Tauya +controlledvocabulary.language.taveta=Taveta +controlledvocabulary.language.tavoyan=Tavoyan +controlledvocabulary.language.tavringer_romani=Tavringer Romani +controlledvocabulary.language.tawala=Tawala +controlledvocabulary.language.tawallammat_tamajaq=Tawallammat Tamajaq +controlledvocabulary.language.tawand�=Tawand� +controlledvocabulary.language.tawang_monpa=Tawang Monpa +controlledvocabulary.language.tawara=Tawara +controlledvocabulary.language.taworta=Taworta +controlledvocabulary.language.tawoyan=Tawoyan +controlledvocabulary.language.tawr_chin=Tawr Chin +controlledvocabulary.language.tay_boi=Tay Boi +controlledvocabulary.language.tay_khang=Tay Khang +controlledvocabulary.language.tayart_tamajeq=Tayart Tamajeq +controlledvocabulary.language.tayo=Tayo +controlledvocabulary.language.taznatit=Taznatit +controlledvocabulary.language.tboli=Tboli +controlledvocabulary.language.tchitchege=Tchitchege +controlledvocabulary.language.tchumbuli=Tchumbuli +controlledvocabulary.language.te'un=Te'un +controlledvocabulary.language.teanu=Teanu +controlledvocabulary.language.tebul_sign_language=Tebul Sign Language +controlledvocabulary.language.tebul_ure_dogon=Tebul Ure Dogon +controlledvocabulary.language.tecpatl�n_totonac=Tecpatl�n Totonac +controlledvocabulary.language.tedaga=Tedaga +controlledvocabulary.language.tedim_chin=Tedim Chin +controlledvocabulary.language.tee=Tee +controlledvocabulary.language.tefaro=Tefaro +controlledvocabulary.language.tegali=Tegali +controlledvocabulary.language.tehit=Tehit +controlledvocabulary.language.tehuelche=Tehuelche +controlledvocabulary.language.tejalapan_zapotec=Tejalapan Zapotec +controlledvocabulary.language.teke-ebo=Teke-Ebo +controlledvocabulary.language.teke-fuumu=Teke-Fuumu +controlledvocabulary.language.teke-kukuya=Teke-Kukuya +controlledvocabulary.language.teke-laali=Teke-Laali +controlledvocabulary.language.teke-nzikou=Teke-Nzikou +controlledvocabulary.language.teke-tege=Teke-Tege +controlledvocabulary.language.teke-tsaayi=Teke-Tsaayi +controlledvocabulary.language.teke-tyee=Teke-Tyee +controlledvocabulary.language.tektiteko=Tektiteko +controlledvocabulary.language.tela-masbuar=Tela-Masbuar +controlledvocabulary.language.telefol=Telefol +controlledvocabulary.language.telugu=Telugu +controlledvocabulary.language.tem=Tem +controlledvocabulary.language.temacine_tamazight=Temacine Tamazight +controlledvocabulary.language.temascaltepec_nahuatl=Temascaltepec Nahuatl +controlledvocabulary.language.tembo_(kitembo)=Tembo (Kitembo) +controlledvocabulary.language.tembo_(motembo)=Tembo (Motembo) +controlledvocabulary.language.temb�=Temb� +controlledvocabulary.language.teme=Teme +controlledvocabulary.language.temein=Temein +controlledvocabulary.language.temi=Temi +controlledvocabulary.language.temiar=Temiar +controlledvocabulary.language.temoaya_otomi=Temoaya Otomi +controlledvocabulary.language.temoq=Temoq +controlledvocabulary.language.temuan=Temuan +controlledvocabulary.language.ten'edn=Ten'edn +controlledvocabulary.language.tena_lowland_quichua=Tena Lowland Quichua +controlledvocabulary.language.tenango_otomi=Tenango Otomi +controlledvocabulary.language.tene_kan_dogon=Tene Kan Dogon +controlledvocabulary.language.tenggarong_kutai_malay=Tenggarong Kutai Malay +controlledvocabulary.language.tengger=Tengger +controlledvocabulary.language.tenharim=Tenharim +controlledvocabulary.language.tenino=Tenino +controlledvocabulary.language.tenis=Tenis +controlledvocabulary.language.tennet=Tennet +controlledvocabulary.language.teop=Teop +controlledvocabulary.language.teor=Teor +controlledvocabulary.language.tepecano=Tepecano +controlledvocabulary.language.tepetotutla_chinantec=Tepetotutla Chinantec +controlledvocabulary.language.tepeuxila_cuicatec=Tepeuxila Cuicatec +controlledvocabulary.language.tepinapa_chinantec=Tepinapa Chinantec +controlledvocabulary.language.tepo_krumen=Tepo Krumen +controlledvocabulary.language.ter_sami=Ter Sami +controlledvocabulary.language.tera=Tera +controlledvocabulary.language.terebu=Terebu +controlledvocabulary.language.terei=Terei +controlledvocabulary.language.tereno=Tereno +controlledvocabulary.language.teressa=Teressa +controlledvocabulary.language.tereweng=Tereweng +controlledvocabulary.language.teribe=Teribe +controlledvocabulary.language.terik=Terik +controlledvocabulary.language.termanu=Termanu +controlledvocabulary.language.ternate=Ternate +controlledvocabulary.language.ternate�o=Ternate�o +controlledvocabulary.language.tesaka_malagasy=Tesaka Malagasy +controlledvocabulary.language.tese=Tese +controlledvocabulary.language.teshenawa=Teshenawa +controlledvocabulary.language.teso=Teso +controlledvocabulary.language.tetela=Tetela +controlledvocabulary.language.tetelcingo_nahuatl=Tetelcingo Nahuatl +controlledvocabulary.language.tetete=Tetete +controlledvocabulary.language.tetserret=Tetserret +controlledvocabulary.language.tetum=Tetum +controlledvocabulary.language.tetun_dili=Tetun Dili +controlledvocabulary.language.teutila_cuicatec=Teutila Cuicatec +controlledvocabulary.language.tewa_(indonesia)=Tewa (Indonesia) +controlledvocabulary.language.tewa_(usa)=Tewa (USA) +controlledvocabulary.language.tewe=Tewe +controlledvocabulary.language.texcatepec_otomi=Texcatepec Otomi +controlledvocabulary.language.texistepec_popoluca=Texistepec Popoluca +controlledvocabulary.language.texmelucan_zapotec=Texmelucan Zapotec +controlledvocabulary.language.tezoatl�n_mixtec=Tezoatl�n Mixtec +controlledvocabulary.language.tha=Tha +controlledvocabulary.language.thachanadan=Thachanadan +controlledvocabulary.language.thado_chin=Thado Chin +controlledvocabulary.language.thai=Thai +controlledvocabulary.language.thai_sign_language=Thai Sign Language +controlledvocabulary.language.thai_song=Thai Song +controlledvocabulary.language.thaiphum_chin=Thaiphum Chin +controlledvocabulary.language.thakali=Thakali +controlledvocabulary.language.thangal_naga=Thangal Naga +controlledvocabulary.language.thangmi=Thangmi +controlledvocabulary.language.thao=Thao +controlledvocabulary.language.tharaka=Tharaka +controlledvocabulary.language.thawa=Thawa +controlledvocabulary.language.thaypan=Thaypan +controlledvocabulary.language.thiin=Thiin +controlledvocabulary.language.tho=Tho +controlledvocabulary.language.thompson=Thompson +controlledvocabulary.language.thopho=Thopho +controlledvocabulary.language.thracian=Thracian +controlledvocabulary.language.thu_lao=Thu Lao +controlledvocabulary.language.thulung=Thulung +controlledvocabulary.language.thur=Thur +controlledvocabulary.language.thuri=Thuri +controlledvocabulary.language.tiagbamrin_aizi=Tiagbamrin Aizi +controlledvocabulary.language.tiale=Tiale +controlledvocabulary.language.tiang=Tiang +controlledvocabulary.language.tibea=Tibea +controlledvocabulary.language.tibetan_sign_language=Tibetan Sign Language +controlledvocabulary.language.tibetan,_tibetan_standard,_central=Tibetan, Tibetan Standard, Central +controlledvocabulary.language.tichurong=Tichurong +controlledvocabulary.language.ticuna=Ticuna +controlledvocabulary.language.tida�_mixtec=Tida� Mixtec +controlledvocabulary.language.tidikelt_tamazight=Tidikelt Tamazight +controlledvocabulary.language.tidore=Tidore +controlledvocabulary.language.tiemac�w�_bozo=Tiemac�w� Bozo +controlledvocabulary.language.tiene=Tiene +controlledvocabulary.language.tifal=Tifal +controlledvocabulary.language.tigak=Tigak +controlledvocabulary.language.tigon_mbembe=Tigon Mbembe +controlledvocabulary.language.tigre=Tigre +controlledvocabulary.language.tigrinya=Tigrinya +controlledvocabulary.language.tii=Tii +controlledvocabulary.language.tijaltepec_mixtec=Tijaltepec Mixtec +controlledvocabulary.language.tikar=Tikar +controlledvocabulary.language.tikopia=Tikopia +controlledvocabulary.language.tilapa_otomi=Tilapa Otomi +controlledvocabulary.language.tillamook=Tillamook +controlledvocabulary.language.tilquiapan_zapotec=Tilquiapan Zapotec +controlledvocabulary.language.tilung=Tilung +controlledvocabulary.language.tima=Tima +controlledvocabulary.language.timbe=Timbe +controlledvocabulary.language.timne=Timne +controlledvocabulary.language.timor_pidgin=Timor Pidgin +controlledvocabulary.language.timucua=Timucua +controlledvocabulary.language.timugon_murut=Timugon Murut +controlledvocabulary.language.tinani=Tinani +controlledvocabulary.language.tindi=Tindi +controlledvocabulary.language.tingui-boto=Tingui-Boto +controlledvocabulary.language.tinigua=Tinigua +controlledvocabulary.language.tinputz=Tinputz +controlledvocabulary.language.tippera=Tippera +controlledvocabulary.language.tira=Tira +controlledvocabulary.language.tirahi=Tirahi +controlledvocabulary.language.tiranige_diga_dogon=Tiranige Diga Dogon +controlledvocabulary.language.tiri=Tiri +controlledvocabulary.language.tirmaga-chai_suri=Tirmaga-Chai Suri +controlledvocabulary.language.tiruray=Tiruray +controlledvocabulary.language.tita=Tita +controlledvocabulary.language.titan=Titan +controlledvocabulary.language.tiv=Tiv +controlledvocabulary.language.tiwa=Tiwa +controlledvocabulary.language.tiwi=Tiwi +controlledvocabulary.language.tiyaa=Tiyaa +controlledvocabulary.language.ti�fo=Ti�fo +controlledvocabulary.language.ti�yaxo_bozo=Ti�yaxo Bozo +controlledvocabulary.language.tjungundji=Tjungundji +controlledvocabulary.language.tjupany=Tjupany +controlledvocabulary.language.tjurruru=Tjurruru +controlledvocabulary.language.tlachichilco_tepehua=Tlachichilco Tepehua +controlledvocabulary.language.tlacoapa_me'phaa=Tlacoapa Me'phaa +controlledvocabulary.language.tlacoatzintepec_chinantec=Tlacoatzintepec Chinantec +controlledvocabulary.language.tlacolulita_zapotec=Tlacolulita Zapotec +controlledvocabulary.language.tlahuitoltepec_mixe=Tlahuitoltepec Mixe +controlledvocabulary.language.tlamacazapa_nahuatl=Tlamacazapa Nahuatl +controlledvocabulary.language.tlazoyaltepec_mixtec=Tlazoyaltepec Mixtec +controlledvocabulary.language.tlicho=Tlicho +controlledvocabulary.language.tlingit=Tlingit +controlledvocabulary.language.to=To +controlledvocabulary.language.to'abaita=To'abaita +controlledvocabulary.language.toaripi=Toaripi +controlledvocabulary.language.toba=Toba +controlledvocabulary.language.toba-maskoy=Toba-Maskoy +controlledvocabulary.language.tobagonian_creole_english=Tobagonian Creole English +controlledvocabulary.language.tobanga=Tobanga +controlledvocabulary.language.tobati=Tobati +controlledvocabulary.language.tobelo=Tobelo +controlledvocabulary.language.tobian=Tobian +controlledvocabulary.language.tobilung=Tobilung +controlledvocabulary.language.tobo=Tobo +controlledvocabulary.language.tocantins_asurini=Tocantins Asurini +controlledvocabulary.language.tocho=Tocho +controlledvocabulary.language.toda=Toda +controlledvocabulary.language.todrah=Todrah +controlledvocabulary.language.tofanma=Tofanma +controlledvocabulary.language.tofin_gbe=Tofin Gbe +controlledvocabulary.language.togbo-vara_banda=Togbo-Vara Banda +controlledvocabulary.language.togoyo=Togoyo +controlledvocabulary.language.tohono_o'odham=Tohono O'odham +controlledvocabulary.language.tojolabal=Tojolabal +controlledvocabulary.language.tok_pisin=Tok Pisin +controlledvocabulary.language.tokano=Tokano +controlledvocabulary.language.tokelau=Tokelau +controlledvocabulary.language.tokharian_a=Tokharian A +controlledvocabulary.language.tokharian_b=Tokharian B +controlledvocabulary.language.toki_pona=Toki Pona +controlledvocabulary.language.toku-no-shima=Toku-No-Shima +controlledvocabulary.language.tol=Tol +controlledvocabulary.language.tolaki=Tolaki +controlledvocabulary.language.tolomako=Tolomako +controlledvocabulary.language.tolowa=Tolowa +controlledvocabulary.language.toma=Toma +controlledvocabulary.language.tomadino=Tomadino +controlledvocabulary.language.tombelala=Tombelala +controlledvocabulary.language.tombonuo=Tombonuo +controlledvocabulary.language.tombulu=Tombulu +controlledvocabulary.language.tomini=Tomini +controlledvocabulary.language.tommo_so_dogon=Tommo So Dogon +controlledvocabulary.language.tomo_kan_dogon=Tomo Kan Dogon +controlledvocabulary.language.tomoip=Tomoip +controlledvocabulary.language.tondano=Tondano +controlledvocabulary.language.tondi_songway_kiini=Tondi Songway Kiini +controlledvocabulary.language.tonga_(nyasa)=Tonga (Nyasa) +controlledvocabulary.language.tonga_(tonga_islands)=Tonga (Tonga Islands) +controlledvocabulary.language.tonga_(zambia)=Tonga (Zambia) +controlledvocabulary.language.tongwe=Tongwe +controlledvocabulary.language.tonjon=Tonjon +controlledvocabulary.language.tonkawa=Tonkawa +controlledvocabulary.language.tonsawang=Tonsawang +controlledvocabulary.language.tonsea=Tonsea +controlledvocabulary.language.tontemboan=Tontemboan +controlledvocabulary.language.tooro=Tooro +controlledvocabulary.language.topoiyo=Topoiyo +controlledvocabulary.language.toposa=Toposa +controlledvocabulary.language.toraja-sa'dan=Toraja-Sa'dan +controlledvocabulary.language.toram=Toram +controlledvocabulary.language.torau=Torau +controlledvocabulary.language.tornedalen_finnish=Tornedalen Finnish +controlledvocabulary.language.toro=Toro +controlledvocabulary.language.toro_so_dogon=Toro So Dogon +controlledvocabulary.language.toro_tegu_dogon=Toro Tegu Dogon +controlledvocabulary.language.toromono=Toromono +controlledvocabulary.language.torona=Torona +controlledvocabulary.language.torres_strait_creole=Torres Strait Creole +controlledvocabulary.language.torricelli=Torricelli +controlledvocabulary.language.torwali=Torwali +controlledvocabulary.language.tor�=Tor� +controlledvocabulary.language.tosk_albanian=Tosk Albanian +controlledvocabulary.language.totela=Totela +controlledvocabulary.language.toto=Toto +controlledvocabulary.language.totoli=Totoli +controlledvocabulary.language.totomachapan_zapotec=Totomachapan Zapotec +controlledvocabulary.language.totontepec_mixe=Totontepec Mixe +controlledvocabulary.language.totoro=Totoro +controlledvocabulary.language.touo=Touo +controlledvocabulary.language.toura_(c�te_d'ivoire)=Toura (C�te d'Ivoire) +controlledvocabulary.language.toura_(papua_new_guinea)=Toura (Papua New Guinea) +controlledvocabulary.language.towei=Towei +controlledvocabulary.language.transalpine_gaulish=Transalpine Gaulish +controlledvocabulary.language.traveller_danish=Traveller Danish +controlledvocabulary.language.traveller_norwegian=Traveller Norwegian +controlledvocabulary.language.traveller_scottish=Traveller Scottish +controlledvocabulary.language.tregami=Tregami +controlledvocabulary.language.trememb�=Trememb� +controlledvocabulary.language.trieng=Trieng +controlledvocabulary.language.trimuris=Trimuris +controlledvocabulary.language.tring=Tring +controlledvocabulary.language.tringgus-sembaan_bidayuh=Tringgus-Sembaan Bidayuh +controlledvocabulary.language.trinidad_and_tobago_sign_language=Trinidad and Tobago Sign Language +controlledvocabulary.language.trinidadian_creole_english=Trinidadian Creole English +controlledvocabulary.language.trinitario=Trinitario +controlledvocabulary.language.tri�=Tri� +controlledvocabulary.language.truk�=Truk� +controlledvocabulary.language.trumai=Trumai +controlledvocabulary.language.ts'�n-lao=Ts'�n-Lao +controlledvocabulary.language.tsaangi=Tsaangi +controlledvocabulary.language.tsakhur=Tsakhur +controlledvocabulary.language.tsakonian=Tsakonian +controlledvocabulary.language.tsakwambo=Tsakwambo +controlledvocabulary.language.tsamai=Tsamai +controlledvocabulary.language.tsat=Tsat +controlledvocabulary.language.tseku=Tseku +controlledvocabulary.language.tsetsaut=Tsetsaut +controlledvocabulary.language.tshangla=Tshangla +controlledvocabulary.language.tsikimba=Tsikimba +controlledvocabulary.language.tsiman�=Tsiman� +controlledvocabulary.language.tsimihety_malagasy=Tsimihety Malagasy +controlledvocabulary.language.tsimshian=Tsimshian +controlledvocabulary.language.tsishingini=Tsishingini +controlledvocabulary.language.tso=Tso +controlledvocabulary.language.tsoa=Tsoa +controlledvocabulary.language.tsogo=Tsogo +controlledvocabulary.language.tsonga=Tsonga +controlledvocabulary.language.tsotso=Tsotso +controlledvocabulary.language.tsou=Tsou +controlledvocabulary.language.tsucuba=Tsucuba +controlledvocabulary.language.tsum=Tsum +controlledvocabulary.language.tsuvadi=Tsuvadi +controlledvocabulary.language.tsuvan=Tsuvan +controlledvocabulary.language.tswa=Tswa +controlledvocabulary.language.tswana=Tswana +controlledvocabulary.language.tswapong=Tswapong +controlledvocabulary.language.tu=Tu +controlledvocabulary.language.tuamotuan=Tuamotuan +controlledvocabulary.language.tubar=Tubar +controlledvocabulary.language.tucano=Tucano +controlledvocabulary.language.tugen=Tugen +controlledvocabulary.language.tugun=Tugun +controlledvocabulary.language.tugutil=Tugutil +controlledvocabulary.language.tukang_besi_north=Tukang Besi North +controlledvocabulary.language.tukang_besi_south=Tukang Besi South +controlledvocabulary.language.tuki=Tuki +controlledvocabulary.language.tukpa=Tukpa +controlledvocabulary.language.tukudede=Tukudede +controlledvocabulary.language.tukumanf�d=Tukumanf�d +controlledvocabulary.language.tula=Tula +controlledvocabulary.language.tulai=Tulai +controlledvocabulary.language.tulehu=Tulehu +controlledvocabulary.language.tulishi=Tulishi +controlledvocabulary.language.tulu=Tulu +controlledvocabulary.language.tulu-bohuai=Tulu-Bohuai +controlledvocabulary.language.tuma-irumu=Tuma-Irumu +controlledvocabulary.language.tumak=Tumak +controlledvocabulary.language.tumari_kanuri=Tumari Kanuri +controlledvocabulary.language.tumbuka=Tumbuka +controlledvocabulary.language.tumi=Tumi +controlledvocabulary.language.tumleo=Tumleo +controlledvocabulary.language.tumshuqese=Tumshuqese +controlledvocabulary.language.tumtum=Tumtum +controlledvocabulary.language.tumulung_sisaala=Tumulung Sisaala +controlledvocabulary.language.tumzabt=Tumzabt +controlledvocabulary.language.tundra_enets=Tundra Enets +controlledvocabulary.language.tunen=Tunen +controlledvocabulary.language.tungag=Tungag +controlledvocabulary.language.tunggare=Tunggare +controlledvocabulary.language.tunia=Tunia +controlledvocabulary.language.tunica=Tunica +controlledvocabulary.language.tunisian_arabic=Tunisian Arabic +controlledvocabulary.language.tunisian_sign_language=Tunisian Sign Language +controlledvocabulary.language.tunjung=Tunjung +controlledvocabulary.language.tunni=Tunni +controlledvocabulary.language.tunzu=Tunzu +controlledvocabulary.language.tuotomb=Tuotomb +controlledvocabulary.language.tupar�=Tupar� +controlledvocabulary.language.tupinamb�=Tupinamb� +controlledvocabulary.language.tupinikin=Tupinikin +controlledvocabulary.language.tupuri=Tupuri +controlledvocabulary.language.turaka=Turaka +controlledvocabulary.language.turi=Turi +controlledvocabulary.language.turiw�ra=Turiw�ra +controlledvocabulary.language.turka=Turka +controlledvocabulary.language.turkana=Turkana +controlledvocabulary.language.turkish=Turkish +controlledvocabulary.language.turkish_sign_language=Turkish Sign Language +controlledvocabulary.language.turkmen=Turkmen +controlledvocabulary.language.turks_and_caicos_creole_english=Turks And Caicos Creole English +controlledvocabulary.language.turoyo=Turoyo +controlledvocabulary.language.turumsa=Turumsa +controlledvocabulary.language.turung=Turung +controlledvocabulary.language.tuscarora=Tuscarora +controlledvocabulary.language.tutelo=Tutelo +controlledvocabulary.language.tutong=Tutong +controlledvocabulary.language.tutsa_naga=Tutsa Naga +controlledvocabulary.language.tutuba=Tutuba +controlledvocabulary.language.tututepec_mixtec=Tututepec Mixtec +controlledvocabulary.language.tututni=Tututni +controlledvocabulary.language.tuvalu=Tuvalu +controlledvocabulary.language.tuvinian=Tuvinian +controlledvocabulary.language.tuwali_ifugao=Tuwali Ifugao +controlledvocabulary.language.tuwari=Tuwari +controlledvocabulary.language.tuwuli=Tuwuli +controlledvocabulary.language.tuxin�wa=Tuxin�wa +controlledvocabulary.language.tux�=Tux� +controlledvocabulary.language.tuyuca=Tuyuca +controlledvocabulary.language.twana=Twana +controlledvocabulary.language.twendi=Twendi +controlledvocabulary.language.twents=Twents +controlledvocabulary.language.twi=Twi +controlledvocabulary.language.tyap=Tyap +controlledvocabulary.language.tz'utujil=Tz'utujil +controlledvocabulary.language.tzeltal=Tzeltal +controlledvocabulary.language.tzotzil=Tzotzil +controlledvocabulary.language.t�y=T�y +controlledvocabulary.language.t�y_sa_pa=T�y Sa Pa +controlledvocabulary.language.t�y_tac=T�y Tac +controlledvocabulary.language.t��n=T��n +controlledvocabulary.language.t�batulabal=T�batulabal +controlledvocabulary.language.u=U +controlledvocabulary.language.uab_meto=Uab Meto +controlledvocabulary.language.uamu�=Uamu� +controlledvocabulary.language.uare=Uare +controlledvocabulary.language.ubaghara=Ubaghara +controlledvocabulary.language.ubang=Ubang +controlledvocabulary.language.ubi=Ubi +controlledvocabulary.language.ubir=Ubir +controlledvocabulary.language.ubykh=Ubykh +controlledvocabulary.language.ucayali-yur�a_ash�ninka=Ucayali-Yur�a Ash�ninka +controlledvocabulary.language.uda=Uda +controlledvocabulary.language.udi=Udi +controlledvocabulary.language.udihe=Udihe +controlledvocabulary.language.udmurt=Udmurt +controlledvocabulary.language.uduk=Uduk +controlledvocabulary.language.ufim=Ufim +controlledvocabulary.language.ugandan_sign_language=Ugandan Sign Language +controlledvocabulary.language.ugaritic=Ugaritic +controlledvocabulary.language.ughele=Ughele +controlledvocabulary.language.ugong=Ugong +controlledvocabulary.language.uhami=Uhami +controlledvocabulary.language.uighur,_uyghur=Uighur, Uyghur +controlledvocabulary.language.uisai=Uisai +controlledvocabulary.language.ujir=Ujir +controlledvocabulary.language.ukaan=Ukaan +controlledvocabulary.language.ukhwejo=Ukhwejo +controlledvocabulary.language.ukit=Ukit +controlledvocabulary.language.ukpe-bayobiri=Ukpe-Bayobiri +controlledvocabulary.language.ukpet-ehom=Ukpet-Ehom +controlledvocabulary.language.ukrainian=Ukrainian +controlledvocabulary.language.ukrainian_sign_language=Ukrainian Sign Language +controlledvocabulary.language.ukue=Ukue +controlledvocabulary.language.ukuriguma=Ukuriguma +controlledvocabulary.language.ukwa=Ukwa +controlledvocabulary.language.ukwuani-aboh-ndoni=Ukwuani-Aboh-Ndoni +controlledvocabulary.language.ulau-suain=Ulau-Suain +controlledvocabulary.language.ulch=Ulch +controlledvocabulary.language.ulithian=Ulithian +controlledvocabulary.language.ullatan=Ullatan +controlledvocabulary.language.ulukwumi=Ulukwumi +controlledvocabulary.language.ulumanda'=Ulumanda' +controlledvocabulary.language.ulwa=Ulwa +controlledvocabulary.language.uma=Uma +controlledvocabulary.language.uma'_lasan=Uma' Lasan +controlledvocabulary.language.uma'_lung=Uma' Lung +controlledvocabulary.language.umanakaina=Umanakaina +controlledvocabulary.language.umatilla=Umatilla +controlledvocabulary.language.umbindhamu=Umbindhamu +controlledvocabulary.language.umbrian=Umbrian +controlledvocabulary.language.umbu-ungu=Umbu-Ungu +controlledvocabulary.language.umbugarla=Umbugarla +controlledvocabulary.language.umbundu=Umbundu +controlledvocabulary.language.ume_sami=Ume Sami +controlledvocabulary.language.umeda=Umeda +controlledvocabulary.language.umiida=Umiida +controlledvocabulary.language.umiray_dumaget_agta=Umiray Dumaget Agta +controlledvocabulary.language.umon=Umon +controlledvocabulary.language.umot�na=Umot�na +controlledvocabulary.language.umpila=Umpila +controlledvocabulary.language.una=Una +controlledvocabulary.language.unami=Unami +controlledvocabulary.language.uncoded_languages=Uncoded languages +controlledvocabulary.language.unde_kaili=Unde Kaili +controlledvocabulary.language.undetermined=Undetermined +controlledvocabulary.language.uneapa=Uneapa +controlledvocabulary.language.uneme=Uneme +controlledvocabulary.language.unggaranggu=Unggaranggu +controlledvocabulary.language.unggumi=Unggumi +controlledvocabulary.language.uni=Uni +controlledvocabulary.language.unserdeutsch=Unserdeutsch +controlledvocabulary.language.unua=Unua +controlledvocabulary.language.unubahe=Unubahe +controlledvocabulary.language.upper_chehalis=Upper Chehalis +controlledvocabulary.language.upper_grand_valley_dani=Upper Grand Valley Dani +controlledvocabulary.language.upper_guinea_crioulo=Upper Guinea Crioulo +controlledvocabulary.language.upper_kinabatangan=Upper Kinabatangan +controlledvocabulary.language.upper_kuskokwim=Upper Kuskokwim +controlledvocabulary.language.upper_necaxa_totonac=Upper Necaxa Totonac +controlledvocabulary.language.upper_saxon=Upper Saxon +controlledvocabulary.language.upper_sorbian=Upper Sorbian +controlledvocabulary.language.upper_ta'oih=Upper Ta'oih +controlledvocabulary.language.upper_tanana=Upper Tanana +controlledvocabulary.language.upper_taromi=Upper Taromi +controlledvocabulary.language.upper_umpqua=Upper Umpqua +controlledvocabulary.language.ura_(papua_new_guinea)=Ura (Papua New Guinea) +controlledvocabulary.language.ura_(vanuatu)=Ura (Vanuatu) +controlledvocabulary.language.uradhi=Uradhi +controlledvocabulary.language.urak_lawoi'=Urak Lawoi' +controlledvocabulary.language.urali=Urali +controlledvocabulary.language.urapmin=Urapmin +controlledvocabulary.language.urarina=Urarina +controlledvocabulary.language.urartian=Urartian +controlledvocabulary.language.urat=Urat +controlledvocabulary.language.urdu=Urdu +controlledvocabulary.language.urhobo=Urhobo +controlledvocabulary.language.uri=Uri +controlledvocabulary.language.urigina=Urigina +controlledvocabulary.language.urim=Urim +controlledvocabulary.language.urimo=Urimo +controlledvocabulary.language.uripiv-wala-rano-atchin=Uripiv-Wala-Rano-Atchin +controlledvocabulary.language.urningangg=Urningangg +controlledvocabulary.language.uru=Uru +controlledvocabulary.language.uru-eu-wau-wau=Uru-Eu-Wau-Wau +controlledvocabulary.language.uru-pa-in=Uru-Pa-In +controlledvocabulary.language.uruangnirin=Uruangnirin +controlledvocabulary.language.uruava=Uruava +controlledvocabulary.language.urub�-kaapor=Urub�-Kaapor +controlledvocabulary.language.urub�-kaapor_sign_language=Urub�-Kaapor Sign Language +controlledvocabulary.language.uruguayan_sign_language=Uruguayan Sign Language +controlledvocabulary.language.urum=Urum +controlledvocabulary.language.urumi=Urumi +controlledvocabulary.language.usaghade=Usaghade +controlledvocabulary.language.usan=Usan +controlledvocabulary.language.usarufa=Usarufa +controlledvocabulary.language.ushojo=Ushojo +controlledvocabulary.language.usila_chinantec=Usila Chinantec +controlledvocabulary.language.usku=Usku +controlledvocabulary.language.uspanteco=Uspanteco +controlledvocabulary.language.usui=Usui +controlledvocabulary.language.utarmbung=Utarmbung +controlledvocabulary.language.ute-southern_paiute=Ute-Southern Paiute +controlledvocabulary.language.utu=Utu +controlledvocabulary.language.uvbie=Uvbie +controlledvocabulary.language.uya=Uya +controlledvocabulary.language.uyajitaya=Uyajitaya +controlledvocabulary.language.uzbek=Uzbek +controlledvocabulary.language.uzbeki_arabic=Uzbeki Arabic +controlledvocabulary.language.uzekwe=Uzekwe +controlledvocabulary.language.vaagri_booli=Vaagri Booli +controlledvocabulary.language.vafsi=Vafsi +controlledvocabulary.language.vaghri=Vaghri +controlledvocabulary.language.vaghua=Vaghua +controlledvocabulary.language.vagla=Vagla +controlledvocabulary.language.vai=Vai +controlledvocabulary.language.vaiphei=Vaiphei +controlledvocabulary.language.vale=Vale +controlledvocabulary.language.valencian_sign_language=Valencian Sign Language +controlledvocabulary.language.valle_nacional_chinantec=Valle Nacional Chinantec +controlledvocabulary.language.valley_maidu=Valley Maidu +controlledvocabulary.language.valman=Valman +controlledvocabulary.language.valpei=Valpei +controlledvocabulary.language.vamale=Vamale +controlledvocabulary.language.vame=Vame +controlledvocabulary.language.vandalic=Vandalic +controlledvocabulary.language.vangunu=Vangunu +controlledvocabulary.language.vanimo=Vanimo +controlledvocabulary.language.vano=Vano +controlledvocabulary.language.vanuma=Vanuma +controlledvocabulary.language.vao=Vao +controlledvocabulary.language.varhadi-nagpuri=Varhadi-Nagpuri +controlledvocabulary.language.varisi=Varisi +controlledvocabulary.language.varli=Varli +controlledvocabulary.language.vasavi=Vasavi +controlledvocabulary.language.veddah=Veddah +controlledvocabulary.language.vedic_sanskrit=Vedic Sanskrit +controlledvocabulary.language.vehes=Vehes +controlledvocabulary.language.veluws=Veluws +controlledvocabulary.language.vemgo-mabas=Vemgo-Mabas +controlledvocabulary.language.venda=Venda +controlledvocabulary.language.venetian=Venetian +controlledvocabulary.language.venetic=Venetic +controlledvocabulary.language.venezuelan_sign_language=Venezuelan Sign Language +controlledvocabulary.language.vengo=Vengo +controlledvocabulary.language.venture�o=Venture�o +controlledvocabulary.language.veps=Veps +controlledvocabulary.language.vera'a=Vera'a +controlledvocabulary.language.vestinian=Vestinian +controlledvocabulary.language.vidunda=Vidunda +controlledvocabulary.language.viemo=Viemo +controlledvocabulary.language.vietnamese=Vietnamese +controlledvocabulary.language.vilela=Vilela +controlledvocabulary.language.vili=Vili +controlledvocabulary.language.villa_viciosa_agta=Villa Viciosa Agta +controlledvocabulary.language.vincentian_creole_english=Vincentian Creole English +controlledvocabulary.language.vinmavis=Vinmavis +controlledvocabulary.language.vinza=Vinza +controlledvocabulary.language.virgin_islands_creole_english=Virgin Islands Creole English +controlledvocabulary.language.vishavan=Vishavan +controlledvocabulary.language.viti=Viti +controlledvocabulary.language.vitou=Vitou +controlledvocabulary.language.vitu=Vitu +controlledvocabulary.language.vlaams=Vlaams +controlledvocabulary.language.vlaamse_gebarentaal=Vlaamse Gebarentaal +controlledvocabulary.language.vlax_romani=Vlax Romani +controlledvocabulary.language.volap�k=Volap�k +controlledvocabulary.language.volscian=Volscian +controlledvocabulary.language.vono=Vono +controlledvocabulary.language.voro=Voro +controlledvocabulary.language.votic=Votic +controlledvocabulary.language.vumbu=Vumbu +controlledvocabulary.language.vunapu=Vunapu +controlledvocabulary.language.vunjo=Vunjo +controlledvocabulary.language.vur�s=Vur�s +controlledvocabulary.language.vute=Vute +controlledvocabulary.language.vwanji=Vwanji +controlledvocabulary.language.v�ro=V�ro +controlledvocabulary.language.wa=Wa +controlledvocabulary.language.wa'ema=Wa'ema +controlledvocabulary.language.waama=Waama +controlledvocabulary.language.waamwang=Waamwang +controlledvocabulary.language.waata=Waata +controlledvocabulary.language.wab=Wab +controlledvocabulary.language.wabo=Wabo +controlledvocabulary.language.waboda=Waboda +controlledvocabulary.language.waci_gbe=Waci Gbe +controlledvocabulary.language.wadaginam=Wadaginam +controlledvocabulary.language.waddar=Waddar +controlledvocabulary.language.wadi_wadi=Wadi Wadi +controlledvocabulary.language.wadikali=Wadikali +controlledvocabulary.language.wadiyara_koli=Wadiyara Koli +controlledvocabulary.language.wadjabangayi=Wadjabangayi +controlledvocabulary.language.wadjiginy=Wadjiginy +controlledvocabulary.language.wadjigu=Wadjigu +controlledvocabulary.language.wae_rana=Wae Rana +controlledvocabulary.language.waffa=Waffa +controlledvocabulary.language.wagawaga=Wagawaga +controlledvocabulary.language.wagaya=Wagaya +controlledvocabulary.language.wagdi=Wagdi +controlledvocabulary.language.wagi=Wagi +controlledvocabulary.language.wagiman=Wagiman +controlledvocabulary.language.wahau_kayan=Wahau Kayan +controlledvocabulary.language.wahau_kenyah=Wahau Kenyah +controlledvocabulary.language.wahgi=Wahgi +controlledvocabulary.language.waigali=Waigali +controlledvocabulary.language.waigeo=Waigeo +controlledvocabulary.language.wailaki=Wailaki +controlledvocabulary.language.wailapa=Wailapa +controlledvocabulary.language.waima=Waima +controlledvocabulary.language.waima'a=Waima'a +controlledvocabulary.language.waimaha=Waimaha +controlledvocabulary.language.waimiri-atroari=Waimiri-Atroari +controlledvocabulary.language.waioli=Waioli +controlledvocabulary.language.waiwai=Waiwai +controlledvocabulary.language.waja=Waja +controlledvocabulary.language.wajarri=Wajarri +controlledvocabulary.language.wajuk=Wajuk +controlledvocabulary.language.waka=Waka +controlledvocabulary.language.wakabunga=Wakabunga +controlledvocabulary.language.wakawaka=Wakawaka +controlledvocabulary.language.wakde=Wakde +controlledvocabulary.language.wakhi=Wakhi +controlledvocabulary.language.wakon�=Wakon� +controlledvocabulary.language.wala=Wala +controlledvocabulary.language.walak=Walak +controlledvocabulary.language.walangama=Walangama +controlledvocabulary.language.wali_(ghana)=Wali (Ghana) +controlledvocabulary.language.wali_(sudan)=Wali (Sudan) +controlledvocabulary.language.waling=Waling +controlledvocabulary.language.walio=Walio +controlledvocabulary.language.walla_walla=Walla Walla +controlledvocabulary.language.wallisian=Wallisian +controlledvocabulary.language.walloon=Walloon +controlledvocabulary.language.walmajarri=Walmajarri +controlledvocabulary.language.walser=Walser +controlledvocabulary.language.walungge=Walungge +controlledvocabulary.language.waluwarra=Waluwarra +controlledvocabulary.language.wamas=Wamas +controlledvocabulary.language.wambaya=Wambaya +controlledvocabulary.language.wambon=Wambon +controlledvocabulary.language.wambule=Wambule +controlledvocabulary.language.wamesa=Wamesa +controlledvocabulary.language.wamey=Wamey +controlledvocabulary.language.wamin=Wamin +controlledvocabulary.language.wampanoag=Wampanoag +controlledvocabulary.language.wampar=Wampar +controlledvocabulary.language.wampur=Wampur +controlledvocabulary.language.wan=Wan +controlledvocabulary.language.wanap=Wanap +controlledvocabulary.language.wancho_naga=Wancho Naga +controlledvocabulary.language.wanda=Wanda +controlledvocabulary.language.wandala=Wandala +controlledvocabulary.language.wandarang=Wandarang +controlledvocabulary.language.wandji=Wandji +controlledvocabulary.language.waneci=Waneci +controlledvocabulary.language.wanga=Wanga +controlledvocabulary.language.wangaaybuwan-ngiyambaa=Wangaaybuwan-Ngiyambaa +controlledvocabulary.language.wanggamala=Wanggamala +controlledvocabulary.language.wanggom=Wanggom +controlledvocabulary.language.wangkangurru=Wangkangurru +controlledvocabulary.language.wangkayutyuru=Wangkayutyuru +controlledvocabulary.language.wangkumara=Wangkumara +controlledvocabulary.language.wannu=Wannu +controlledvocabulary.language.wano=Wano +controlledvocabulary.language.wantoat=Wantoat +controlledvocabulary.language.wanukaka=Wanukaka +controlledvocabulary.language.wanyi=Wanyi +controlledvocabulary.language.wan�=Wan� +controlledvocabulary.language.waorani=Waorani +controlledvocabulary.language.wapan=Wapan +controlledvocabulary.language.wapishana=Wapishana +controlledvocabulary.language.wappo=Wappo +controlledvocabulary.language.war-jaintia=War-Jaintia +controlledvocabulary.language.wara=Wara +controlledvocabulary.language.warao=Warao +controlledvocabulary.language.waray_(australia)=Waray (Australia) +controlledvocabulary.language.waray_(philippines)=Waray (Philippines) +controlledvocabulary.language.wardaman=Wardaman +controlledvocabulary.language.wardandi=Wardandi +controlledvocabulary.language.warembori=Warembori +controlledvocabulary.language.wares=Wares +controlledvocabulary.language.waris=Waris +controlledvocabulary.language.waritai=Waritai +controlledvocabulary.language.wariyangga=Wariyangga +controlledvocabulary.language.warji=Warji +controlledvocabulary.language.warkay-bipim=Warkay-Bipim +controlledvocabulary.language.warlmanpa=Warlmanpa +controlledvocabulary.language.warlpiri=Warlpiri +controlledvocabulary.language.warnang=Warnang +controlledvocabulary.language.warnman=Warnman +controlledvocabulary.language.waropen=Waropen +controlledvocabulary.language.warrgamay=Warrgamay +controlledvocabulary.language.warrwa=Warrwa +controlledvocabulary.language.waru=Waru +controlledvocabulary.language.warumungu=Warumungu +controlledvocabulary.language.waruna=Waruna +controlledvocabulary.language.warungu=Warungu +controlledvocabulary.language.warwar_feni=Warwar Feni +controlledvocabulary.language.wasa=Wasa +controlledvocabulary.language.wasco-wishram=Wasco-Wishram +controlledvocabulary.language.wasembo=Wasembo +controlledvocabulary.language.washo=Washo +controlledvocabulary.language.waskia=Waskia +controlledvocabulary.language.wasu=Wasu +controlledvocabulary.language.watakataui=Watakataui +controlledvocabulary.language.watam=Watam +controlledvocabulary.language.wathawurrung=Wathawurrung +controlledvocabulary.language.watiwa=Watiwa +controlledvocabulary.language.watubela=Watubela +controlledvocabulary.language.waube=Waube +controlledvocabulary.language.waur�=Waur� +controlledvocabulary.language.wauyai=Wauyai +controlledvocabulary.language.wawa=Wawa +controlledvocabulary.language.wawonii=Wawonii +controlledvocabulary.language.waxianghua=Waxianghua +controlledvocabulary.language.wayampi=Wayampi +controlledvocabulary.language.wayana=Wayana +controlledvocabulary.language.wayanad_chetti=Wayanad Chetti +controlledvocabulary.language.wayor�=Wayor� +controlledvocabulary.language.wayu=Wayu +controlledvocabulary.language.wayuu=Wayuu +controlledvocabulary.language.wedau=Wedau +controlledvocabulary.language.weh=Weh +controlledvocabulary.language.wejewa=Wejewa +controlledvocabulary.language.welaun=Welaun +controlledvocabulary.language.weliki=Weliki +controlledvocabulary.language.welsh=Welsh +controlledvocabulary.language.welsh_romani=Welsh Romani +controlledvocabulary.language.wemale=Wemale +controlledvocabulary.language.wemba_wemba=Wemba Wemba +controlledvocabulary.language.weme_gbe=Weme Gbe +controlledvocabulary.language.wendat=Wendat +controlledvocabulary.language.wergaia=Wergaia +controlledvocabulary.language.weri=Weri +controlledvocabulary.language.wersing=Wersing +controlledvocabulary.language.west_albay_bikol=West Albay Bikol +controlledvocabulary.language.west_ambae=West Ambae +controlledvocabulary.language.west_bengal_sign_language=West Bengal Sign Language +controlledvocabulary.language.west_berawan=West Berawan +controlledvocabulary.language.west_central_banda=West Central Banda +controlledvocabulary.language.west_central_oromo=West Central Oromo +controlledvocabulary.language.west_coast_bajau=West Coast Bajau +controlledvocabulary.language.west_damar=West Damar +controlledvocabulary.language.west_goodenough=West Goodenough +controlledvocabulary.language.west_kewa=West Kewa +controlledvocabulary.language.west_lembata=West Lembata +controlledvocabulary.language.west_makian=West Makian +controlledvocabulary.language.west_masela=West Masela +controlledvocabulary.language.west_tarangan=West Tarangan +controlledvocabulary.language.west_uvean=West Uvean +controlledvocabulary.language.west_yugur=West Yugur +controlledvocabulary.language.west-central_limba=West-Central Limba +controlledvocabulary.language.western_abnaki=Western Abnaki +controlledvocabulary.language.western_apache=Western Apache +controlledvocabulary.language.western_armenian=Western Armenian +controlledvocabulary.language.western_arrarnta=Western Arrarnta +controlledvocabulary.language.western_balochi=Western Balochi +controlledvocabulary.language.western_bolivian_guaran�=Western Bolivian Guaran� +controlledvocabulary.language.western_bru=Western Bru +controlledvocabulary.language.western_bukidnon_manobo=Western Bukidnon Manobo +controlledvocabulary.language.western_cham=Western Cham +controlledvocabulary.language.western_dani=Western Dani +controlledvocabulary.language.western_durango_nahuatl=Western Durango Nahuatl +controlledvocabulary.language.western_fijian=Western Fijian +controlledvocabulary.language.western_frisian=Western Frisian +controlledvocabulary.language.western_highland_chatino=Western Highland Chatino +controlledvocabulary.language.western_highland_purepecha=Western Highland Purepecha +controlledvocabulary.language.western_huasteca_nahuatl=Western Huasteca Nahuatl +controlledvocabulary.language.western_juxtlahuaca_mixtec=Western Juxtlahuaca Mixtec +controlledvocabulary.language.western_kanjobal=Western Kanjobal +controlledvocabulary.language.western_karaboro=Western Karaboro +controlledvocabulary.language.western_katu=Western Katu +controlledvocabulary.language.western_kayah=Western Kayah +controlledvocabulary.language.western_keres=Western Keres +controlledvocabulary.language.western_krahn=Western Krahn +controlledvocabulary.language.western_lalu=Western Lalu +controlledvocabulary.language.western_lawa=Western Lawa +controlledvocabulary.language.western_magar=Western Magar +controlledvocabulary.language.western_maninkakan=Western Maninkakan +controlledvocabulary.language.western_mari=Western Mari +controlledvocabulary.language.western_mashan_hmong=Western Mashan Hmong +controlledvocabulary.language.western_meohang=Western Meohang +controlledvocabulary.language.western_minyag=Western Minyag +controlledvocabulary.language.western_muria=Western Muria +controlledvocabulary.language.western_neo-aramaic=Western Neo-Aramaic +controlledvocabulary.language.western_niger_fulfulde=Western Niger Fulfulde +controlledvocabulary.language.western_ojibwa=Western Ojibwa +controlledvocabulary.language.western_panjabi=Western Panjabi +controlledvocabulary.language.western_parbate_kham=Western Parbate Kham +controlledvocabulary.language.western_penan=Western Penan +controlledvocabulary.language.western_sisaala=Western Sisaala +controlledvocabulary.language.western_subanon=Western Subanon +controlledvocabulary.language.western_tamang=Western Tamang +controlledvocabulary.language.western_tawbuid=Western Tawbuid +controlledvocabulary.language.western_tlacolula_valley_zapotec=Western Tlacolula Valley Zapotec +controlledvocabulary.language.western_totonac=Western Totonac +controlledvocabulary.language.western_tunebo=Western Tunebo +controlledvocabulary.language.western_xiangxi_miao=Western Xiangxi Miao +controlledvocabulary.language.western_xwla_gbe=Western Xwla Gbe +controlledvocabulary.language.western_yiddish=Western Yiddish +controlledvocabulary.language.westphalien=Westphalien +controlledvocabulary.language.wetamut=Wetamut +controlledvocabulary.language.wewaw=Wewaw +controlledvocabulary.language.weyto=Weyto +controlledvocabulary.language.white_gelao=White Gelao +controlledvocabulary.language.white_lachi=White Lachi +controlledvocabulary.language.whitesands=Whitesands +controlledvocabulary.language.wiarumus=Wiarumus +controlledvocabulary.language.wichita=Wichita +controlledvocabulary.language.wich�_lhamt�s_g�isnay=Wich� Lhamt�s G�isnay +controlledvocabulary.language.wich�_lhamt�s_nocten=Wich� Lhamt�s Nocten +controlledvocabulary.language.wich�_lhamt�s_vejoz=Wich� Lhamt�s Vejoz +controlledvocabulary.language.wik_ngathan=Wik Ngathan +controlledvocabulary.language.wik-epa=Wik-Epa +controlledvocabulary.language.wik-iiyanh=Wik-Iiyanh +controlledvocabulary.language.wik-keyangan=Wik-Keyangan +controlledvocabulary.language.wik-me'anha=Wik-Me'anha +controlledvocabulary.language.wik-mungkan=Wik-Mungkan +controlledvocabulary.language.wikalkan=Wikalkan +controlledvocabulary.language.wikngenchera=Wikngenchera +controlledvocabulary.language.wilawila=Wilawila +controlledvocabulary.language.wintu=Wintu +controlledvocabulary.language.winy�=Winy� +controlledvocabulary.language.wipi=Wipi +controlledvocabulary.language.wiradjuri=Wiradjuri +controlledvocabulary.language.wiraf�d=Wiraf�d +controlledvocabulary.language.wirangu=Wirangu +controlledvocabulary.language.wiru=Wiru +controlledvocabulary.language.wiyot=Wiyot +controlledvocabulary.language.woccon=Woccon +controlledvocabulary.language.wogamusin=Wogamusin +controlledvocabulary.language.wogeo=Wogeo +controlledvocabulary.language.woi=Woi +controlledvocabulary.language.woiwurrung=Woiwurrung +controlledvocabulary.language.wojenaka=Wojenaka +controlledvocabulary.language.wolane=Wolane +controlledvocabulary.language.wolani=Wolani +controlledvocabulary.language.wolaytta=Wolaytta +controlledvocabulary.language.woleaian=Woleaian +controlledvocabulary.language.wolio=Wolio +controlledvocabulary.language.wolof=Wolof +controlledvocabulary.language.wom_(nigeria)=Wom (Nigeria) +controlledvocabulary.language.wom_(papua_new_guinea)=Wom (Papua New Guinea) +controlledvocabulary.language.womo=Womo +controlledvocabulary.language.wongo=Wongo +controlledvocabulary.language.woods_cree=Woods Cree +controlledvocabulary.language.woria=Woria +controlledvocabulary.language.worimi=Worimi +controlledvocabulary.language.worodougou=Worodougou +controlledvocabulary.language.worrorra=Worrorra +controlledvocabulary.language.wotapuri-katarqalai=Wotapuri-Katarqalai +controlledvocabulary.language.wotjobaluk=Wotjobaluk +controlledvocabulary.language.wotu=Wotu +controlledvocabulary.language.woun_meu=Woun Meu +controlledvocabulary.language.written_oirat=Written Oirat +controlledvocabulary.language.wu_chinese=Wu Chinese +controlledvocabulary.language.wuding-luquan_yi=Wuding-Luquan Yi +controlledvocabulary.language.wudu=Wudu +controlledvocabulary.language.wuliwuli=Wuliwuli +controlledvocabulary.language.wulna=Wulna +controlledvocabulary.language.wumboko=Wumboko +controlledvocabulary.language.wumbvu=Wumbvu +controlledvocabulary.language.wumeng_nasu=Wumeng Nasu +controlledvocabulary.language.wunai_bunu=Wunai Bunu +controlledvocabulary.language.wunambal=Wunambal +controlledvocabulary.language.wunumara=Wunumara +controlledvocabulary.language.wurrugu=Wurrugu +controlledvocabulary.language.wusa_nasu=Wusa Nasu +controlledvocabulary.language.wushi=Wushi +controlledvocabulary.language.wusi=Wusi +controlledvocabulary.language.wutung=Wutung +controlledvocabulary.language.wutunhua=Wutunhua +controlledvocabulary.language.wuvulu-aua=Wuvulu-Aua +controlledvocabulary.language.wuzlam=Wuzlam +controlledvocabulary.language.wyandot=Wyandot +controlledvocabulary.language.wymysorys=Wymysorys +controlledvocabulary.language.w�ra=W�ra +controlledvocabulary.language.w�pha=W�pha +controlledvocabulary.language.w�_northern=W� Northern +controlledvocabulary.language.w�_southern=W� Southern +controlledvocabulary.language.w�_western=W� Western +controlledvocabulary.language.xaasongaxango=Xaasongaxango +controlledvocabulary.language.xadani_zapotec=Xadani Zapotec +controlledvocabulary.language.xakriab�=Xakriab� +controlledvocabulary.language.xamtanga=Xamtanga +controlledvocabulary.language.xanagu�a_zapotec=Xanagu�a Zapotec +controlledvocabulary.language.xav�nte=Xav�nte +controlledvocabulary.language.xer�nte=Xer�nte +controlledvocabulary.language.xet�=Xet� +controlledvocabulary.language.xhosa=Xhosa +controlledvocabulary.language.xiang_chinese=Xiang Chinese +controlledvocabulary.language.xibe=Xibe +controlledvocabulary.language.xicotepec_de_ju�rez_totonac=Xicotepec De Ju�rez Totonac +controlledvocabulary.language.xinca=Xinca +controlledvocabulary.language.xing�_asurin�=Xing� Asurin� +controlledvocabulary.language.xipaya=Xipaya +controlledvocabulary.language.xiri=Xiri +controlledvocabulary.language.xiri�na=Xiri�na +controlledvocabulary.language.xishanba_lalo=Xishanba Lalo +controlledvocabulary.language.xokleng=Xokleng +controlledvocabulary.language.xukur�=Xukur� +controlledvocabulary.language.xwela_gbe=Xwela Gbe +controlledvocabulary.language.x�r�c��=X�r�c�� +controlledvocabulary.language.x�r�gur�=X�r�gur� +controlledvocabulary.language.yaaku=Yaaku +controlledvocabulary.language.yabarana=Yabarana +controlledvocabulary.language.yaba�na=Yaba�na +controlledvocabulary.language.yabem=Yabem +controlledvocabulary.language.yaben=Yaben +controlledvocabulary.language.yabong=Yabong +controlledvocabulary.language.yabula_yabula=Yabula Yabula +controlledvocabulary.language.yace=Yace +controlledvocabulary.language.yaeyama=Yaeyama +controlledvocabulary.language.yafi=Yafi +controlledvocabulary.language.yagara=Yagara +controlledvocabulary.language.yagaria=Yagaria +controlledvocabulary.language.yagnobi=Yagnobi +controlledvocabulary.language.yagomi=Yagomi +controlledvocabulary.language.yagua=Yagua +controlledvocabulary.language.yagwoia=Yagwoia +controlledvocabulary.language.yahadian=Yahadian +controlledvocabulary.language.yahang=Yahang +controlledvocabulary.language.yahuna=Yahuna +controlledvocabulary.language.yaka_(central_african_republic)=Yaka (Central African Republic) +controlledvocabulary.language.yaka_(congo)=Yaka (Congo) +controlledvocabulary.language.yaka_(democratic_republic_of_congo)=Yaka (Democratic Republic of Congo) +controlledvocabulary.language.yakaikeke=Yakaikeke +controlledvocabulary.language.yakama=Yakama +controlledvocabulary.language.yakan=Yakan +controlledvocabulary.language.yakha=Yakha +controlledvocabulary.language.yakoma=Yakoma +controlledvocabulary.language.yakut=Yakut +controlledvocabulary.language.yala=Yala +controlledvocabulary.language.yalahatan=Yalahatan +controlledvocabulary.language.yalakalore=Yalakalore +controlledvocabulary.language.yalarnnga=Yalarnnga +controlledvocabulary.language.yale=Yale +controlledvocabulary.language.yaleba=Yaleba +controlledvocabulary.language.yalunka=Yalunka +controlledvocabulary.language.yal�lag_zapotec=Yal�lag Zapotec +controlledvocabulary.language.yamap=Yamap +controlledvocabulary.language.yamba=Yamba +controlledvocabulary.language.yambes=Yambes +controlledvocabulary.language.yambeta=Yambeta +controlledvocabulary.language.yamdena=Yamdena +controlledvocabulary.language.yameo=Yameo +controlledvocabulary.language.yami=Yami +controlledvocabulary.language.yaminahua=Yaminahua +controlledvocabulary.language.yamna=Yamna +controlledvocabulary.language.yamongeri=Yamongeri +controlledvocabulary.language.yamphu=Yamphu +controlledvocabulary.language.yan-nhangu=Yan-nhangu +controlledvocabulary.language.yan-nhau_sign_language=Yan-nha?u Sign Language +controlledvocabulary.language.yana=Yana +controlledvocabulary.language.yanahuanca_pasco_quechua=Yanahuanca Pasco Quechua +controlledvocabulary.language.yanda=Yanda +controlledvocabulary.language.yanda_dom_dogon=Yanda Dom Dogon +controlledvocabulary.language.yandjibara=Yandjibara +controlledvocabulary.language.yandruwandha=Yandruwandha +controlledvocabulary.language.yanesha'=Yanesha' +controlledvocabulary.language.yang_zhuang=Yang Zhuang +controlledvocabulary.language.yangben=Yangben +controlledvocabulary.language.yangkam=Yangkam +controlledvocabulary.language.yangman=Yangman +controlledvocabulary.language.yango=Yango +controlledvocabulary.language.yangulam=Yangulam +controlledvocabulary.language.yangum_dey=Yangum Dey +controlledvocabulary.language.yangum_gel=Yangum Gel +controlledvocabulary.language.yangum_mon=Yangum Mon +controlledvocabulary.language.yankunytjatjara=Yankunytjatjara +controlledvocabulary.language.yanomam�=Yanomam� +controlledvocabulary.language.yanom�mi=Yanom�mi +controlledvocabulary.language.yansi=Yansi +controlledvocabulary.language.yanyuwa=Yanyuwa +controlledvocabulary.language.yao=Yao +controlledvocabulary.language.yaosakor_asmat=Yaosakor Asmat +controlledvocabulary.language.yaour�=Yaour� +controlledvocabulary.language.yapese=Yapese +controlledvocabulary.language.yapunda=Yapunda +controlledvocabulary.language.yaqay=Yaqay +controlledvocabulary.language.yaqui=Yaqui +controlledvocabulary.language.yarawata=Yarawata +controlledvocabulary.language.yardliyawarra=Yardliyawarra +controlledvocabulary.language.yareba=Yareba +controlledvocabulary.language.yareni_zapotec=Yareni Zapotec +controlledvocabulary.language.yarluyandi=Yarluyandi +controlledvocabulary.language.yaroam�=Yaroam� +controlledvocabulary.language.yarsun=Yarsun +controlledvocabulary.language.yasa=Yasa +controlledvocabulary.language.yassic=Yassic +controlledvocabulary.language.yatay=Yatay +controlledvocabulary.language.yatee_zapotec=Yatee Zapotec +controlledvocabulary.language.yatzachi_zapotec=Yatzachi Zapotec +controlledvocabulary.language.yau_(morobe_province)=Yau (Morobe Province) +controlledvocabulary.language.yau_(sandaun_province)=Yau (Sandaun Province) +controlledvocabulary.language.yaul=Yaul +controlledvocabulary.language.yauma=Yauma +controlledvocabulary.language.yaur=Yaur +controlledvocabulary.language.yautepec_zapotec=Yautepec Zapotec +controlledvocabulary.language.yauyos_quechua=Yauyos Quechua +controlledvocabulary.language.yavitero=Yavitero +controlledvocabulary.language.yawa=Yawa +controlledvocabulary.language.yawalapit�=Yawalapit� +controlledvocabulary.language.yawanawa=Yawanawa +controlledvocabulary.language.yawarawarga=Yawarawarga +controlledvocabulary.language.yaweyuha=Yaweyuha +controlledvocabulary.language.yawijibaya=Yawijibaya +controlledvocabulary.language.yawiyo=Yawiyo +controlledvocabulary.language.yawuru=Yawuru +controlledvocabulary.language.yaygir=Yaygir +controlledvocabulary.language.yazgulyam=Yazgulyam +controlledvocabulary.language.yecuatla_totonac=Yecuatla Totonac +controlledvocabulary.language.yei=Yei +controlledvocabulary.language.yekhee=Yekhee +controlledvocabulary.language.yekora=Yekora +controlledvocabulary.language.yela=Yela +controlledvocabulary.language.yele=Yele +controlledvocabulary.language.yelmek=Yelmek +controlledvocabulary.language.yelogu=Yelogu +controlledvocabulary.language.yemba=Yemba +controlledvocabulary.language.yemsa=Yemsa +controlledvocabulary.language.yendang=Yendang +controlledvocabulary.language.yeni=Yeni +controlledvocabulary.language.yeniche=Yeniche +controlledvocabulary.language.yerakai=Yerakai +controlledvocabulary.language.yeretuar=Yeretuar +controlledvocabulary.language.yerong=Yerong +controlledvocabulary.language.yerukula=Yerukula +controlledvocabulary.language.yessan-mayo=Yessan-Mayo +controlledvocabulary.language.yetfa=Yetfa +controlledvocabulary.language.yevanic=Yevanic +controlledvocabulary.language.yeyi=Yeyi +controlledvocabulary.language.yiddish=Yiddish +controlledvocabulary.language.yidgha=Yidgha +controlledvocabulary.language.yidiny=Yidiny +controlledvocabulary.language.yil=Yil +controlledvocabulary.language.yilan_creole=Yilan Creole +controlledvocabulary.language.yimas=Yimas +controlledvocabulary.language.yimchungru_naga=Yimchungru Naga +controlledvocabulary.language.yinbaw_karen=Yinbaw Karen +controlledvocabulary.language.yindjibarndi=Yindjibarndi +controlledvocabulary.language.yindjilandji=Yindjilandji +controlledvocabulary.language.yine=Yine +controlledvocabulary.language.yinggarda=Yinggarda +controlledvocabulary.language.yinhawangka=Yinhawangka +controlledvocabulary.language.yiningayi=Yiningayi +controlledvocabulary.language.yintale_karen=Yintale Karen +controlledvocabulary.language.yinwum=Yinwum +controlledvocabulary.language.yir_yoront=Yir Yoront +controlledvocabulary.language.yirandali=Yirandali +controlledvocabulary.language.yirrk-mel=Yirrk-Mel +controlledvocabulary.language.yis=Yis +controlledvocabulary.language.yitha_yitha=Yitha Yitha +controlledvocabulary.language.yoba=Yoba +controlledvocabulary.language.yocobou�_dida=Yocobou� Dida +controlledvocabulary.language.yogad=Yogad +controlledvocabulary.language.yoidik=Yoidik +controlledvocabulary.language.yoke=Yoke +controlledvocabulary.language.yokuts=Yokuts +controlledvocabulary.language.yola=Yola +controlledvocabulary.language.yoloxochitl_mixtec=Yoloxochitl Mixtec +controlledvocabulary.language.yolu_sign_language=Yol?u Sign Language +controlledvocabulary.language.yom=Yom +controlledvocabulary.language.yombe=Yombe +controlledvocabulary.language.yonaguni=Yonaguni +controlledvocabulary.language.yong=Yong +controlledvocabulary.language.yongbei_zhuang=Yongbei Zhuang +controlledvocabulary.language.yongkom=Yongkom +controlledvocabulary.language.yongnan_zhuang=Yongnan Zhuang +controlledvocabulary.language.yopno=Yopno +controlledvocabulary.language.yora=Yora +controlledvocabulary.language.yoron=Yoron +controlledvocabulary.language.yorta_yorta=Yorta Yorta +controlledvocabulary.language.yoruba=Yoruba +controlledvocabulary.language.yosond�a_mixtec=Yosond�a Mixtec +controlledvocabulary.language.yotti=Yotti +controlledvocabulary.language.youjiang_zhuang=Youjiang Zhuang +controlledvocabulary.language.youle_jinuo=Youle Jinuo +controlledvocabulary.language.younuo_bunu=Younuo Bunu +controlledvocabulary.language.yout_wam=Yout Wam +controlledvocabulary.language.yoy=Yoy +controlledvocabulary.language.yuanga=Yuanga +controlledvocabulary.language.yucatec_maya_sign_language=Yucatec Maya Sign Language +controlledvocabulary.language.yucateco=Yucateco +controlledvocabulary.language.yuchi=Yuchi +controlledvocabulary.language.yucua�e_mixtec=Yucua�e Mixtec +controlledvocabulary.language.yucuna=Yucuna +controlledvocabulary.language.yue_chinese=Yue Chinese +controlledvocabulary.language.yug=Yug +controlledvocabulary.language.yugambal=Yugambal +controlledvocabulary.language.yugoslavian_sign_language=Yugoslavian Sign Language +controlledvocabulary.language.yugul=Yugul +controlledvocabulary.language.yuhup=Yuhup +controlledvocabulary.language.yuki=Yuki +controlledvocabulary.language.yukpa=Yukpa +controlledvocabulary.language.yukuben=Yukuben +controlledvocabulary.language.yulu=Yulu +controlledvocabulary.language.yuqui=Yuqui +controlledvocabulary.language.yuracare=Yuracare +controlledvocabulary.language.yurats=Yurats +controlledvocabulary.language.yurok=Yurok +controlledvocabulary.language.yuru=Yuru +controlledvocabulary.language.yurut�=Yurut� +controlledvocabulary.language.yutanduchi_mixtec=Yutanduchi Mixtec +controlledvocabulary.language.yuwana=Yuwana +controlledvocabulary.language.yuyu=Yuyu +controlledvocabulary.language.ywom=Ywom +controlledvocabulary.language.y�mana=Y�mana +controlledvocabulary.language.zaachila_zapotec=Zaachila Zapotec +controlledvocabulary.language.zabana=Zabana +controlledvocabulary.language.zacatepec_chatino=Zacatepec Chatino +controlledvocabulary.language.zacatl�n-ahuacatl�n-tepetzintla_nahuatl=Zacatl�n-Ahuacatl�n-Tepetzintla Nahuatl +controlledvocabulary.language.zaghawa=Zaghawa +controlledvocabulary.language.zaiwa=Zaiwa +controlledvocabulary.language.zakhring=Zakhring +controlledvocabulary.language.zambian_sign_language=Zambian Sign Language +controlledvocabulary.language.zan_gula=Zan Gula +controlledvocabulary.language.zanaki=Zanaki +controlledvocabulary.language.zande_(individual_language)=Zande (individual language) +controlledvocabulary.language.zangskari=Zangskari +controlledvocabulary.language.zangwal=Zangwal +controlledvocabulary.language.zaniza_zapotec=Zaniza Zapotec +controlledvocabulary.language.zapotec=Zapotec +controlledvocabulary.language.zaramo=Zaramo +controlledvocabulary.language.zari=Zari +controlledvocabulary.language.zarma=Zarma +controlledvocabulary.language.zarphatic=Zarphatic +controlledvocabulary.language.zauzou=Zauzou +controlledvocabulary.language.zay=Zay +controlledvocabulary.language.zayein_karen=Zayein Karen +controlledvocabulary.language.zayse-zergulla=Zayse-Zergulla +controlledvocabulary.language.zaza=Zaza +controlledvocabulary.language.zazao=Zazao +controlledvocabulary.language.zeem=Zeem +controlledvocabulary.language.zeeuws=Zeeuws +controlledvocabulary.language.zemba=Zemba +controlledvocabulary.language.zeme_naga=Zeme Naga +controlledvocabulary.language.zemgalian=Zemgalian +controlledvocabulary.language.zenag=Zenag +controlledvocabulary.language.zenaga=Zenaga +controlledvocabulary.language.zenzontepec_chatino=Zenzontepec Chatino +controlledvocabulary.language.zerenkel=Zerenkel +controlledvocabulary.language.zhaba=Zhaba +controlledvocabulary.language.zhang-zhung=Zhang-Zhung +controlledvocabulary.language.zhire=Zhire +controlledvocabulary.language.zhoa=Zhoa +controlledvocabulary.language.zhuang,_chuang=Zhuang, Chuang +controlledvocabulary.language.zia=Zia +controlledvocabulary.language.zialo=Zialo +controlledvocabulary.language.zigula=Zigula +controlledvocabulary.language.zimakani=Zimakani +controlledvocabulary.language.zimba=Zimba +controlledvocabulary.language.zimbabwe_sign_language=Zimbabwe Sign Language +controlledvocabulary.language.zinza=Zinza +controlledvocabulary.language.zire=Zire +controlledvocabulary.language.zizilivakan=Zizilivakan +controlledvocabulary.language.zo'�=Zo'� +controlledvocabulary.language.zokhuo=Zokhuo +controlledvocabulary.language.zoogocho_zapotec=Zoogocho Zapotec +controlledvocabulary.language.zoroastrian_dari=Zoroastrian Dari +controlledvocabulary.language.zotung_chin=Zotung Chin +controlledvocabulary.language.zou=Zou +controlledvocabulary.language.zul=Zul +controlledvocabulary.language.zula=Zula +controlledvocabulary.language.zulgo-gemzek=Zulgo-Gemzek +controlledvocabulary.language.zulu=Zulu +controlledvocabulary.language.zumaya=Zumaya +controlledvocabulary.language.zumbun=Zumbun +controlledvocabulary.language.zuni=Zuni +controlledvocabulary.language.zuojiang_zhuang=Zuojiang Zhuang +controlledvocabulary.language.zyphe_chin=Zyphe Chin +controlledvocabulary.language.z�paro=Z�paro +controlledvocabulary.language.stodsde=sTodsde +controlledvocabulary.language.us-saare=us-Saare +controlledvocabulary.language.ut-hun=ut-Hun +controlledvocabulary.language.ut-ma'in=ut-Ma'in +controlledvocabulary.language.�h�n=�h�n +controlledvocabulary.language.�nc�=�nc� +controlledvocabulary.language.�mie=�mie +controlledvocabulary.language.�nge=�nge +controlledvocabulary.language.gwi=Gwi +controlledvocabulary.language.xam=Xam +controlledvocabulary.language.ani=Ani +controlledvocabulary.language.xegwi=Xegwi +controlledvocabulary.language.hua=Hua +controlledvocabulary.language.ungkue=Ungkue +controlledvocabulary.language.x��=X�� +controlledvocabulary.language.not_applicable=Not applicable From 31e426262e72b742a0feca01313bc56902d18818 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:30:58 -0400 Subject: [PATCH 258/366] fixing key to lowercase --- tests/verify_mdb_properties.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/verify_mdb_properties.sh b/tests/verify_mdb_properties.sh index 54aea12bfbe..975771bb682 100755 --- a/tests/verify_mdb_properties.sh +++ b/tests/verify_mdb_properties.sh @@ -31,7 +31,6 @@ import java.io.IOException; class stripaccents { public static void main(String[] args) throws IOException { String input = new String(System.in.readAllBytes(), StandardCharsets.UTF_8).toLowerCase().replace(" ", "_"); - # System.out.println(StringUtils.stripAccents(input)); System.out.println(input.replaceAll("[^\\x00-\\xFF]", "").trim()); } } From 3d6cd3a925d5cf2e40691ca9eaa76fe83646897a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 9 Sep 2024 15:59:34 -0400 Subject: [PATCH 259/366] release note --- .../10632-DataCiteXMLandRelationType.md | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/release-notes/10632-DataCiteXMLandRelationType.md diff --git a/doc/release-notes/10632-DataCiteXMLandRelationType.md b/doc/release-notes/10632-DataCiteXMLandRelationType.md new file mode 100644 index 00000000000..90569041dc7 --- /dev/null +++ b/doc/release-notes/10632-DataCiteXMLandRelationType.md @@ -0,0 +1,22 @@ +### Enhanced DataCite Metadata + +A new field has been added to the citation metadatablock to allow entry of the "Relation Type" between a "Related Publication" and a dataset. The Relation Type is currently limited to the most common 6 values recommended by DataCite: isCitedBy, Cites, IsSupplementTo, IsSupplementedBy, IsReferencedBy, and References. + +Additional metadata, including metadata about Related Publications is now being sent to DataCite when DOIs are registered and published and is available in the DataCite XML export. For existing datasets where no "Relation Type" has been specified, "IsSupplementTo" is assumed. The additions are in rough alignment with the OpenAire xml export, but there are some minor differences in addition to the Relation Type addition, including an update to the DataCite 4.5 schema. + +For details see https://github.com/IQSS/dataverse/pull/10632 and https://github.com/IQSS/dataverse/pull/10615 and the design document referenced there. + +Upgrade instructions +-------------------- + +The solr schema has to be updated via the normal mechanism to add the new "relationType" field. + +The citation metadatablock has to be reinstalled using the standard instructions. + +With these two changes, the "Relation Type" fields will be available and creation/publication of datasets will result in the expanded XML being sent to DataCite. + +To update existing datasets (and files using DataCite DOIs): + +Exports can be updated by running curl http://localhost:8080/api/admin/metadata/reExportAll + +Entries at DataCite can be updated on a per-dataset basis http://localhost:8080/api/datasets//modifyRegistrationMetadata. (Smaller instances may be able to use the undocumented curl http://localhost:8080/api/datasets/modifyRegistrationPIDMetadataAll, but this is likely to cause DataCite failures with many DOIs involved.) From b71b0a2262d886c59e9624c3beac0480ba0e4702 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 9 Sep 2024 17:22:08 -0400 Subject: [PATCH 260/366] undo changes --- .../harvard/iq/dataverse/ControlledVocabularyValue.java | 8 +++++--- .../edu/harvard/iq/dataverse/dataset/DatasetUtil.java | 4 ++-- tests/verify_mdb_properties.sh | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java index 46b5e951343..5dcce98a90f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java +++ b/src/main/java/edu/harvard/iq/dataverse/ControlledVocabularyValue.java @@ -136,9 +136,11 @@ public String getLocaleStrValue(String language) { public static String getLocaleStrValue(String strValue, String fieldTypeName, String metadataBlockName, Locale locale, boolean sendDefault) { - String key = BundleUtil.getKeyFromRawString("controlledvocabulary." + fieldTypeName + "." + strValue); + String key = strValue.toLowerCase().replace(" ", "_"); + key = StringUtils.stripAccents(key); try { - String val = BundleUtil.getStringFromPropertyFile(key, metadataBlockName, locale); + String val = BundleUtil.getStringFromPropertyFile("controlledvocabulary." + fieldTypeName + "." + key, + metadataBlockName, locale); if (!val.isBlank()) { logger.fine("Found : " + val); return val; @@ -146,7 +148,7 @@ public static String getLocaleStrValue(String strValue, String fieldTypeName, St return sendDefault ? strValue : null; } } catch (MissingResourceException | NullPointerException e) { - logger.warning("Error finding " + key + " in " + ((locale==null)? "defaultLang" : locale.getLanguage()) + " : " + e.getLocalizedMessage()); + logger.warning("Error finding " + "controlledvocabulary." + fieldTypeName + "." + key + " in " + ((locale==null)? "defaultLang" : locale.getLanguage()) + " : " + e.getLocalizedMessage()); return sendDefault ? strValue : null; } } diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java index 926c578219d..cacd409b365 100644 --- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java @@ -702,7 +702,7 @@ public static String getLocalizedLicenseDetails(License license,String keyPart) String localizedLicenseValue = "" ; try { if (EnumUtils.isValidEnum(LicenseOption.class, keyPart ) ){ - String key = BundleUtil.getKeyFromRawString("license." + licenseName + "." + keyPart); + String key = "license." + licenseName.toLowerCase().replace(" ", "_") + "." + keyPart.toLowerCase(); localizedLicenseValue = BundleUtil.getStringFromPropertyFile(key, "License"); } } @@ -719,7 +719,7 @@ public static String getLocalizedLicenseDetails(License license,String keyPart) public static String getLocaleExternalStatus(String status) { String localizedName = "" ; try { - localizedName = BundleUtil.getStringFromPropertyFile(BundleUtil.getKeyFromRawString(status), "CurationLabels"); + localizedName = BundleUtil.getStringFromPropertyFile(status.toLowerCase().replace(" ", "_"), "CurationLabels"); } catch (Exception e) { localizedName = status; diff --git a/tests/verify_mdb_properties.sh b/tests/verify_mdb_properties.sh index 975771bb682..bc62c0f503a 100755 --- a/tests/verify_mdb_properties.sh +++ b/tests/verify_mdb_properties.sh @@ -31,7 +31,7 @@ import java.io.IOException; class stripaccents { public static void main(String[] args) throws IOException { String input = new String(System.in.readAllBytes(), StandardCharsets.UTF_8).toLowerCase().replace(" ", "_"); - System.out.println(input.replaceAll("[^\\x00-\\xFF]", "").trim()); + System.out.println(StringUtils.stripAccents(input)); } } EOF From 906ff237ea14d101d3daafee7f5a3ffd55aa2648 Mon Sep 17 00:00:00 2001 From: Guillermo Portas Date: Tue, 10 Sep 2024 09:40:21 +0100 Subject: [PATCH 261/366] Update doc/release-notes/10810-search-api-payload-extensions.md Co-authored-by: Philip Durbin --- doc/release-notes/10810-search-api-payload-extensions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/10810-search-api-payload-extensions.md b/doc/release-notes/10810-search-api-payload-extensions.md index ca302d04c50..5112d9f62ee 100644 --- a/doc/release-notes/10810-search-api-payload-extensions.md +++ b/doc/release-notes/10810-search-api-payload-extensions.md @@ -47,6 +47,6 @@ For Dataset: (etc, etc) ``` -The image_url field was already part of the SolrSearchResult JSON, but it wasn’t returned by the API because it was appended only after the Solr query was executed in the SearchIncludeFragment of JSF. Now, the field is set in SearchServiceBean, ensuring it is always returned by the API when an image is available. +The image_url field was already part of the SolrSearchResult JSON (and incorrectly appeared in Search API documentation), but it wasn’t returned by the API because it was appended only after the Solr query was executed in the SearchIncludeFragment of JSF. Now, the field is set in SearchServiceBean, ensuring it is always returned by the API when an image is available. The schema.xml file for Solr has been updated to include a new field called dvParentAlias for supporting the new response field "parentDataverseIdentifier". So for the next Dataverse released version, a Solr reindex will be necessary to apply the new schema.xml version. From f05cb3a779a62bf2c946c3380e7579b4dfd78969 Mon Sep 17 00:00:00 2001 From: GPortas Date: Tue, 10 Sep 2024 14:39:25 +0100 Subject: [PATCH 262/366] Added: note about upcoming change to image_url field in docs --- doc/sphinx-guides/source/api/search.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/api/search.rst b/doc/sphinx-guides/source/api/search.rst index ca592d8556a..359313ce1b5 100755 --- a/doc/sphinx-guides/source/api/search.rst +++ b/doc/sphinx-guides/source/api/search.rst @@ -173,7 +173,7 @@ https://demo.dataverse.org/api/search?q=trees } } -Note that the image_url field, if exists, will be returned as a regular URL for Datasets, while for Files and Dataverses, it will be returned as a Base64 URL. +Note that the image_url field, if exists, will be returned as a regular URL for Datasets, while for Files and Dataverses, it will be returned as a Base64 URL. We plan to standardize this behavior so that the field always returns a regular URL. (See: https://github.com/IQSS/dataverse/issues/10831) .. _advancedsearch-example: From 71bafb35303ea14221d0d5de05aa97e63d72ef40 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:15:43 -0400 Subject: [PATCH 263/366] fixing language list --- scripts/api/data/metadatablocks/citation.tsv | 37 +- .../harvard/iq/dataverse/util/BundleUtil.java | 17 +- .../java/propertyFiles/citation.properties | 897 +++++++++--------- .../iq/dataverse/MetadataBlockTest.java | 3 +- 4 files changed, 470 insertions(+), 484 deletions(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index 70e4877781a..ae806edf0f4 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -172,14 +172,13 @@ language Acatepec Me'phaa tpx 30 tpx language Achagua aca 31 aca language Achang acn 32 acn - language Ache yif 33 yif + language Ache yif 33 yif guq Aché language Acheron acz 34 acz language Achi acr 35 acr language Achinese ace 36 ace language Achterhoeks act 37 act language Achuar-Shiwiar acu 38 acu language Achumawi acv 39 acv - language Aché guq 40 guq language Acoli ach 41 ach language Acroá acs 42 acs language Adai xad 43 xad @@ -796,7 +795,7 @@ language Bardi bcj 654 bcj language Barein bva 655 bva language Bargam mlp 656 mlp - language Bari bfa 657 bfa + language Bari bfa 657 bfa mot Barí language Bariai bch 658 bch language Bariji bjc 659 bjc language Barikanchi bxo 660 bxo @@ -810,7 +809,6 @@ language Barwe bwg 668 bwg language Barzani Jewish Neo-Aramaic bjf 669 bjf language Baré bae 670 bae - language Barí mot 671 mot language Basa (Cameroon) bas 672 bas language Basa (Nigeria) bzw 673 bzw language Basa-Gumna bsl 674 bsl @@ -2160,7 +2158,7 @@ language Gamo gmv 2018 gmv language Gamo-Ningi bte 2019 bte language Gan Chinese gan 2020 gan - language Gana gnq 2021 gnq gnk + language Gana gnq 2021 gnq gnk ǁGana language Ganang gne 2022 gne language Ganda lug 2023 lug lg language Gane gzn 2024 gzn @@ -5401,7 +5399,7 @@ language Old Burmese obr 5259 obr language Old Cham ocm 5260 ocm language Old Chinese och 5261 och - language Old Church Slavonic, Church Slavonic, Old Bulgarian chu 5262 chu cu Church Slavonic Church Slavic Old Church Slavonic Old Bulgarian + language Old Church Slavonic chu 5262 chu cu Church Slavonic Church Slavic Old Church Slavonic Old Bulgarian language Old Cornish oco 5263 oco language Old Dutch odt 5264 odt language Old English (ca. 450-1100) ang 5265 ang @@ -6068,7 +6066,7 @@ language Salasaca Highland Quichua qxl 5926 qxl language Salawati xmx 5927 xmx language Saleman sau 5928 sau - language Saliba sbe 5929 sbe + language Saliba sbe 5929 sbe slc Sáliba language Salinan sln 5930 sln language Sallands sdz 5931 sdz language Salt-Yui sll 5932 sll @@ -6692,7 +6690,6 @@ language Syenara Senoufo shz 6550 shz language Sylheti syl 6551 syl language Syriac syr 6552 syr - language Sáliba slc 6553 slc language São Paulo Kaingáng zkp 6554 zkp language Sãotomense cri 6555 cri language Sìcìté Sénoufo sep 6556 sep @@ -7439,7 +7436,7 @@ language Volapük vol 7297 vol vo language Volscian xvo 7298 xvo language Vono kch 7299 kch - language Voro vor 7300 vor + language Voro vor 7300 vor vro Võro language Votic vot 7301 vot language Vumbu vum 7302 vum language Vunapu vnp 7303 vnp @@ -7447,7 +7444,6 @@ language Vurës msn 7305 msn language Vute vut 7306 vut language Vwanji wbi 7307 wbi - language Võro vro 7308 vro language Wa wbm 7309 wbm language Wa'ema wag 7310 wag language Waama wwa 7311 wwa @@ -7544,7 +7540,7 @@ language Wapishana wap 7402 wap language Wappo wao 7403 wao language War-Jaintia aml 7404 aml - language Wara wbf 7405 wbf + language Wara wbf 7405 wbf tci Wára language Warao wba 7406 wba language Waray (Australia) wrz 7407 wrz language Waray (Philippines) war 7408 war @@ -7747,7 +7743,6 @@ language Wuzlam udl 7605 udl language Wyandot wyn 7606 wyn language Wymysorys wym 7607 wym - language Wára tci 7608 tci language Wãpha juw 7609 juw language Wè Northern wob 7610 wob language Wè Southern gxx 7611 gxx @@ -7823,7 +7818,7 @@ language Yamongeri ymg 7681 ymg language Yamphu ybi 7682 ybi language Yan-nhangu jay 7683 jay - language Yan-nhaŋu Sign Language yhs 7684 yhs + language Yan-nhangu Sign Language yhs 7684 yhs Yan-nhaŋu Sign Language language Yana ynn 7685 ynn language Yanahuanca Pasco Quechua qur 7686 qur language Yanda yda 7687 yda @@ -7932,7 +7927,7 @@ language Yokuts yok 7790 yok language Yola yol 7791 yol language Yoloxochitl Mixtec xty 7792 xty - language Yolŋu Sign Language ygs 7793 ygs + language Yolngu Sign Language ygs 7793 ygs Yolŋu Sign Language language Yom pil 7794 pil language Yombe yom 7795 yom language Yonaguni yoi 7796 yoi @@ -8051,11 +8046,11 @@ language Áncá acb 7909 acb language Ömie aom 7910 aom language Önge oon 7911 oon - language Gwi gwj 7912 gwj - language Xam xam 7913 xam - language Ani hnh 7914 hnh - language Xegwi xeg 7916 xeg - language Hua huc 7917 huc - language Ungkue gku 7918 gku - language Xóõ nmn 7919 nmn + language Gwi gwj 7912 gwj ǀGwi + language Xam xam 7913 xam ǀXam + language Ani hnh 7914 hnh ǁAni + language Xegwi xeg 7916 xeg ǁXegwi + language Hua huc 7917 huc ǂHua + language Ungkue gku 7918 gku ǂUngkue + language Xóõ nmn 7919 nmn ǃXóõ language Not applicable 7920 diff --git a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java index 361ae812833..922e6ff5d28 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java @@ -4,12 +4,15 @@ import java.net.URL; import java.net.URLClassLoader; import java.text.MessageFormat; -import java.util.*; +import java.util.List; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; - +import java.util.Map; +import java.util.HashMap; import jakarta.faces.context.FacesContext; -import org.apache.commons.lang3.StringUtils; public class BundleUtil { @@ -195,12 +198,4 @@ public static Locale getDefaultLocale() { return Locale.getDefault(); } - /** - * Return a sanitized key by stripping out non-latin chars and spaces - * @param rawKey - * @return - */ - public static String getKeyFromRawString(String rawKey) { - return rawKey.replaceAll("[^\\x00-\\xFF]", "").trim().replace(" ", "_").toLowerCase(); - } } diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 538258b2017..605206066b6 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -301,7 +301,7 @@ controlledvocabulary.language.'auhelawa='Auhelawa controlledvocabulary.language.a'ou=A'ou controlledvocabulary.language.a-pucikwar=A-Pucikwar controlledvocabulary.language.aari=Aari -controlledvocabulary.language.aas�x=Aas�x +controlledvocabulary.language.aasax=Aasáx controlledvocabulary.language.abadi=Abadi controlledvocabulary.language.abaga=Abaga controlledvocabulary.language.abai_sungai=Abai Sungai @@ -314,7 +314,7 @@ controlledvocabulary.language.abidji=Abidji controlledvocabulary.language.abinomn=Abinomn controlledvocabulary.language.abipon=Abipon controlledvocabulary.language.abishira=Abishira -controlledvocabulary.language.abkhaz=Abkhaz +controlledvocabulary.language.abkhaz=Abkhaz, Abkhazian controlledvocabulary.language.abom=Abom controlledvocabulary.language.abon=Abon controlledvocabulary.language.abron=Abron @@ -325,7 +325,7 @@ controlledvocabulary.language.abui=Abui controlledvocabulary.language.abun=Abun controlledvocabulary.language.abure=Abure controlledvocabulary.language.abureni=Abureni -controlledvocabulary.language.ab�=Ab� +controlledvocabulary.language.abe=Abé controlledvocabulary.language.acatepec_me'phaa=Acatepec Me'phaa controlledvocabulary.language.achagua=Achagua controlledvocabulary.language.achang=Achang @@ -336,9 +336,8 @@ controlledvocabulary.language.achinese=Achinese controlledvocabulary.language.achterhoeks=Achterhoeks controlledvocabulary.language.achuar-shiwiar=Achuar-Shiwiar controlledvocabulary.language.achumawi=Achumawi -controlledvocabulary.language.ach�=Ach� controlledvocabulary.language.acoli=Acoli -controlledvocabulary.language.acro�=Acro� +controlledvocabulary.language.acroa=Acroá controlledvocabulary.language.adai=Adai controlledvocabulary.language.adamawa_fulfulde=Adamawa Fulfulde controlledvocabulary.language.adamorobe_sign_language=Adamorobe Sign Language @@ -399,7 +398,7 @@ controlledvocabulary.language.ahtena=Ahtena controlledvocabulary.language.ahwai=Ahwai controlledvocabulary.language.ai-cham=Ai-Cham controlledvocabulary.language.aighon=Aighon -controlledvocabulary.language.aikan�=Aikan� +controlledvocabulary.language.aikana=Aikanã controlledvocabulary.language.aiklep=Aiklep controlledvocabulary.language.aimaq=Aimaq controlledvocabulary.language.aimele=Aimele @@ -413,9 +412,9 @@ controlledvocabulary.language.aiton=Aiton controlledvocabulary.language.aja_(benin)=Aja (Benin) controlledvocabulary.language.aja_(south_sudan)=Aja (South Sudan) controlledvocabulary.language.ajawa=Ajawa -controlledvocabulary.language.aji�=Aji� +controlledvocabulary.language.ajie=Ajië controlledvocabulary.language.ajumbu=Ajumbu -controlledvocabulary.language.ajy�ninka_apurucayali=Ajy�ninka Apurucayali +controlledvocabulary.language.ajyininka_apurucayali=Ajyíninka Apurucayali controlledvocabulary.language.ak=Ak controlledvocabulary.language.aka=Aka controlledvocabulary.language.aka-bea=Aka-Bea @@ -452,7 +451,7 @@ controlledvocabulary.language.akurio=Akurio controlledvocabulary.language.akwa=Akwa controlledvocabulary.language.akyaung_ari_naga=Akyaung Ari Naga controlledvocabulary.language.al-sayyid_bedouin_sign_language=Al-Sayyid Bedouin Sign Language -controlledvocabulary.language.alaba-kabeena=Alaba-K?abeena +controlledvocabulary.language.alaba-k’abeena=Alaba-K’abeena controlledvocabulary.language.alabama=Alabama controlledvocabulary.language.alabat_island_agta=Alabat Island Agta controlledvocabulary.language.alacatlatzala_mixtec=Alacatlatzala Mixtec @@ -482,7 +481,7 @@ controlledvocabulary.language.allar=Allar controlledvocabulary.language.alngith=Alngith controlledvocabulary.language.alo_phola=Alo Phola controlledvocabulary.language.alor=Alor -controlledvocabulary.language.alo�pam_zapotec=Alo�pam Zapotec +controlledvocabulary.language.aloapam_zapotec=Aloápam Zapotec controlledvocabulary.language.alsea=Alsea controlledvocabulary.language.alu_kurumba=Alu Kurumba controlledvocabulary.language.alugu=Alugu @@ -501,11 +500,11 @@ controlledvocabulary.language.amaimon=Amaimon controlledvocabulary.language.amal=Amal controlledvocabulary.language.amami_koniya_sign_language=Amami Koniya Sign Language controlledvocabulary.language.amanab=Amanab -controlledvocabulary.language.amanay�=Amanay� +controlledvocabulary.language.amanaye=Amanayé controlledvocabulary.language.amara=Amara controlledvocabulary.language.amarakaeri=Amarakaeri controlledvocabulary.language.amarasi=Amarasi -controlledvocabulary.language.amatl�n_zapotec=Amatl�n Zapotec +controlledvocabulary.language.amatlan_zapotec=Amatlán Zapotec controlledvocabulary.language.amba_(solomon_islands)=Amba (Solomon Islands) controlledvocabulary.language.amba_(uganda)=Amba (Uganda) controlledvocabulary.language.ambai=Ambai @@ -542,7 +541,7 @@ controlledvocabulary.language.anaang=Anaang controlledvocabulary.language.anakalangu=Anakalangu controlledvocabulary.language.anal=Anal controlledvocabulary.language.anam=Anam -controlledvocabulary.language.anamb�=Anamb� +controlledvocabulary.language.anambe=Anambé controlledvocabulary.language.anamgura=Anamgura controlledvocabulary.language.anasi=Anasi controlledvocabulary.language.ancient_greek_(to_1453)=Ancient Greek (to 1453) @@ -569,7 +568,7 @@ controlledvocabulary.language.anem=Anem controlledvocabulary.language.aneme_wake=Aneme Wake controlledvocabulary.language.anfillo=Anfillo controlledvocabulary.language.angaataha=Angaataha -controlledvocabulary.language.angait�=Angait� +controlledvocabulary.language.angaite=Angaité controlledvocabulary.language.angal=Angal controlledvocabulary.language.angal_enen=Angal Enen controlledvocabulary.language.angal_heneng=Angal Heneng @@ -612,15 +611,15 @@ controlledvocabulary.language.aoheng=Aoheng controlledvocabulary.language.aore=Aore controlledvocabulary.language.ap_ma=Ap Ma controlledvocabulary.language.apalachee=Apalachee -controlledvocabulary.language.apala�=Apala� +controlledvocabulary.language.apalai=Apalaí controlledvocabulary.language.apali=Apali controlledvocabulary.language.apasco-apoala_mixtec=Apasco-Apoala Mixtec controlledvocabulary.language.apatani=Apatani -controlledvocabulary.language.apiak�=Apiak� -controlledvocabulary.language.apinay�=Apinay� +controlledvocabulary.language.apiaka=Apiaká +controlledvocabulary.language.apinaye=Apinayé controlledvocabulary.language.apma=Apma controlledvocabulary.language.aproumu_aizi=Aproumu Aizi -controlledvocabulary.language.apurin�=Apurin� +controlledvocabulary.language.apurina=Apurinã controlledvocabulary.language.aputai=Aputai controlledvocabulary.language.aquitanian=Aquitanian controlledvocabulary.language.arabana=Arabana @@ -637,30 +636,30 @@ controlledvocabulary.language.arandai=Arandai controlledvocabulary.language.araona=Araona controlledvocabulary.language.arapaho=Arapaho controlledvocabulary.language.arapaso=Arapaso -controlledvocabulary.language.ararandew�ra=Ararandew�ra +controlledvocabulary.language.ararandewara=Ararandewára controlledvocabulary.language.arawak=Arawak -controlledvocabulary.language.arawet�=Arawet� +controlledvocabulary.language.arawete=Araweté controlledvocabulary.language.arawum=Arawum controlledvocabulary.language.arbore=Arbore -controlledvocabulary.language.arb�resh�_albanian=Arb�resh� Albanian +controlledvocabulary.language.arbereshe_albanian=Arbëreshë Albanian controlledvocabulary.language.archi=Archi -controlledvocabulary.language.ardhamgadh_prkrit=Ardham?gadh? Pr?krit +controlledvocabulary.language.ardhamagadhi_prakrit=Ardhamāgadhī Prākrit controlledvocabulary.language.are=Are controlledvocabulary.language.areba=Areba controlledvocabulary.language.arem=Arem -controlledvocabulary.language.arequipa-la_uni�n_quechua=Arequipa-La Uni�n Quechua +controlledvocabulary.language.arequipa-la_union_quechua=Arequipa-La Unión Quechua controlledvocabulary.language.argentine_sign_language=Argentine Sign Language controlledvocabulary.language.argobba=Argobba controlledvocabulary.language.arguni=Arguni controlledvocabulary.language.arhuaco=Arhuaco -controlledvocabulary.language.arh�=Arh� -controlledvocabulary.language.arh�=Arh� +controlledvocabulary.language.arha=Arhâ +controlledvocabulary.language.arho=Arhö controlledvocabulary.language.ari=Ari controlledvocabulary.language.aribwatsa=Aribwatsa controlledvocabulary.language.aribwaung=Aribwaung controlledvocabulary.language.arifama-miniafia=Arifama-Miniafia controlledvocabulary.language.arigidi=Arigidi -controlledvocabulary.language.arikap�=Arikap� +controlledvocabulary.language.arikapu=Arikapú controlledvocabulary.language.arikara=Arikara controlledvocabulary.language.arikem=Arikem controlledvocabulary.language.arin=Arin @@ -678,8 +677,8 @@ controlledvocabulary.language.aruamu=Aruamu controlledvocabulary.language.aruek=Aruek controlledvocabulary.language.aruop=Aruop controlledvocabulary.language.arutani=Arutani -controlledvocabulary.language.aru�_(amazonas_state)=Aru� (Amazonas State) -controlledvocabulary.language.aru�_(rodonia_state)=Aru� (Rodonia State) +controlledvocabulary.language.arua_(amazonas_state)=Aruá (Amazonas State) +controlledvocabulary.language.arua_(rodonia_state)=Aruá (Rodonia State) controlledvocabulary.language.arvanitika_albanian=Arvanitika Albanian controlledvocabulary.language.as=As controlledvocabulary.language.asaro'o=Asaro'o @@ -687,9 +686,9 @@ controlledvocabulary.language.ashe=Ashe controlledvocabulary.language.ashkun=Ashkun controlledvocabulary.language.asho_chin=Asho Chin controlledvocabulary.language.ashtiani=Ashtiani -controlledvocabulary.language.ash�ninka=Ash�ninka -controlledvocabulary.language.ash�ninka_pajonal=Ash�ninka Pajonal -controlledvocabulary.language.ash�ninka_peren�=Ash�ninka Peren� +controlledvocabulary.language.ashaninka=Asháninka +controlledvocabulary.language.asheninka_pajonal=Ashéninka Pajonal +controlledvocabulary.language.asheninka_perene=Ashéninka Perené controlledvocabulary.language.asilulu=Asilulu controlledvocabulary.language.askopan=Askopan controlledvocabulary.language.asoa=Asoa @@ -702,13 +701,13 @@ controlledvocabulary.language.asu_(nigeria)=Asu (Nigeria) controlledvocabulary.language.asu_(tanzania)=Asu (Tanzania) controlledvocabulary.language.asue_awyu=Asue Awyu controlledvocabulary.language.asumboa=Asumboa -controlledvocabulary.language.asunci�n_mixtepec_zapotec=Asunci�n Mixtepec Zapotec +controlledvocabulary.language.asuncion_mixtepec_zapotec=Asunción Mixtepec Zapotec controlledvocabulary.language.asuri=Asuri controlledvocabulary.language.ata=Ata controlledvocabulary.language.ata_manobo=Ata Manobo controlledvocabulary.language.atakapa=Atakapa controlledvocabulary.language.atampaya=Atampaya -controlledvocabulary.language.atatl�huca_mixtec=Atatl�huca Mixtec +controlledvocabulary.language.atatlahuca_mixtec=Atatláhuca Mixtec controlledvocabulary.language.atauran=Atauran controlledvocabulary.language.atayal=Atayal controlledvocabulary.language.atemble=Atemble @@ -723,11 +722,11 @@ controlledvocabulary.language.atsahuaca=Atsahuaca controlledvocabulary.language.atsam=Atsam controlledvocabulary.language.atsugewi=Atsugewi controlledvocabulary.language.attapady_kurumba=Attapady Kurumba -controlledvocabulary.language.atti�=Atti� +controlledvocabulary.language.attie=Attié controlledvocabulary.language.atzingo_matlatzinca=Atzingo Matlatzinca controlledvocabulary.language.au=Au controlledvocabulary.language.aulua=Aulua -controlledvocabulary.language.aur�=Aur� +controlledvocabulary.language.aura=Aurá controlledvocabulary.language.aushi=Aushi controlledvocabulary.language.aushiri=Aushiri controlledvocabulary.language.auslan=Auslan @@ -743,7 +742,7 @@ controlledvocabulary.language.avau=Avau controlledvocabulary.language.avestan=Avestan controlledvocabulary.language.avikam=Avikam controlledvocabulary.language.avokaya=Avokaya -controlledvocabulary.language.av�-canoeiro=Av�-Canoeiro +controlledvocabulary.language.ava-canoeiro=Avá-Canoeiro controlledvocabulary.language.awa_(china)=Awa (China) controlledvocabulary.language.awa_(papua_new_guinea)=Awa (Papua New Guinea) controlledvocabulary.language.awa-cuaiquer=Awa-Cuaiquer @@ -756,7 +755,7 @@ controlledvocabulary.language.awara=Awara controlledvocabulary.language.awbono=Awbono controlledvocabulary.language.aweer=Aweer controlledvocabulary.language.awera=Awera -controlledvocabulary.language.awet�=Awet� +controlledvocabulary.language.aweti=Awetí controlledvocabulary.language.awing=Awing controlledvocabulary.language.awiyaana=Awiyaana controlledvocabulary.language.awjilah=Awjilah @@ -786,7 +785,7 @@ controlledvocabulary.language.ayutla_mixtec=Ayutla Mixtec controlledvocabulary.language.azerbaijani=Azerbaijani controlledvocabulary.language.azha=Azha controlledvocabulary.language.azhe=Azhe -controlledvocabulary.language.azoy�_me'phaa=Azoy� Me'phaa +controlledvocabulary.language.azoyu_me'phaa=Azoyú Me'phaa controlledvocabulary.language.baan=Baan controlledvocabulary.language.baangi=Baangi controlledvocabulary.language.baatonum=Baatonum @@ -821,7 +820,7 @@ controlledvocabulary.language.baga_koga=Baga Koga controlledvocabulary.language.baga_manduri=Baga Manduri controlledvocabulary.language.baga_pokur=Baga Pokur controlledvocabulary.language.baga_sitemu=Baga Sitemu -controlledvocabulary.language.baga_soban�=Baga Soban� +controlledvocabulary.language.baga_sobane=Baga Sobané controlledvocabulary.language.bagheli=Bagheli controlledvocabulary.language.bagirmi=Bagirmi controlledvocabulary.language.bagirmi_fulfulde=Bagirmi Fulfulde @@ -845,7 +844,7 @@ controlledvocabulary.language.baikeno=Baikeno controlledvocabulary.language.baima=Baima controlledvocabulary.language.baimak=Baimak controlledvocabulary.language.bainouk-gunyaamolo=Bainouk-Gunyaamolo -controlledvocabulary.language.bainouk-gunyu�o=Bainouk-Gunyu�o +controlledvocabulary.language.bainouk-gunyuno=Bainouk-Gunyuño controlledvocabulary.language.bainouk-samik=Bainouk-Samik controlledvocabulary.language.baiso=Baiso controlledvocabulary.language.baissa_fali=Baissa Fali @@ -854,7 +853,7 @@ controlledvocabulary.language.bajelani=Bajelani controlledvocabulary.language.bajjika=Bajjika controlledvocabulary.language.baka_(cameroon)=Baka (Cameroon) controlledvocabulary.language.baka_(south_sudan)=Baka (South Sudan) -controlledvocabulary.language.bakair�=Bakair� +controlledvocabulary.language.bakairi=Bakairí controlledvocabulary.language.bakaka=Bakaka controlledvocabulary.language.bakhtiari=Bakhtiari controlledvocabulary.language.baki=Baki @@ -862,7 +861,7 @@ controlledvocabulary.language.bakoko=Bakoko controlledvocabulary.language.bakole=Bakole controlledvocabulary.language.bakpinka=Bakpinka controlledvocabulary.language.bakumpai=Bakumpai -controlledvocabulary.language.bakw�=Bakw� +controlledvocabulary.language.bakwe=Bakwé controlledvocabulary.language.balaesang=Balaesang controlledvocabulary.language.balaibalan=Balaibalan controlledvocabulary.language.balangao=Balangao @@ -904,8 +903,8 @@ controlledvocabulary.language.banda_(indonesia)=Banda (Indonesia) controlledvocabulary.language.banda_malay=Banda Malay controlledvocabulary.language.banda-bambari=Banda-Bambari controlledvocabulary.language.banda-banda=Banda-Banda -controlledvocabulary.language.banda-mbr�s=Banda-Mbr�s -controlledvocabulary.language.banda-nd�l�=Banda-Nd�l� +controlledvocabulary.language.banda-mbres=Banda-Mbrès +controlledvocabulary.language.banda-ndele=Banda-Ndélé controlledvocabulary.language.banda-yangere=Banda-Yangere controlledvocabulary.language.bandi=Bandi controlledvocabulary.language.bandial=Bandial @@ -934,7 +933,7 @@ controlledvocabulary.language.bantayanon=Bantayanon controlledvocabulary.language.bantik=Bantik controlledvocabulary.language.bantoanon=Bantoanon controlledvocabulary.language.banyjima=Banyjima -controlledvocabulary.language.baoul�=Baoul� +controlledvocabulary.language.baoule=Baoulé controlledvocabulary.language.bara_malagasy=Bara Malagasy controlledvocabulary.language.baraamu=Baraamu controlledvocabulary.language.barababaraba=Barababaraba @@ -948,7 +947,7 @@ controlledvocabulary.language.barapasi=Barapasi controlledvocabulary.language.baras=Baras controlledvocabulary.language.barasana-eduria=Barasana-Eduria controlledvocabulary.language.barbaram=Barbaram -controlledvocabulary.language.barbare�o=Barbare�o +controlledvocabulary.language.barbareno=Barbareño controlledvocabulary.language.barclayville_grebo=Barclayville Grebo controlledvocabulary.language.bardi=Bardi controlledvocabulary.language.barein=Barein @@ -966,8 +965,7 @@ controlledvocabulary.language.baruga=Baruga controlledvocabulary.language.baruya=Baruya controlledvocabulary.language.barwe=Barwe controlledvocabulary.language.barzani_jewish_neo-aramaic=Barzani Jewish Neo-Aramaic -controlledvocabulary.language.bar�=Bar� -controlledvocabulary.language.bar�=Bar� +controlledvocabulary.language.bare=Baré controlledvocabulary.language.basa_(cameroon)=Basa (Cameroon) controlledvocabulary.language.basa_(nigeria)=Basa (Nigeria) controlledvocabulary.language.basa-gumna=Basa-Gumna @@ -1084,7 +1082,7 @@ controlledvocabulary.language.betaf=Betaf controlledvocabulary.language.betawi=Betawi controlledvocabulary.language.bete=Bete controlledvocabulary.language.bete-bendi=Bete-Bendi -controlledvocabulary.language.beti_(c�te_d'ivoire)=Beti (C�te d'Ivoire) +controlledvocabulary.language.beti_(cote_d'ivoire)=Beti (Côte d'Ivoire) controlledvocabulary.language.betta_kurumba=Betta Kurumba controlledvocabulary.language.bezhta=Bezhta controlledvocabulary.language.bhadrawahi=Bhadrawahi @@ -1260,7 +1258,7 @@ controlledvocabulary.language.boro_(ethiopia)=Boro (Ethiopia) controlledvocabulary.language.boro_(ghana)=Boro (Ghana) controlledvocabulary.language.borong=Borong controlledvocabulary.language.boruca=Boruca -controlledvocabulary.language.bor�ro=Bor�ro +controlledvocabulary.language.bororo=Borôro controlledvocabulary.language.boselewa=Boselewa controlledvocabulary.language.bosngun=Bosngun controlledvocabulary.language.bosnian=Bosnian @@ -1403,11 +1401,11 @@ controlledvocabulary.language.bwile=Bwile controlledvocabulary.language.bwisi=Bwisi controlledvocabulary.language.byangsi=Byangsi controlledvocabulary.language.byep=Byep -controlledvocabulary.language.b�di_kanum=B�di Kanum +controlledvocabulary.language.badi_kanum=Bädi Kanum controlledvocabulary.language.c'lela=C'Lela controlledvocabulary.language.caac=Caac -controlledvocabulary.language.cabiyar�=Cabiyar� -controlledvocabulary.language.cab�car=Cab�car +controlledvocabulary.language.cabiyari=Cabiyarí +controlledvocabulary.language.cabecar=Cabécar controlledvocabulary.language.cacaloxtepec_mixtec=Cacaloxtepec Mixtec controlledvocabulary.language.cacaopera=Cacaopera controlledvocabulary.language.cacgia_roglai=Cacgia Roglai @@ -1421,20 +1419,20 @@ controlledvocabulary.language.cajatambo_north_lima_quechua=Cajatambo North Lima controlledvocabulary.language.cajonos_zapotec=Cajonos Zapotec controlledvocabulary.language.cajun_french=Cajun French controlledvocabulary.language.caka=Caka -controlledvocabulary.language.cakchiquel-quich�_mixed_language=Cakchiquel-Quich� Mixed Language +controlledvocabulary.language.cakchiquel-quiche_mixed_language=Cakchiquel-Quiché Mixed Language controlledvocabulary.language.cakfem-mushere=Cakfem-Mushere controlledvocabulary.language.calamian_tagbanwa=Calamian Tagbanwa -controlledvocabulary.language.calder�n_highland_quichua=Calder�n Highland Quichua +controlledvocabulary.language.calderon_highland_quichua=Calderón Highland Quichua controlledvocabulary.language.callawalla=Callawalla controlledvocabulary.language.caluyanun=Caluyanun -controlledvocabulary.language.cal�=Cal� +controlledvocabulary.language.calo=Caló controlledvocabulary.language.cambodian_sign_language=Cambodian Sign Language controlledvocabulary.language.cameroon_mambila=Cameroon Mambila controlledvocabulary.language.cameroon_pidgin=Cameroon Pidgin controlledvocabulary.language.camling=Camling controlledvocabulary.language.campalagian=Campalagian controlledvocabulary.language.campidanese_sardinian=Campidanese Sardinian -controlledvocabulary.language.cams�=Cams� +controlledvocabulary.language.camsa=Camsá controlledvocabulary.language.camtho=Camtho controlledvocabulary.language.camunic=Camunic controlledvocabulary.language.candoshi-shapra=Candoshi-Shapra @@ -1462,20 +1460,21 @@ controlledvocabulary.language.carrier=Carrier controlledvocabulary.language.cashibo-cacataibo=Cashibo-Cacataibo controlledvocabulary.language.cashinahua=Cashinahua controlledvocabulary.language.casiguran_dumagat_agta=Casiguran Dumagat Agta +controlledvocabulary.language.spanish,_castilian=Castilian, Spanish controlledvocabulary.language.casuarina_coast_asmat=Casuarina Coast Asmat controlledvocabulary.language.catalan_sign_language=Catalan Sign Language controlledvocabulary.language.catalan,_valencian=Catalan, Valencian controlledvocabulary.language.catawba=Catawba -controlledvocabulary.language.cavine�a=Cavine�a +controlledvocabulary.language.cavinena=Cavineña controlledvocabulary.language.cayubaba=Cayubaba controlledvocabulary.language.cayuga=Cayuga controlledvocabulary.language.cayuse=Cayuse -controlledvocabulary.language.ca�ar_highland_quichua=Ca�ar Highland Quichua -controlledvocabulary.language.cahungwarya=Ca?hungwa?rya? +controlledvocabulary.language.canar_highland_quichua=Cañar Highland Quichua +controlledvocabulary.language.cahungwarya=Ca̱hungwa̱rya̱ controlledvocabulary.language.cebaara_senoufo=Cebaara Senoufo controlledvocabulary.language.cebuano=Cebuano controlledvocabulary.language.celtiberian=Celtiberian -controlledvocabulary.language.cemuh�=Cemuh� +controlledvocabulary.language.cemuhi=Cemuhî controlledvocabulary.language.cen=Cen controlledvocabulary.language.central_asmat=Central Asmat controlledvocabulary.language.central_atlas_tamazight=Central Atlas Tamazight @@ -1517,7 +1516,7 @@ controlledvocabulary.language.central_tarahumara=Central Tarahumara controlledvocabulary.language.central_tunebo=Central Tunebo controlledvocabulary.language.central_yupik=Central Yupik controlledvocabulary.language.central-eastern_niger_fulfulde=Central-Eastern Niger Fulfulde -controlledvocabulary.language.cent��m=Cent��m +controlledvocabulary.language.centuum=Centúúm controlledvocabulary.language.cerma=Cerma controlledvocabulary.language.cha'ari=Cha'ari controlledvocabulary.language.chabu=Chabu @@ -1545,7 +1544,7 @@ controlledvocabulary.language.chang_naga=Chang Naga controlledvocabulary.language.changriwa=Changriwa controlledvocabulary.language.changthang=Changthang controlledvocabulary.language.chantyal=Chantyal -controlledvocabulary.language.chan�=Chan� +controlledvocabulary.language.chane=Chané controlledvocabulary.language.chara=Chara controlledvocabulary.language.chaudangsi=Chaudangsi controlledvocabulary.language.chaura=Chaura @@ -1581,7 +1580,7 @@ controlledvocabulary.language.chichimeca-jonaz=Chichimeca-Jonaz controlledvocabulary.language.chickasaw=Chickasaw controlledvocabulary.language.chicomuceltec=Chicomuceltec controlledvocabulary.language.chiga=Chiga -controlledvocabulary.language.chigmecatitl�n_mixtec=Chigmecatitl�n Mixtec +controlledvocabulary.language.chigmecatitlan_mixtec=Chigmecatitlán Mixtec controlledvocabulary.language.chilcotin=Chilcotin controlledvocabulary.language.chilean_sign_language=Chilean Sign Language controlledvocabulary.language.chilisso=Chilisso @@ -1602,10 +1601,10 @@ controlledvocabulary.language.chinook_jargon=Chinook jargon controlledvocabulary.language.chipaya=Chipaya controlledvocabulary.language.chipewyan=Chipewyan controlledvocabulary.language.chippewa=Chippewa -controlledvocabulary.language.chiquihuitl�n_mazatec=Chiquihuitl�n Mazatec +controlledvocabulary.language.chiquihuitlan_mazatec=Chiquihuitlán Mazatec controlledvocabulary.language.chiquitano=Chiquitano -controlledvocabulary.language.chiqui�n_ancash_quechua=Chiqui�n Ancash Quechua -controlledvocabulary.language.chirip�=Chirip� +controlledvocabulary.language.chiquian_ancash_quechua=Chiquián Ancash Quechua +controlledvocabulary.language.chiripa=Chiripá controlledvocabulary.language.chiru=Chiru controlledvocabulary.language.chitimacha=Chitimacha controlledvocabulary.language.chitkuli_kinnauri=Chitkuli Kinnauri @@ -1619,13 +1618,13 @@ controlledvocabulary.language.chodri=Chodri controlledvocabulary.language.chokri_naga=Chokri Naga controlledvocabulary.language.chokwe=Chokwe controlledvocabulary.language.chol=Chol -controlledvocabulary.language.chol�n=Chol�n +controlledvocabulary.language.cholon=Cholón controlledvocabulary.language.chong=Chong controlledvocabulary.language.choni=Choni controlledvocabulary.language.chonyi-dzihana-kauma=Chonyi-Dzihana-Kauma controlledvocabulary.language.chopi=Chopi controlledvocabulary.language.chorasmian=Chorasmian -controlledvocabulary.language.chort�=Chort� +controlledvocabulary.language.chorti=Chortí controlledvocabulary.language.chothe_naga=Chothe Naga controlledvocabulary.language.chrau=Chrau controlledvocabulary.language.chru=Chru @@ -1640,12 +1639,13 @@ controlledvocabulary.language.chulym=Chulym controlledvocabulary.language.chumburung=Chumburung controlledvocabulary.language.chung=Chung controlledvocabulary.language.churahi=Churahi +controlledvocabulary.language.old_church_slavonic=Church Slavonic, Church Slavic, Old Church Slavonic, Old Bulgarian controlledvocabulary.language.chut=Chut controlledvocabulary.language.chuukese=Chuukese controlledvocabulary.language.chuvantsy=Chuvantsy controlledvocabulary.language.chuvash=Chuvash controlledvocabulary.language.chuwabu=Chuwabu -controlledvocabulary.language.ch�cobo=Ch�cobo +controlledvocabulary.language.chacobo=Chácobo controlledvocabulary.language.ci_gbe=Ci Gbe controlledvocabulary.language.cia-cia=Cia-Cia controlledvocabulary.language.cibak=Cibak @@ -1673,15 +1673,15 @@ controlledvocabulary.language.coast_miwok=Coast Miwok controlledvocabulary.language.coastal_konjo=Coastal Konjo controlledvocabulary.language.coatecas_altas_zapotec=Coatecas Altas Zapotec controlledvocabulary.language.coatepec_nahuatl=Coatepec Nahuatl -controlledvocabulary.language.coatl�n_mixe=Coatl�n Mixe -controlledvocabulary.language.coatl�n_zapotec=Coatl�n Zapotec +controlledvocabulary.language.coatlan_mixe=Coatlán Mixe +controlledvocabulary.language.coatlan_zapotec=Coatlán Zapotec controlledvocabulary.language.coatzospan_mixtec=Coatzospan Mixtec controlledvocabulary.language.cocama-cocamilla=Cocama-Cocamilla controlledvocabulary.language.cochimi=Cochimi controlledvocabulary.language.cocopa=Cocopa controlledvocabulary.language.cocos_islands_malay=Cocos Islands Malay controlledvocabulary.language.coeur_d'alene=Coeur d'Alene -controlledvocabulary.language.cof�n=Cof�n +controlledvocabulary.language.cofan=Cofán controlledvocabulary.language.cogui=Cogui controlledvocabulary.language.col=Col controlledvocabulary.language.colombian_sign_language=Colombian Sign Language @@ -1696,7 +1696,7 @@ controlledvocabulary.language.comox=Comox controlledvocabulary.language.con=Con controlledvocabulary.language.congo_swahili=Congo Swahili controlledvocabulary.language.coos=Coos -controlledvocabulary.language.copainal�_zoque=Copainal� Zoque +controlledvocabulary.language.copainala_zoque=Copainalá Zoque controlledvocabulary.language.copala_triqui=Copala Triqui controlledvocabulary.language.coptic=Coptic controlledvocabulary.language.coquille=Coquille @@ -1714,10 +1714,9 @@ controlledvocabulary.language.cree=Cree controlledvocabulary.language.creek=Creek controlledvocabulary.language.crimean_tatar=Crimean Tatar controlledvocabulary.language.croatia_sign_language=Croatia Sign Language -controlledvocabulary.language.croatian=Croatian controlledvocabulary.language.cross_river_mbembe=Cross River Mbembe controlledvocabulary.language.crow=Crow -controlledvocabulary.language.cruze�o=Cruze�o +controlledvocabulary.language.cruzeno=Cruzeño controlledvocabulary.language.cua=Cua controlledvocabulary.language.cuba_sign_language=Cuba Sign Language controlledvocabulary.language.cubeo=Cubeo @@ -1728,7 +1727,7 @@ controlledvocabulary.language.cumanagoto=Cumanagoto controlledvocabulary.language.cumbric=Cumbric controlledvocabulary.language.cun=Cun controlledvocabulary.language.cuneiform_luwian=Cuneiform Luwian -controlledvocabulary.language.cupe�o=Cupe�o +controlledvocabulary.language.cupeno=Cupeño controlledvocabulary.language.curonian=Curonian controlledvocabulary.language.curripaco=Curripaco controlledvocabulary.language.cusco_quechua=Cusco Quechua @@ -1740,13 +1739,13 @@ controlledvocabulary.language.cwi_bwamu=Cwi Bwamu controlledvocabulary.language.cypriot_arabic=Cypriot Arabic controlledvocabulary.language.czech=Czech controlledvocabulary.language.czech_sign_language=Czech Sign Language -controlledvocabulary.language.c��ng=C��ng +controlledvocabulary.language.coong=Côông controlledvocabulary.language.da'a_kaili=Da'a Kaili controlledvocabulary.language.daai_chin=Daai Chin controlledvocabulary.language.daakaka=Daakaka controlledvocabulary.language.daantanai'=Daantanai' controlledvocabulary.language.daasanach=Daasanach -controlledvocabulary.language.daatsiin=Daats?i?in +controlledvocabulary.language.daatsʼiin=Daatsʼíin controlledvocabulary.language.daba=Daba controlledvocabulary.language.dabarre=Dabarre controlledvocabulary.language.dabe=Dabe @@ -1771,7 +1770,7 @@ controlledvocabulary.language.dakota=Dakota controlledvocabulary.language.dakpakha=Dakpakha controlledvocabulary.language.dalabon=Dalabon controlledvocabulary.language.dalmatian=Dalmatian -controlledvocabulary.language.daloa_b�t�=Daloa B�t� +controlledvocabulary.language.daloa_bete=Daloa Bété controlledvocabulary.language.dama=Dama controlledvocabulary.language.damakawa=Damakawa controlledvocabulary.language.damal=Damal @@ -1782,7 +1781,7 @@ controlledvocabulary.language.dan=Dan controlledvocabulary.language.danaru=Danaru controlledvocabulary.language.danau=Danau controlledvocabulary.language.dandami_maria=Dandami Maria -controlledvocabulary.language.dangal�at=Dangal�at +controlledvocabulary.language.dangaleat=Dangaléat controlledvocabulary.language.dangaura_tharu=Dangaura Tharu controlledvocabulary.language.danish=Danish controlledvocabulary.language.danish_sign_language=Danish Sign Language @@ -1837,7 +1836,7 @@ controlledvocabulary.language.dengese=Dengese controlledvocabulary.language.dengka=Dengka controlledvocabulary.language.deno=Deno controlledvocabulary.language.denya=Denya -controlledvocabulary.language.den�=Den� +controlledvocabulary.language.deni=Dení controlledvocabulary.language.deori=Deori controlledvocabulary.language.dera_(indonesia)=Dera (Indonesia) controlledvocabulary.language.dera_(nigeria)=Dera (Nigeria) @@ -1918,7 +1917,7 @@ controlledvocabulary.language.doe=Doe controlledvocabulary.language.doga=Doga controlledvocabulary.language.doghoro=Doghoro controlledvocabulary.language.dogoso=Dogoso -controlledvocabulary.language.dogos�=Dogos� +controlledvocabulary.language.dogose=Dogosé controlledvocabulary.language.dogri_(individual_language)=Dogri (individual language) controlledvocabulary.language.dogri_(macrolanguage)=Dogri (macrolanguage) controlledvocabulary.language.dogul_dom_dogon=Dogul Dom Dogon @@ -1993,7 +1992,7 @@ controlledvocabulary.language.duupa=Duupa controlledvocabulary.language.duvle=Duvle controlledvocabulary.language.duwai=Duwai controlledvocabulary.language.duwet=Duwet -controlledvocabulary.language.duya=Du?ya +controlledvocabulary.language.duya=Dũya controlledvocabulary.language.dwang=Dwang controlledvocabulary.language.dyaberdyaber=Dyaberdyaber controlledvocabulary.language.dyan=Dyan @@ -2007,11 +2006,11 @@ controlledvocabulary.language.dzalakha=Dzalakha controlledvocabulary.language.dzando=Dzando controlledvocabulary.language.dzao_min=Dzao Min controlledvocabulary.language.dzongkha=Dzongkha -controlledvocabulary.language.dz��ngoo=Dz��ngoo -controlledvocabulary.language.d�w=D�w +controlledvocabulary.language.dzuungoo=Dzùùngoo +controlledvocabulary.language.daw=Dâw controlledvocabulary.language.e=E controlledvocabulary.language.e'ma_buyang=E'ma Buyang -controlledvocabulary.language.e'�apa_woromaipu=E'�apa Woromaipu +controlledvocabulary.language.e'napa_woromaipu=E'ñapa Woromaipu controlledvocabulary.language.early_tripuri=Early Tripuri controlledvocabulary.language.east_ambae=East Ambae controlledvocabulary.language.east_berawan=East Berawan @@ -2026,10 +2025,10 @@ controlledvocabulary.language.east_tarangan=East Tarangan controlledvocabulary.language.east_yugur=East Yugur controlledvocabulary.language.eastern_abnaki=Eastern Abnaki controlledvocabulary.language.eastern_acipa=Eastern Acipa -controlledvocabulary.language.eastern_apur�mac_quechua=Eastern Apur�mac Quechua +controlledvocabulary.language.eastern_apurimac_quechua=Eastern Apurímac Quechua controlledvocabulary.language.eastern_arrernte=Eastern Arrernte controlledvocabulary.language.eastern_balochi=Eastern Balochi -controlledvocabulary.language.eastern_bolivian_guaran�=Eastern Bolivian Guaran� +controlledvocabulary.language.eastern_bolivian_guarani=Eastern Bolivian Guaraní controlledvocabulary.language.eastern_bontok=Eastern Bontok controlledvocabulary.language.eastern_bru=Eastern Bru controlledvocabulary.language.eastern_canadian_inuktitut=Eastern Canadian Inuktitut @@ -2075,7 +2074,7 @@ controlledvocabulary.language.eastern_xwla_gbe=Eastern Xwla Gbe controlledvocabulary.language.eastern_yiddish=Eastern Yiddish controlledvocabulary.language.ebira=Ebira controlledvocabulary.language.eblan=Eblan -controlledvocabulary.language.ebri�=Ebri� +controlledvocabulary.language.ebrie=Ebrié controlledvocabulary.language.ebughu=Ebughu controlledvocabulary.language.ecuadorian_sign_language=Ecuadorian Sign Language controlledvocabulary.language.ede_cabe=Ede Cabe @@ -2125,17 +2124,17 @@ controlledvocabulary.language.emae=Emae controlledvocabulary.language.emai-iuleha-ora=Emai-Iuleha-Ora controlledvocabulary.language.eman=Eman controlledvocabulary.language.embaloh=Embaloh -controlledvocabulary.language.ember�-baud�=Ember�-Baud� -controlledvocabulary.language.ember�-cat�o=Ember�-Cat�o -controlledvocabulary.language.ember�-cham�=Ember�-Cham� -controlledvocabulary.language.ember�-tad�=Ember�-Tad� +controlledvocabulary.language.embera-baudo=Emberá-Baudó +controlledvocabulary.language.embera-catio=Emberá-Catío +controlledvocabulary.language.embera-chami=Emberá-Chamí +controlledvocabulary.language.embera-tado=Emberá-Tadó controlledvocabulary.language.embu=Embu controlledvocabulary.language.emerillon=Emerillon controlledvocabulary.language.emilian=Emilian controlledvocabulary.language.emplawas=Emplawas controlledvocabulary.language.emumu=Emumu controlledvocabulary.language.en=En -controlledvocabulary.language.enawen�-naw�=Enawen�-Naw� +controlledvocabulary.language.enawene-nawe=Enawené-Nawé controlledvocabulary.language.ende=Ende controlledvocabulary.language.enga=Enga controlledvocabulary.language.engdewu=Engdewu @@ -2171,7 +2170,7 @@ controlledvocabulary.language.esimbi=Esimbi controlledvocabulary.language.eskayan=Eskayan controlledvocabulary.language.esperanto=Esperanto controlledvocabulary.language.esselen=Esselen -controlledvocabulary.language.estado_de_m�xico_otomi=Estado de M�xico Otomi +controlledvocabulary.language.estado_de_mexico_otomi=Estado de México Otomi controlledvocabulary.language.estonian=Estonian controlledvocabulary.language.estonian_sign_language=Estonian Sign Language controlledvocabulary.language.esuma=Esuma @@ -2230,7 +2229,7 @@ controlledvocabulary.language.feroge=Feroge controlledvocabulary.language.fiji_hindi=Fiji Hindi controlledvocabulary.language.fijian=Fijian controlledvocabulary.language.filipino=Filipino -controlledvocabulary.language.filomena_mata-coahuitl�n_totonac=Filomena Mata-Coahuitl�n Totonac +controlledvocabulary.language.filomena_mata-coahuitlan_totonac=Filomena Mata-Coahuitlán Totonac controlledvocabulary.language.finland-swedish_sign_language=Finland-Swedish Sign Language controlledvocabulary.language.finnish=Finnish controlledvocabulary.language.finnish_sign_language=Finnish Sign Language @@ -2253,14 +2252,14 @@ controlledvocabulary.language.fordata=Fordata controlledvocabulary.language.fore=Fore controlledvocabulary.language.forest_enets=Forest Enets controlledvocabulary.language.fortsenal=Fortsenal -controlledvocabulary.language.francisco_le�n_zoque=Francisco Le�n Zoque +controlledvocabulary.language.francisco_leon_zoque=Francisco León Zoque controlledvocabulary.language.frankish=Frankish controlledvocabulary.language.french=French controlledvocabulary.language.french_sign_language=French Sign Language controlledvocabulary.language.friulian=Friulian controlledvocabulary.language.fula,_fulah=Fula, Fulah controlledvocabulary.language.fuliiru=Fuliiru -controlledvocabulary.language.fulni�=Fulni� +controlledvocabulary.language.fulnio=Fulniô controlledvocabulary.language.fum=Fum controlledvocabulary.language.fungwa=Fungwa controlledvocabulary.language.fur=Fur @@ -2268,7 +2267,7 @@ controlledvocabulary.language.furu=Furu controlledvocabulary.language.futuna-aniwa=Futuna-Aniwa controlledvocabulary.language.fuyug=Fuyug controlledvocabulary.language.fwe=Fwe -controlledvocabulary.language.fw�i=Fw�i +controlledvocabulary.language.fwai=Fwâi controlledvocabulary.language.fyam=Fyam controlledvocabulary.language.fyer=Fyer controlledvocabulary.language.ga=Ga @@ -2278,7 +2277,7 @@ controlledvocabulary.language.gaa=Gaa controlledvocabulary.language.gaam=Gaam controlledvocabulary.language.gabi-gabi=Gabi-Gabi controlledvocabulary.language.gabri=Gabri -controlledvocabulary.language.gabrielino-fernande�o=Gabrielino-Fernande�o +controlledvocabulary.language.gabrielino-fernandeno=Gabrielino-Fernandeño controlledvocabulary.language.gadang=Gadang controlledvocabulary.language.gaddang=Gaddang controlledvocabulary.language.gaddi=Gaddi @@ -2290,7 +2289,7 @@ controlledvocabulary.language.gaelic,_scottish_gaelic=Gaelic, Scottish Gaelic controlledvocabulary.language.gafat=Gafat controlledvocabulary.language.gagadu=Gagadu controlledvocabulary.language.gagauz=Gagauz -controlledvocabulary.language.gagnoa_b�t�=Gagnoa B�t� +controlledvocabulary.language.gagnoa_bete=Gagnoa Bété controlledvocabulary.language.gagu=Gagu controlledvocabulary.language.gahri=Gahri controlledvocabulary.language.gaikundi=Gaikundi @@ -2343,14 +2342,14 @@ controlledvocabulary.language.garza=Garza controlledvocabulary.language.gata'=Gata' controlledvocabulary.language.gavak=Gavak controlledvocabulary.language.gavar=Gavar -controlledvocabulary.language.gavi�o_do_jiparan�=Gavi�o Do Jiparan� +controlledvocabulary.language.gaviao_do_jiparana=Gavião Do Jiparaná controlledvocabulary.language.gawar-bati=Gawar-Bati controlledvocabulary.language.gawri=Gawri controlledvocabulary.language.gawwada=Gawwada controlledvocabulary.language.gayil=Gayil controlledvocabulary.language.gayo=Gayo controlledvocabulary.language.gazi=Gazi -controlledvocabulary.language.gaogbo=Ga?ogbo +controlledvocabulary.language.gaɓogbo=Gaɓogbo controlledvocabulary.language.gbagyi=Gbagyi controlledvocabulary.language.gbanu=Gbanu controlledvocabulary.language.gbanziri=Gbanziri @@ -2387,7 +2386,7 @@ controlledvocabulary.language.german=German controlledvocabulary.language.german_sign_language=German Sign Language controlledvocabulary.language.geruma=Geruma controlledvocabulary.language.geser-gorom=Geser-Gorom -controlledvocabulary.language.ghadam�s=Ghadam�s +controlledvocabulary.language.ghadames=Ghadamès controlledvocabulary.language.ghanaian_pidgin_english=Ghanaian Pidgin English controlledvocabulary.language.ghanaian_sign_language=Ghanaian Sign Language controlledvocabulary.language.ghandruk_sign_language=Ghandruk Sign Language @@ -2398,7 +2397,7 @@ controlledvocabulary.language.gheg_albanian=Gheg Albanian controlledvocabulary.language.ghera=Ghera controlledvocabulary.language.ghodoberi=Ghodoberi controlledvocabulary.language.ghomara=Ghomara -controlledvocabulary.language.ghom�l�'=Ghom�l�' +controlledvocabulary.language.ghomala'=Ghomálá' controlledvocabulary.language.ghotuo=Ghotuo controlledvocabulary.language.ghulfan=Ghulfan controlledvocabulary.language.giangan=Giangan @@ -2433,7 +2432,7 @@ controlledvocabulary.language.goan_konkani=Goan Konkani controlledvocabulary.language.goaria=Goaria controlledvocabulary.language.gobasi=Gobasi controlledvocabulary.language.gobu=Gobu -controlledvocabulary.language.godi�=Godi� +controlledvocabulary.language.godie=Godié controlledvocabulary.language.godwari=Godwari controlledvocabulary.language.goemai=Goemai controlledvocabulary.language.gofa=Gofa @@ -2458,7 +2457,7 @@ controlledvocabulary.language.gorovu=Gorovu controlledvocabulary.language.gorowa=Gorowa controlledvocabulary.language.gothic=Gothic controlledvocabulary.language.goundo=Goundo -controlledvocabulary.language.gourmanch�ma=Gourmanch�ma +controlledvocabulary.language.gourmanchema=Gourmanchéma controlledvocabulary.language.gowlan=Gowlan controlledvocabulary.language.gowli=Gowli controlledvocabulary.language.gowro=Gowro @@ -2466,7 +2465,6 @@ controlledvocabulary.language.gozarkhani=Gozarkhani controlledvocabulary.language.grangali=Grangali controlledvocabulary.language.grass_koiari=Grass Koiari controlledvocabulary.language.grebo=Grebo -controlledvocabulary.language.greek_(modern)=Greek (modern) controlledvocabulary.language.greek_sign_language=Greek Sign Language controlledvocabulary.language.green_gelao=Green Gelao controlledvocabulary.language.greenlandic,_kalaallisut=Greenlandic, Kalaallisut @@ -2478,19 +2476,19 @@ controlledvocabulary.language.gros_ventre=Gros Ventre controlledvocabulary.language.gua=Gua controlledvocabulary.language.guadeloupean_creole_french=Guadeloupean Creole French controlledvocabulary.language.guahibo=Guahibo -controlledvocabulary.language.guajaj�ra=Guajaj�ra -controlledvocabulary.language.guaj�=Guaj� +controlledvocabulary.language.guajajara=Guajajára +controlledvocabulary.language.guaja=Guajá controlledvocabulary.language.guambiano=Guambiano controlledvocabulary.language.guana_(brazil)=Guana (Brazil) controlledvocabulary.language.guana_(paraguay)=Guana (Paraguay) controlledvocabulary.language.guanano=Guanano controlledvocabulary.language.guanche=Guanche controlledvocabulary.language.guanyinqiao=Guanyinqiao -controlledvocabulary.language.guaran�=Guaran� +controlledvocabulary.language.guarani=Guarani, Guaraní controlledvocabulary.language.guarayu=Guarayu controlledvocabulary.language.guarequena=Guarequena controlledvocabulary.language.guatemalan_sign_language=Guatemalan Sign Language -controlledvocabulary.language.guat�=Guat� +controlledvocabulary.language.guato=Guató controlledvocabulary.language.guayabero=Guayabero controlledvocabulary.language.gudang=Gudang controlledvocabulary.language.gudanji=Gudanji @@ -2507,7 +2505,7 @@ controlledvocabulary.language.gugubera=Gugubera controlledvocabulary.language.guhu-samane=Guhu-Samane controlledvocabulary.language.guianese_creole_french=Guianese Creole French controlledvocabulary.language.guibei_zhuang=Guibei Zhuang -controlledvocabulary.language.guiberoua_b�te=Guiberoua B�te +controlledvocabulary.language.guiberoua_bete=Guiberoua Béte controlledvocabulary.language.guibian_zhuang=Guibian Zhuang controlledvocabulary.language.guinea_kpelle=Guinea Kpelle controlledvocabulary.language.guinea-bissau_sign_language=Guinea-Bissau Sign Language @@ -2567,12 +2565,12 @@ controlledvocabulary.language.gwandara=Gwandara controlledvocabulary.language.gweda=Gweda controlledvocabulary.language.gweno=Gweno controlledvocabulary.language.gwere=Gwere -controlledvocabulary.language.gwichin=Gwich?in +controlledvocabulary.language.gwichʼin=Gwichʼin controlledvocabulary.language.gyalsumdo=Gyalsumdo controlledvocabulary.language.gyele=Gyele controlledvocabulary.language.gyem=Gyem -controlledvocabulary.language.g�il�_zapotec=G�il� Zapotec -controlledvocabulary.language.gndhr=G?ndh?r? +controlledvocabulary.language.guila_zapotec=Güilá Zapotec +controlledvocabulary.language.gandhari=Gāndhārī controlledvocabulary.language.ha=Ha controlledvocabulary.language.habu=Habu controlledvocabulary.language.hadiyya=Hadiyya @@ -2588,12 +2586,12 @@ controlledvocabulary.language.haiphong_sign_language=Haiphong Sign Language controlledvocabulary.language.haisla=Haisla controlledvocabulary.language.haitian_creole,_haitian=Haitian Creole, Haitian controlledvocabulary.language.haitian_vodoun_culture_language=Haitian Vodoun Culture Language -controlledvocabulary.language.haiom=Hai?om +controlledvocabulary.language.haiǁom=Haiǁom controlledvocabulary.language.haji=Haji controlledvocabulary.language.hajong=Hajong controlledvocabulary.language.hakha_chin=Hakha Chin controlledvocabulary.language.hakka_chinese=Hakka Chinese -controlledvocabulary.language.hak�=Hak� +controlledvocabulary.language.hako=Hakö controlledvocabulary.language.halang=Halang controlledvocabulary.language.halang_doan=Halang Doan controlledvocabulary.language.halbi=Halbi @@ -2636,14 +2634,14 @@ controlledvocabulary.language.hawaiian=Hawaiian controlledvocabulary.language.haya=Haya controlledvocabulary.language.hazaragi=Hazaragi controlledvocabulary.language.hdi=Hdi -controlledvocabulary.language.hebrew_(modern)=Hebrew (modern) +controlledvocabulary.language.hebrew_(modern)=Hebrew (modern), Hebrew controlledvocabulary.language.hehe=Hehe controlledvocabulary.language.heiban=Heiban controlledvocabulary.language.heiltsuk=Heiltsuk controlledvocabulary.language.helong=Helong controlledvocabulary.language.hema=Hema controlledvocabulary.language.hemba=Hemba -controlledvocabulary.language.herd�=Herd� +controlledvocabulary.language.herde=Herdé controlledvocabulary.language.herero=Herero controlledvocabulary.language.hermit=Hermit controlledvocabulary.language.hernican=Hernican @@ -2662,7 +2660,7 @@ controlledvocabulary.language.highland_totonac=Highland Totonac controlledvocabulary.language.hijazi_arabic=Hijazi Arabic controlledvocabulary.language.hijuk=Hijuk controlledvocabulary.language.hiligaynon=Hiligaynon -controlledvocabulary.language.himarim�=Himarim� +controlledvocabulary.language.himarima=Himarimã controlledvocabulary.language.hindi=Hindi controlledvocabulary.language.hinduri=Hinduri controlledvocabulary.language.hinukh=Hinukh @@ -2670,7 +2668,7 @@ controlledvocabulary.language.hiri_motu=Hiri Motu controlledvocabulary.language.hittite=Hittite controlledvocabulary.language.hitu=Hitu controlledvocabulary.language.hiw=Hiw -controlledvocabulary.language.hixkary�na=Hixkary�na +controlledvocabulary.language.hixkaryana=Hixkaryána controlledvocabulary.language.hlai=Hlai controlledvocabulary.language.hlepho_phowa=Hlepho Phowa controlledvocabulary.language.hlersu=Hlersu @@ -2678,7 +2676,7 @@ controlledvocabulary.language.hmar=Hmar controlledvocabulary.language.hmong=Hmong controlledvocabulary.language.hmong_daw=Hmong Daw controlledvocabulary.language.hmong_don=Hmong Don -controlledvocabulary.language.hmong_d�=Hmong D� +controlledvocabulary.language.hmong_do=Hmong Dô controlledvocabulary.language.hmong_njua=Hmong Njua controlledvocabulary.language.hmong_shua=Hmong Shua controlledvocabulary.language.hmwaveke=Hmwaveke @@ -2686,7 +2684,7 @@ controlledvocabulary.language.ho=Ho controlledvocabulary.language.ho_chi_minh_city_sign_language=Ho Chi Minh City Sign Language controlledvocabulary.language.ho-chunk=Ho-Chunk controlledvocabulary.language.hoava=Hoava -controlledvocabulary.language.hoby�t=Hoby�t +controlledvocabulary.language.hobyot=Hobyót controlledvocabulary.language.hoia_hoia=Hoia Hoia controlledvocabulary.language.holikachuk=Holikachuk controlledvocabulary.language.holiya=Holiya @@ -2713,8 +2711,8 @@ controlledvocabulary.language.hre=Hre controlledvocabulary.language.hruso=Hruso controlledvocabulary.language.hu=Hu controlledvocabulary.language.huachipaeri=Huachipaeri -controlledvocabulary.language.huallaga_hu�nuco_quechua=Huallaga Hu�nuco Quechua -controlledvocabulary.language.huamal�es-dos_de_mayo_hu�nuco_quechua=Huamal�es-Dos de Mayo Hu�nuco Quechua +controlledvocabulary.language.huallaga_huanuco_quechua=Huallaga Huánuco Quechua +controlledvocabulary.language.huamalies-dos_de_mayo_huanuco_quechua=Huamalíes-Dos de Mayo Huánuco Quechua controlledvocabulary.language.huambisa=Huambisa controlledvocabulary.language.huarijio=Huarijio controlledvocabulary.language.huastec=Huastec @@ -2731,7 +2729,7 @@ controlledvocabulary.language.huitepec_mixtec=Huitepec Mixtec controlledvocabulary.language.huizhou_chinese=Huizhou Chinese controlledvocabulary.language.hukumina=Hukumina controlledvocabulary.language.hula=Hula -controlledvocabulary.language.hulaul�=Hulaul� +controlledvocabulary.language.hulaula=Hulaulá controlledvocabulary.language.huli=Huli controlledvocabulary.language.hulung=Hulung controlledvocabulary.language.humburi_senni_songhay=Humburi Senni Songhay @@ -2748,7 +2746,7 @@ controlledvocabulary.language.hunnic=Hunnic controlledvocabulary.language.hunsrik=Hunsrik controlledvocabulary.language.hunzib=Hunzib controlledvocabulary.language.hupa=Hupa -controlledvocabulary.language.hupd�=Hupd� +controlledvocabulary.language.hupde=Hupdë controlledvocabulary.language.hupla=Hupla controlledvocabulary.language.hurrian=Hurrian controlledvocabulary.language.hutterite_german=Hutterite German @@ -2756,8 +2754,8 @@ controlledvocabulary.language.hwana=Hwana controlledvocabulary.language.hya=Hya controlledvocabulary.language.hyam=Hyam controlledvocabulary.language.hyolmo=Hyolmo -controlledvocabulary.language.h�rtevin=H�rtevin -controlledvocabulary.language.h�ne=H�ne +controlledvocabulary.language.hertevin=Hértevin +controlledvocabulary.language.hone=Hõne controlledvocabulary.language.i-wak=I-Wak controlledvocabulary.language.iaai=Iaai controlledvocabulary.language.iamalele=Iamalele @@ -2779,7 +2777,7 @@ controlledvocabulary.language.icelandic_sign_language=Icelandic Sign Language controlledvocabulary.language.iceve-maci=Iceve-Maci controlledvocabulary.language.ida'an=Ida'an controlledvocabulary.language.idakho-isukha-tiriki=Idakho-Isukha-Tiriki -controlledvocabulary.language.idat�=Idat� +controlledvocabulary.language.idate=Idaté controlledvocabulary.language.idere=Idere controlledvocabulary.language.idesa=Idesa controlledvocabulary.language.idi=Idi @@ -2789,7 +2787,7 @@ controlledvocabulary.language.idon=Idon controlledvocabulary.language.idu-mishmi=Idu-Mishmi controlledvocabulary.language.iduna=Iduna controlledvocabulary.language.ifo=Ifo -controlledvocabulary.language.if�=If� +controlledvocabulary.language.ife=Ifè controlledvocabulary.language.igala=Igala controlledvocabulary.language.igana=Igana controlledvocabulary.language.igbo=Igbo @@ -2843,7 +2841,7 @@ controlledvocabulary.language.indri=Indri controlledvocabulary.language.indus_kohistani=Indus Kohistani controlledvocabulary.language.indus_valley_language=Indus Valley Language controlledvocabulary.language.inebu_one=Inebu One -controlledvocabulary.language.inese�o=Inese�o +controlledvocabulary.language.ineseno=Ineseño controlledvocabulary.language.inga=Inga controlledvocabulary.language.ingrian=Ingrian controlledvocabulary.language.ingush=Ingush @@ -2854,7 +2852,7 @@ controlledvocabulary.language.inonhan=Inonhan controlledvocabulary.language.inor=Inor controlledvocabulary.language.inpui_naga=Inpui Naga controlledvocabulary.language.interglossa=Interglossa -controlledvocabulary.language.interlingua=Interlingua +controlledvocabulary.language.interlingua=Interlingua, Interlingua (International Auxiliary Language Association) controlledvocabulary.language.interlingue=Interlingue controlledvocabulary.language.international_sign=International Sign controlledvocabulary.language.interslavic=Interslavic @@ -2881,7 +2879,7 @@ controlledvocabulary.language.iresim=Iresim controlledvocabulary.language.irish=Irish controlledvocabulary.language.irish_sign_language=Irish Sign Language controlledvocabulary.language.irula=Irula -controlledvocabulary.language.ir�ntxe=Ir�ntxe +controlledvocabulary.language.irantxe=Irántxe controlledvocabulary.language.isabi=Isabi controlledvocabulary.language.isanzu=Isanzu controlledvocabulary.language.isarog_agta=Isarog Agta @@ -2916,7 +2914,7 @@ controlledvocabulary.language.ito=Ito controlledvocabulary.language.itonama=Itonama controlledvocabulary.language.itu_mbon_uzo=Itu Mbon Uzo controlledvocabulary.language.itundujia_mixtec=Itundujia Mixtec -controlledvocabulary.language.itz�=Itz� +controlledvocabulary.language.itza=Itzá controlledvocabulary.language.iu_mien=Iu Mien controlledvocabulary.language.ivatan=Ivatan controlledvocabulary.language.ivbie_north-okpela-arhe=Ivbie North-Okpela-Arhe @@ -2925,7 +2923,7 @@ controlledvocabulary.language.iwal=Iwal controlledvocabulary.language.iwam=Iwam controlledvocabulary.language.iwur=Iwur controlledvocabulary.language.ixcatec=Ixcatec -controlledvocabulary.language.ixcatl�n_mazatec=Ixcatl�n Mazatec +controlledvocabulary.language.ixcatlan_mazatec=Ixcatlán Mazatec controlledvocabulary.language.ixil=Ixil controlledvocabulary.language.ixtayutla_mixtec=Ixtayutla Mixtec controlledvocabulary.language.ixtenco_otomi=Ixtenco Otomi @@ -2938,8 +2936,8 @@ controlledvocabulary.language.izere=Izere controlledvocabulary.language.izii=Izii controlledvocabulary.language.izon=Izon controlledvocabulary.language.izora=Izora -controlledvocabulary.language.i�apari=I�apari -controlledvocabulary.language.jabut�=Jabut� +controlledvocabulary.language.inapari=Iñapari +controlledvocabulary.language.jabuti=Jabutí controlledvocabulary.language.jad=Jad controlledvocabulary.language.jadgali=Jadgali controlledvocabulary.language.jah_hut=Jah Hut @@ -2949,12 +2947,12 @@ controlledvocabulary.language.jaitmatang=Jaitmatang controlledvocabulary.language.jakati=Jakati controlledvocabulary.language.jakattoe=Jakattoe controlledvocabulary.language.jakun=Jakun -controlledvocabulary.language.jalapa_de_d�az_mazatec=Jalapa De D�az Mazatec +controlledvocabulary.language.jalapa_de_diaz_mazatec=Jalapa De Díaz Mazatec controlledvocabulary.language.jalkunan=Jalkunan controlledvocabulary.language.jamaican_country_sign_language=Jamaican Country Sign Language controlledvocabulary.language.jamaican_creole_english=Jamaican Creole English controlledvocabulary.language.jamaican_sign_language=Jamaican Sign Language -controlledvocabulary.language.jamamad�=Jamamad� +controlledvocabulary.language.jamamadi=Jamamadí controlledvocabulary.language.jambi_malay=Jambi Malay controlledvocabulary.language.jamiltepec_mixtec=Jamiltepec Mixtec controlledvocabulary.language.jamsay_dogon=Jamsay Dogon @@ -2965,7 +2963,7 @@ controlledvocabulary.language.jangshung=Jangshung controlledvocabulary.language.janji=Janji controlledvocabulary.language.japanese=Japanese controlledvocabulary.language.japanese_sign_language=Japanese Sign Language -controlledvocabulary.language.japrer�a=Japrer�a +controlledvocabulary.language.japreria=Japrería controlledvocabulary.language.jaqaru=Jaqaru controlledvocabulary.language.jara=Jara controlledvocabulary.language.jarai=Jarai @@ -3017,7 +3015,7 @@ controlledvocabulary.language.jola-fonyi=Jola-Fonyi controlledvocabulary.language.jola-kasa=Jola-Kasa controlledvocabulary.language.jonkor_bourmataguil=Jonkor Bourmataguil controlledvocabulary.language.jordanian_sign_language=Jordanian Sign Language -controlledvocabulary.language.jor�=Jor� +controlledvocabulary.language.jora=Jorá controlledvocabulary.language.jowulu=Jowulu controlledvocabulary.language.ju=Ju controlledvocabulary.language.juang=Juang @@ -3040,14 +3038,14 @@ controlledvocabulary.language.juquila_mixe=Juquila Mixe controlledvocabulary.language.jur_modo=Jur Modo controlledvocabulary.language.juray=Juray controlledvocabulary.language.jurchen=Jurchen -controlledvocabulary.language.jur�na=Jur�na +controlledvocabulary.language.juruna=Jurúna controlledvocabulary.language.jutish=Jutish controlledvocabulary.language.juwal=Juwal controlledvocabulary.language.juxtlahuaca_mixtec=Juxtlahuaca Mixtec -controlledvocabulary.language.juhoan=Ju??hoan +controlledvocabulary.language.juǀʼhoan=Juǀʼhoan controlledvocabulary.language.jwira-pepesa=Jwira-Pepesa -controlledvocabulary.language.j�rriais=J�rriais -controlledvocabulary.language.j�ma=J�ma +controlledvocabulary.language.jerriais=Jèrriais +controlledvocabulary.language.juma=Júma controlledvocabulary.language.k'iche'=K'iche' controlledvocabulary.language.kaamba=Kaamba controlledvocabulary.language.kaan=Kaan @@ -3057,7 +3055,7 @@ controlledvocabulary.language.kaba=Kaba controlledvocabulary.language.kabalai=Kabalai controlledvocabulary.language.kabardian=Kabardian controlledvocabulary.language.kabatei=Kabatei -controlledvocabulary.language.kabiy�=Kabiy� +controlledvocabulary.language.kabiye=Kabiyè controlledvocabulary.language.kabola=Kabola controlledvocabulary.language.kabore_one=Kabore One controlledvocabulary.language.kabras=Kabras @@ -3078,7 +3076,7 @@ controlledvocabulary.language.kadai=Kadai controlledvocabulary.language.kadar=Kadar controlledvocabulary.language.kadaru=Kadaru controlledvocabulary.language.kadazan_dusun=Kadazan Dusun -controlledvocabulary.language.kadiw�u=Kadiw�u +controlledvocabulary.language.kadiweu=Kadiwéu controlledvocabulary.language.kadu=Kadu controlledvocabulary.language.kadung=Kadung controlledvocabulary.language.kaduo=Kaduo @@ -3102,7 +3100,7 @@ controlledvocabulary.language.kaikadi=Kaikadi controlledvocabulary.language.kaikavian_literary_language=Kaikavian Literary Language controlledvocabulary.language.kaike=Kaike controlledvocabulary.language.kaimbulawa=Kaimbulawa -controlledvocabulary.language.kaimb�=Kaimb� +controlledvocabulary.language.kaimbe=Kaimbé controlledvocabulary.language.kaingang=Kaingang controlledvocabulary.language.kairak=Kairak controlledvocabulary.language.kairiru=Kairiru @@ -3110,7 +3108,7 @@ controlledvocabulary.language.kairui-midiki=Kairui-Midiki controlledvocabulary.language.kais=Kais controlledvocabulary.language.kaitag=Kaitag controlledvocabulary.language.kaivi=Kaivi -controlledvocabulary.language.kaiw�=Kaiw� +controlledvocabulary.language.kaiwa=Kaiwá controlledvocabulary.language.kaiy=Kaiy controlledvocabulary.language.kajakse=Kajakse controlledvocabulary.language.kajali=Kajali @@ -3129,7 +3127,7 @@ controlledvocabulary.language.kalabra=Kalabra controlledvocabulary.language.kalagan=Kalagan controlledvocabulary.language.kalaktang_monpa=Kalaktang Monpa controlledvocabulary.language.kalam=Kalam -controlledvocabulary.language.kalams�=Kalams� +controlledvocabulary.language.kalamse=Kalamsé controlledvocabulary.language.kalanadi=Kalanadi controlledvocabulary.language.kalanga=Kalanga controlledvocabulary.language.kalanguya=Kalanguya @@ -3159,13 +3157,13 @@ controlledvocabulary.language.kamas=Kamas controlledvocabulary.language.kamasa=Kamasa controlledvocabulary.language.kamasau=Kamasau controlledvocabulary.language.kamayo=Kamayo -controlledvocabulary.language.kamayur�=Kamayur� +controlledvocabulary.language.kamayura=Kamayurá controlledvocabulary.language.kamba_(kenya)=Kamba (Kenya) controlledvocabulary.language.kambaata=Kambaata controlledvocabulary.language.kambaira=Kambaira controlledvocabulary.language.kambera=Kambera controlledvocabulary.language.kamberau=Kamberau -controlledvocabulary.language.kambiw�=Kambiw� +controlledvocabulary.language.kambiwa=Kambiwá controlledvocabulary.language.kami_(nigeria)=Kami (Nigeria) controlledvocabulary.language.kami_(tanzania)=Kami (Tanzania) controlledvocabulary.language.kamo=Kamo @@ -3175,7 +3173,7 @@ controlledvocabulary.language.kamula=Kamula controlledvocabulary.language.kamviri=Kamviri controlledvocabulary.language.kamwe=Kamwe controlledvocabulary.language.kanakanabu=Kanakanabu -controlledvocabulary.language.kanamar�=Kanamar� +controlledvocabulary.language.kanamari=Kanamarí controlledvocabulary.language.kanan=Kanan controlledvocabulary.language.kanashi=Kanashi controlledvocabulary.language.kanasi=Kanasi @@ -3189,7 +3187,7 @@ controlledvocabulary.language.kanga=Kanga controlledvocabulary.language.kangean=Kangean controlledvocabulary.language.kanggape=Kanggape controlledvocabulary.language.kangjia=Kangjia -controlledvocabulary.language.kango_(bas-u�l�_district)=Kango (Bas-U�l� District) +controlledvocabulary.language.kango_(bas-uele_district)=Kango (Bas-Uélé District) controlledvocabulary.language.kango_(tshopo_district)=Kango (Tshopo District) controlledvocabulary.language.kangri=Kangri controlledvocabulary.language.kaniet=Kaniet @@ -3205,7 +3203,7 @@ controlledvocabulary.language.kankanaey=Kankanaey controlledvocabulary.language.kannada=Kannada controlledvocabulary.language.kannada_kurumba=Kannada Kurumba controlledvocabulary.language.kanowit-tanjong_melanau=Kanowit-Tanjong Melanau -controlledvocabulary.language.kano�=Kano� +controlledvocabulary.language.kanoe=Kanoé controlledvocabulary.language.kansa=Kansa controlledvocabulary.language.kantosi=Kantosi controlledvocabulary.language.kanu=Kanu @@ -3216,7 +3214,7 @@ controlledvocabulary.language.kao=Kao controlledvocabulary.language.kaonde=Kaonde controlledvocabulary.language.kap=Kap controlledvocabulary.language.kapin=Kapin -controlledvocabulary.language.kapinaw�=Kapinaw� +controlledvocabulary.language.kapinawa=Kapinawá controlledvocabulary.language.kapingamarangi=Kapingamarangi controlledvocabulary.language.kapori=Kapori controlledvocabulary.language.kapriman=Kapriman @@ -3232,7 +3230,7 @@ controlledvocabulary.language.karachay-balkar=Karachay-Balkar controlledvocabulary.language.karagas=Karagas controlledvocabulary.language.karaim=Karaim controlledvocabulary.language.karajarri=Karajarri -controlledvocabulary.language.karaj�=Karaj� +controlledvocabulary.language.karaja=Karajá controlledvocabulary.language.karakhanid=Karakhanid controlledvocabulary.language.karami=Karami controlledvocabulary.language.karamojong=Karamojong @@ -3253,9 +3251,9 @@ controlledvocabulary.language.karey=Karey controlledvocabulary.language.kari=Kari controlledvocabulary.language.karingani=Karingani controlledvocabulary.language.karipuna=Karipuna -controlledvocabulary.language.karip�na_creole_french=Karip�na Creole French -controlledvocabulary.language.karir�-xoc�=Karir�-Xoc� -controlledvocabulary.language.kariti�na=Kariti�na +controlledvocabulary.language.karipuna_creole_french=Karipúna Creole French +controlledvocabulary.language.kariri-xoco=Karirí-Xocó +controlledvocabulary.language.karitiana=Karitiâna controlledvocabulary.language.kariya=Kariya controlledvocabulary.language.kariyarra=Kariyarra controlledvocabulary.language.karkar-yuri=Karkar-Yuri @@ -3290,7 +3288,7 @@ controlledvocabulary.language.katla=Katla controlledvocabulary.language.kato=Kato controlledvocabulary.language.katso=Katso controlledvocabulary.language.katua=Katua -controlledvocabulary.language.katuk�na=Katuk�na +controlledvocabulary.language.katukina=Katukína controlledvocabulary.language.kaulong=Kaulong controlledvocabulary.language.kaur=Kaur controlledvocabulary.language.kaure=Kaure @@ -3302,14 +3300,14 @@ controlledvocabulary.language.kawacha=Kawacha controlledvocabulary.language.kawaiisu=Kawaiisu controlledvocabulary.language.kawe=Kawe controlledvocabulary.language.kawi=Kawi -controlledvocabulary.language.kaxarar�=Kaxarar� -controlledvocabulary.language.kaxui�na=Kaxui�na -controlledvocabulary.language.kayab�=Kayab� +controlledvocabulary.language.kaxarari=Kaxararí +controlledvocabulary.language.kaxuiana=Kaxuiâna +controlledvocabulary.language.kayabi=Kayabí controlledvocabulary.language.kayagar=Kayagar controlledvocabulary.language.kayan=Kayan controlledvocabulary.language.kayan_mahakam=Kayan Mahakam controlledvocabulary.language.kayan_river_kayan=Kayan River Kayan -controlledvocabulary.language.kayap�=Kayap� +controlledvocabulary.language.kayapo=Kayapó controlledvocabulary.language.kayardild=Kayardild controlledvocabulary.language.kayaw=Kayaw controlledvocabulary.language.kayeli=Kayeli @@ -3331,7 +3329,7 @@ controlledvocabulary.language.kei=Kei controlledvocabulary.language.keiga=Keiga controlledvocabulary.language.kein=Kein controlledvocabulary.language.keiyo=Keiyo -controlledvocabulary.language.kekch�=Kekch� +controlledvocabulary.language.kekchi=Kekchí controlledvocabulary.language.kela_(democratic_republic_of_congo)=Kela (Democratic Republic of Congo) controlledvocabulary.language.kela_(papua_new_guinea)=Kela (Papua New Guinea) controlledvocabulary.language.kelabit=Kelabit @@ -3364,7 +3362,7 @@ controlledvocabulary.language.kenyang=Kenyang controlledvocabulary.language.kenyi=Kenyi controlledvocabulary.language.kenzi=Kenzi controlledvocabulary.language.keoru-ahia=Keoru-Ahia -controlledvocabulary.language.kepkiriw�t=Kepkiriw�t +controlledvocabulary.language.kepkiriwat=Kepkiriwát controlledvocabulary.language.kepo'=Kepo' controlledvocabulary.language.kera=Kera controlledvocabulary.language.kerak=Kerak @@ -3425,8 +3423,8 @@ controlledvocabulary.language.khuen=Khuen controlledvocabulary.language.khumi_chin=Khumi Chin controlledvocabulary.language.khunsari=Khunsari controlledvocabulary.language.khvarshi=Khvarshi -controlledvocabulary.language.kh�ng=Kh�ng -controlledvocabulary.language.kh�n=Kh�n +controlledvocabulary.language.khang=Kháng +controlledvocabulary.language.khun=Khün controlledvocabulary.language.kibala=Kibala controlledvocabulary.language.kibet=Kibet controlledvocabulary.language.kibiri=Kibiri @@ -3445,7 +3443,7 @@ controlledvocabulary.language.kimaragang=Kimaragang controlledvocabulary.language.kimbu=Kimbu controlledvocabulary.language.kimbundu=Kimbundu controlledvocabulary.language.kimki=Kimki -controlledvocabulary.language.kimr�=Kimr� +controlledvocabulary.language.kimre=Kimré controlledvocabulary.language.kinabalian=Kinabalian controlledvocabulary.language.kinalakna=Kinalakna controlledvocabulary.language.kinamiging_manobo=Kinamiging Manobo @@ -3464,12 +3462,11 @@ controlledvocabulary.language.kipsigis=Kipsigis controlledvocabulary.language.kiput=Kiput controlledvocabulary.language.kir-balar=Kir-Balar controlledvocabulary.language.kire=Kire -controlledvocabulary.language.kirghiz=Kirghiz +controlledvocabulary.language.kirghiz=Kirghiz, Kyrgyz controlledvocabulary.language.kirike=Kirike controlledvocabulary.language.kirikiri=Kirikiri controlledvocabulary.language.kirmanjki_(individual_language)=Kirmanjki (individual language) -controlledvocabulary.language.kirundi=Kirundi -controlledvocabulary.language.kirya-konzl=Kirya-Konz?l +controlledvocabulary.language.kirya-konzəl=Kirya-Konzəl controlledvocabulary.language.kis=Kis controlledvocabulary.language.kisa=Kisa controlledvocabulary.language.kisan=Kisan @@ -3585,18 +3582,18 @@ controlledvocabulary.language.koreguaje=Koreguaje controlledvocabulary.language.koresh-e_rostam=Koresh-e Rostam controlledvocabulary.language.korku=Korku controlledvocabulary.language.korlai_creole_portuguese=Korlai Creole Portuguese -controlledvocabulary.language.koro_(c�te_d'ivoire)=Koro (C�te d'Ivoire) +controlledvocabulary.language.koro_(cote_d'ivoire)=Koro (Côte d'Ivoire) controlledvocabulary.language.koro_(india)=Koro (India) controlledvocabulary.language.koro_(papua_new_guinea)=Koro (Papua New Guinea) controlledvocabulary.language.koro_(vanuatu)=Koro (Vanuatu) controlledvocabulary.language.koro_nulu=Koro Nulu controlledvocabulary.language.koro_wachi=Koro Wachi controlledvocabulary.language.koro_zuba=Koro Zuba -controlledvocabulary.language.koromf�=Koromf� +controlledvocabulary.language.koromfe=Koromfé controlledvocabulary.language.koromira=Koromira controlledvocabulary.language.koronadal_blaan=Koronadal Blaan controlledvocabulary.language.koroni=Koroni -controlledvocabulary.language.korop�=Korop� +controlledvocabulary.language.koropo=Koropó controlledvocabulary.language.koroshi=Koroshi controlledvocabulary.language.korowai=Korowai controlledvocabulary.language.korra_koraga=Korra Koraga @@ -3641,7 +3638,7 @@ controlledvocabulary.language.kpelle=Kpelle controlledvocabulary.language.kpessi=Kpessi controlledvocabulary.language.kplang=Kplang controlledvocabulary.language.krache=Krache -controlledvocabulary.language.krah�=Krah� +controlledvocabulary.language.kraho=Krahô controlledvocabulary.language.kraol=Kraol controlledvocabulary.language.krenak=Krenak controlledvocabulary.language.krevinian=Krevinian @@ -3679,7 +3676,7 @@ controlledvocabulary.language.kugu-muminh=Kugu-Muminh controlledvocabulary.language.kui_(india)=Kui (India) controlledvocabulary.language.kui_(indonesia)=Kui (Indonesia) controlledvocabulary.language.kuijau=Kuijau -controlledvocabulary.language.kuik�ro-kalap�lo=Kuik�ro-Kalap�lo +controlledvocabulary.language.kuikuro-kalapalo=Kuikúro-Kalapálo controlledvocabulary.language.kujarge=Kujarge controlledvocabulary.language.kuk=Kuk controlledvocabulary.language.kukatja=Kukatja @@ -3756,7 +3753,7 @@ controlledvocabulary.language.kurti=Kurti controlledvocabulary.language.kurtokha=Kurtokha controlledvocabulary.language.kurudu=Kurudu controlledvocabulary.language.kurukh=Kurukh -controlledvocabulary.language.kuru�ya=Kuru�ya +controlledvocabulary.language.kuruaya=Kuruáya controlledvocabulary.language.kusaal=Kusaal controlledvocabulary.language.kusaghe=Kusaghe controlledvocabulary.language.kushi=Kushi @@ -3823,10 +3820,10 @@ controlledvocabulary.language.kyan-karyaw_naga=Kyan-Karyaw Naga controlledvocabulary.language.kyanga=Kyanga controlledvocabulary.language.kyenele=Kyenele controlledvocabulary.language.kyerung=Kyerung -controlledvocabulary.language.k�te=K�te -controlledvocabulary.language.k�l�=K�l� -controlledvocabulary.language.k�lsch=K�lsch -controlledvocabulary.language.klngaxo_bozo=K?l?ngaxo Bozo +controlledvocabulary.language.kate=Kâte +controlledvocabulary.language.kele=Kélé +controlledvocabulary.language.kolsch=Kölsch +controlledvocabulary.language.kɛlɛngaxo_bozo=Kɛlɛngaxo Bozo controlledvocabulary.language.la'bi=La'bi controlledvocabulary.language.laal=Laal controlledvocabulary.language.laari=Laari @@ -3841,7 +3838,7 @@ controlledvocabulary.language.labuk-kinabatangan_kadazan=Labuk-Kinabatangan Kada controlledvocabulary.language.lacandon=Lacandon controlledvocabulary.language.lachi=Lachi controlledvocabulary.language.lachiguiri_zapotec=Lachiguiri Zapotec -controlledvocabulary.language.lachix�o_zapotec=Lachix�o Zapotec +controlledvocabulary.language.lachixio_zapotec=Lachixío Zapotec controlledvocabulary.language.ladakhi=Ladakhi controlledvocabulary.language.ladin=Ladin controlledvocabulary.language.ladino=Ladino @@ -3870,7 +3867,7 @@ controlledvocabulary.language.lakha=Lakha controlledvocabulary.language.laki=Laki controlledvocabulary.language.lakkia=Lakkia controlledvocabulary.language.lakon=Lakon -controlledvocabulary.language.lakond�=Lakond� +controlledvocabulary.language.lakonde=Lakondê controlledvocabulary.language.lakota=Lakota controlledvocabulary.language.lakota_dida=Lakota Dida controlledvocabulary.language.lakurumau=Lakurumau @@ -3919,7 +3916,7 @@ controlledvocabulary.language.lao_naga=Lao Naga controlledvocabulary.language.laomian=Laomian controlledvocabulary.language.laopang=Laopang controlledvocabulary.language.laos_sign_language=Laos Sign Language -controlledvocabulary.language.lapagu�a-guivini_zapotec=Lapagu�a-Guivini Zapotec +controlledvocabulary.language.lapaguia-guivini_zapotec=Lapaguía-Guivini Zapotec controlledvocabulary.language.laragia=Laragia controlledvocabulary.language.larantuka_malay=Larantuka Malay controlledvocabulary.language.lardil=Lardil @@ -3939,7 +3936,7 @@ controlledvocabulary.language.late_middle_chinese=Late Middle Chinese controlledvocabulary.language.latgalian=Latgalian controlledvocabulary.language.latin=Latin controlledvocabulary.language.latu=Latu -controlledvocabulary.language.latund�=Latund� +controlledvocabulary.language.latunde=Latundê controlledvocabulary.language.latvian=Latvian controlledvocabulary.language.latvian_sign_language=Latvian Sign Language controlledvocabulary.language.lau=Lau @@ -4061,7 +4058,7 @@ controlledvocabulary.language.lisela=Lisela controlledvocabulary.language.lish=Lish controlledvocabulary.language.lishana_deni=Lishana Deni controlledvocabulary.language.lishanid_noshan=Lishanid Noshan -controlledvocabulary.language.lish�n_did�n=Lish�n Did�n +controlledvocabulary.language.lishan_didan=Lishán Didán controlledvocabulary.language.lisu=Lisu controlledvocabulary.language.literary_chinese=Literary Chinese controlledvocabulary.language.lithuanian=Lithuanian @@ -4082,6 +4079,7 @@ controlledvocabulary.language.logo=Logo controlledvocabulary.language.logol=Logol controlledvocabulary.language.logooli=Logooli controlledvocabulary.language.logorik=Logorik +controlledvocabulary.language.croatian=Logudorese Sardinian, Croatian controlledvocabulary.language.lohorung=Lohorung controlledvocabulary.language.loja_highland_quichua=Loja Highland Quichua controlledvocabulary.language.lojban=Lojban @@ -4095,7 +4093,7 @@ controlledvocabulary.language.lole=Lole controlledvocabulary.language.lolo=Lolo controlledvocabulary.language.loloda=Loloda controlledvocabulary.language.lolopo=Lolopo -controlledvocabulary.language.loma_(c�te_d'ivoire)=Loma (C�te d'Ivoire) +controlledvocabulary.language.loma_(cote_d'ivoire)=Loma (Côte d'Ivoire) controlledvocabulary.language.loma_(liberia)=Loma (Liberia) controlledvocabulary.language.lomaiviti=Lomaiviti controlledvocabulary.language.lomavren=Lomavren @@ -4189,10 +4187,10 @@ controlledvocabulary.language.lwel=Lwel controlledvocabulary.language.lycian=Lycian controlledvocabulary.language.lydian=Lydian controlledvocabulary.language.lyngngam=Lyngngam -controlledvocabulary.language.ly�l�=Ly�l� -controlledvocabulary.language.l�adan=L�adan -controlledvocabulary.language.l��_l��_bwamu=L�� L�� Bwamu -controlledvocabulary.language.l�=L� +controlledvocabulary.language.lyele=Lyélé +controlledvocabulary.language.laadan=Láadan +controlledvocabulary.language.laa_laa_bwamu=Láá Láá Bwamu +controlledvocabulary.language.lu=Lü controlledvocabulary.language.ma_(democratic_republic_of_congo)=Ma (Democratic Republic of Congo) controlledvocabulary.language.ma_(papua_new_guinea)=Ma (Papua New Guinea) controlledvocabulary.language.ma_manda=Ma Manda @@ -4211,7 +4209,7 @@ controlledvocabulary.language.mabaka_valley_kalinga=Mabaka Valley Kalinga controlledvocabulary.language.mabire=Mabire controlledvocabulary.language.maca=Maca controlledvocabulary.language.macaguaje=Macaguaje -controlledvocabulary.language.macagu�n=Macagu�n +controlledvocabulary.language.macaguan=Macaguán controlledvocabulary.language.macanese=Macanese controlledvocabulary.language.macedo-romanian=Macedo-Romanian controlledvocabulary.language.macedonian=Macedonian @@ -4238,12 +4236,12 @@ controlledvocabulary.language.mag-indi_ayta=Mag-Indi Ayta controlledvocabulary.language.mag-antsi_ayta=Mag-antsi Ayta controlledvocabulary.language.magahi=Magahi controlledvocabulary.language.magbukun_ayta=Magbukun Ayta -controlledvocabulary.language.magdalena_pe�asco_mixtec=Magdalena Pe�asco Mixtec +controlledvocabulary.language.magdalena_penasco_mixtec=Magdalena Peñasco Mixtec controlledvocabulary.language.magoma=Magoma controlledvocabulary.language.magori=Magori controlledvocabulary.language.maguindanaon=Maguindanaon -controlledvocabulary.language.mag_(madang_province)=Mag? (Madang Province) -controlledvocabulary.language.magyi=Mag?yi +controlledvocabulary.language.magɨ_(madang_province)=Magɨ (Madang Province) +controlledvocabulary.language.magɨyi=Magɨyi controlledvocabulary.language.mahali=Mahali controlledvocabulary.language.mahasu_pahari=Mahasu Pahari controlledvocabulary.language.mahican=Mahican @@ -4256,7 +4254,7 @@ controlledvocabulary.language.maiani=Maiani controlledvocabulary.language.maii=Maii controlledvocabulary.language.mailu=Mailu controlledvocabulary.language.maindo=Maindo -controlledvocabulary.language.mainfr�nkisch=Mainfr�nkisch +controlledvocabulary.language.mainfrankisch=Mainfränkisch controlledvocabulary.language.mainstream_kenyah=Mainstream Kenyah controlledvocabulary.language.mairasi=Mairasi controlledvocabulary.language.maisin=Maisin @@ -4289,7 +4287,7 @@ controlledvocabulary.language.makolkol=Makolkol controlledvocabulary.language.makonde=Makonde controlledvocabulary.language.maku'a=Maku'a controlledvocabulary.language.makuri_naga=Makuri Naga -controlledvocabulary.language.makur�p=Makur�p +controlledvocabulary.language.makurap=Makuráp controlledvocabulary.language.makwe=Makwe controlledvocabulary.language.makyan_naga=Makyan Naga controlledvocabulary.language.mal=Mal @@ -4312,8 +4310,8 @@ controlledvocabulary.language.malavedan=Malavedan controlledvocabulary.language.malawi_lomwe=Malawi Lomwe controlledvocabulary.language.malawi_sena=Malawi Sena controlledvocabulary.language.malawian_sign_language=Malawian Sign Language -controlledvocabulary.language.malay=Malay controlledvocabulary.language.malay_(individual_language)=Malay (individual language) +controlledvocabulary.language.malay=Malay, Malay (macrolanguage) controlledvocabulary.language.malayalam=Malayalam controlledvocabulary.language.malayic_dayak=Malayic Dayak controlledvocabulary.language.malaynon=Malaynon @@ -4341,11 +4339,11 @@ controlledvocabulary.language.maltese_sign_language=Maltese Sign Language controlledvocabulary.language.malua_bay=Malua Bay controlledvocabulary.language.malvi=Malvi controlledvocabulary.language.malyangapa=Malyangapa -controlledvocabulary.language.mal�ku_ja�ka=Mal�ku Ja�ka +controlledvocabulary.language.maleku_jaika=Maléku Jaíka controlledvocabulary.language.mam=Mam controlledvocabulary.language.mama=Mama controlledvocabulary.language.mamaa=Mamaa -controlledvocabulary.language.mamaind�=Mamaind� +controlledvocabulary.language.mamainde=Mamaindé controlledvocabulary.language.mamanwa=Mamanwa controlledvocabulary.language.mamara_senoufo=Mamara Senoufo controlledvocabulary.language.mamasa=Mamasa @@ -4444,7 +4442,7 @@ controlledvocabulary.language.marama=Marama controlledvocabulary.language.maranao=Maranao controlledvocabulary.language.maranunggu=Maranunggu controlledvocabulary.language.mararit=Mararit -controlledvocabulary.language.marathi_(marh)=Marathi (Mar??h?) +controlledvocabulary.language.marathi_(marathi)=Marathi, Marathi (Marāṭhī) controlledvocabulary.language.marau=Marau controlledvocabulary.language.marba=Marba controlledvocabulary.language.mardin_sign_language=Mardin Sign Language @@ -4473,7 +4471,7 @@ controlledvocabulary.language.maringarr=Maringarr controlledvocabulary.language.marino=Marino controlledvocabulary.language.mariri=Mariri controlledvocabulary.language.maritime_sign_language=Maritime Sign Language -controlledvocabulary.language.maritsau�=Maritsau� +controlledvocabulary.language.maritsaua=Maritsauá controlledvocabulary.language.mariyedi=Mariyedi controlledvocabulary.language.marka=Marka controlledvocabulary.language.markweeta=Markweeta @@ -4493,7 +4491,7 @@ controlledvocabulary.language.maru=Maru controlledvocabulary.language.marwari=Marwari controlledvocabulary.language.marwari_(india)=Marwari (India) controlledvocabulary.language.marwari_(pakistan)=Marwari (Pakistan) -controlledvocabulary.language.mar�bo=Mar�bo +controlledvocabulary.language.marubo=Marúbo controlledvocabulary.language.masaaba=Masaaba controlledvocabulary.language.masadiit_itneg=Masadiit Itneg controlledvocabulary.language.masai=Masai @@ -4521,15 +4519,15 @@ controlledvocabulary.language.matigsalug_manobo=Matigsalug Manobo controlledvocabulary.language.matipuhy=Matipuhy controlledvocabulary.language.matngala=Matngala controlledvocabulary.language.mato=Mato -controlledvocabulary.language.mato_grosso_ar�ra=Mato Grosso Ar�ra +controlledvocabulary.language.mato_grosso_arara=Mato Grosso Arára controlledvocabulary.language.mator=Mator -controlledvocabulary.language.mats�s=Mats�s +controlledvocabulary.language.matses=Matsés controlledvocabulary.language.mattole=Mattole controlledvocabulary.language.matu_chin=Matu Chin controlledvocabulary.language.matukar=Matukar controlledvocabulary.language.matumbi=Matumbi controlledvocabulary.language.matya_samo=Matya Samo -controlledvocabulary.language.mat�s=Mat�s +controlledvocabulary.language.matis=Matís controlledvocabulary.language.maung=Maung controlledvocabulary.language.mauritian_sign_language=Mauritian Sign Language controlledvocabulary.language.mauwake=Mauwake @@ -4540,7 +4538,7 @@ controlledvocabulary.language.mawan=Mawan controlledvocabulary.language.mawayana=Mawayana controlledvocabulary.language.mawchi=Mawchi controlledvocabulary.language.mawes=Mawes -controlledvocabulary.language.maxakal�=Maxakal� +controlledvocabulary.language.maxakali=Maxakalí controlledvocabulary.language.maxi_gbe=Maxi Gbe controlledvocabulary.language.maya_samo=Maya Samo controlledvocabulary.language.mayaguduna=Mayaguduna @@ -4556,8 +4554,8 @@ controlledvocabulary.language.mayoyao_ifugao=Mayoyao Ifugao controlledvocabulary.language.mazagway=Mazagway controlledvocabulary.language.mazaltepec_zapotec=Mazaltepec Zapotec controlledvocabulary.language.mazanderani=Mazanderani -controlledvocabulary.language.mazatl�n_mazatec=Mazatl�n Mazatec -controlledvocabulary.language.mazatl�n_mixe=Mazatl�n Mixe +controlledvocabulary.language.mazatlan_mazatec=Mazatlán Mazatec +controlledvocabulary.language.mazatlan_mixe=Mazatlán Mixe controlledvocabulary.language.mba=Mba controlledvocabulary.language.mbala=Mbala controlledvocabulary.language.mbalanhu=Mbalanhu @@ -4602,7 +4600,7 @@ controlledvocabulary.language.mbunda=Mbunda controlledvocabulary.language.mbunga=Mbunga controlledvocabulary.language.mburku=Mburku controlledvocabulary.language.mbwela=Mbwela -controlledvocabulary.language.mby�_guaran�=Mby� Guaran� +controlledvocabulary.language.mbya_guarani=Mbyá Guaraní controlledvocabulary.language.me'en=Me'en controlledvocabulary.language.medebur=Medebur controlledvocabulary.language.medefaidrin=Medefaidrin @@ -4614,7 +4612,7 @@ controlledvocabulary.language.mefele=Mefele controlledvocabulary.language.megam=Megam controlledvocabulary.language.megleno_romanian=Megleno Romanian controlledvocabulary.language.mehek=Mehek -controlledvocabulary.language.mehin�ku=Mehin�ku +controlledvocabulary.language.mehinaku=Mehináku controlledvocabulary.language.mehri=Mehri controlledvocabulary.language.mekeo=Mekeo controlledvocabulary.language.mekmek=Mekmek @@ -4655,7 +4653,7 @@ controlledvocabulary.language.mesopotamian_arabic=Mesopotamian Arabic controlledvocabulary.language.mesqan=Mesqan controlledvocabulary.language.messapic=Messapic controlledvocabulary.language.meta'=Meta' -controlledvocabulary.language.metlat�noc_mixtec=Metlat�noc Mixtec +controlledvocabulary.language.metlatonoc_mixtec=Metlatónoc Mixtec controlledvocabulary.language.mewari=Mewari controlledvocabulary.language.mewati=Mewati controlledvocabulary.language.mexican_sign_language=Mexican Sign Language @@ -4666,14 +4664,14 @@ controlledvocabulary.language.mfinu=Mfinu controlledvocabulary.language.mfumte=Mfumte controlledvocabulary.language.mgbolizhia=Mgbolizhia controlledvocabulary.language.mi'kmaq=Mi'kmaq -controlledvocabulary.language.miahuatl�n_zapotec=Miahuatl�n Zapotec +controlledvocabulary.language.miahuatlan_zapotec=Miahuatlán Zapotec controlledvocabulary.language.miami=Miami controlledvocabulary.language.mian=Mian controlledvocabulary.language.miani=Miani controlledvocabulary.language.michif=Michif controlledvocabulary.language.michigamea=Michigamea -controlledvocabulary.language.michoac�n_mazahua=Michoac�n Mazahua -controlledvocabulary.language.michoac�n_nahuatl=Michoac�n Nahuatl +controlledvocabulary.language.michoacan_mazahua=Michoacán Mazahua +controlledvocabulary.language.michoacan_nahuatl=Michoacán Nahuatl controlledvocabulary.language.mid_grand_valley_dani=Mid Grand Valley Dani controlledvocabulary.language.mid-southern_banda=Mid-Southern Banda controlledvocabulary.language.middle_armenian=Middle Armenian @@ -4750,7 +4748,7 @@ controlledvocabulary.language.miyako=Miyako controlledvocabulary.language.miyakubo_sign_language=Miyakubo Sign Language controlledvocabulary.language.miyobe=Miyobe controlledvocabulary.language.mlabri=Mlabri -controlledvocabulary.language.mlahs�=Mlahs� +controlledvocabulary.language.mlahso=Mlahsö controlledvocabulary.language.mlap=Mlap controlledvocabulary.language.mlomp=Mlomp controlledvocabulary.language.mmaala=Mmaala @@ -4764,8 +4762,9 @@ controlledvocabulary.language.mobwa_karen=Mobwa Karen controlledvocabulary.language.mochi=Mochi controlledvocabulary.language.mochica=Mochica controlledvocabulary.language.mocho=Mocho -controlledvocabulary.language.mocov�=Mocov� +controlledvocabulary.language.mocovi=Mocoví controlledvocabulary.language.modang=Modang +controlledvocabulary.language.greek_(modern)=Modern Greek (1453-), Greek (modern) controlledvocabulary.language.modole=Modole controlledvocabulary.language.moere=Moere controlledvocabulary.language.mofu-gudur=Mofu-Gudur @@ -4809,7 +4808,7 @@ controlledvocabulary.language.momuna=Momuna controlledvocabulary.language.mon=Mon controlledvocabulary.language.monastic_sign_language=Monastic Sign Language controlledvocabulary.language.mondropolon=Mondropolon -controlledvocabulary.language.mond�=Mond� +controlledvocabulary.language.monde=Mondé controlledvocabulary.language.mongo=Mongo controlledvocabulary.language.mongol=Mongol controlledvocabulary.language.mongolia_buriat=Mongolia Buriat @@ -4829,7 +4828,7 @@ controlledvocabulary.language.monumbo=Monumbo controlledvocabulary.language.monzombo=Monzombo controlledvocabulary.language.moo=Moo controlledvocabulary.language.moose_cree=Moose Cree -controlledvocabulary.language.mop�n_maya=Mop�n Maya +controlledvocabulary.language.mopan_maya=Mopán Maya controlledvocabulary.language.mor_(bomberai_peninsula)=Mor (Bomberai Peninsula) controlledvocabulary.language.mor_(mor_islands)=Mor (Mor Islands) controlledvocabulary.language.moraid=Moraid @@ -4913,7 +4912,7 @@ controlledvocabulary.language.mundang=Mundang controlledvocabulary.language.mundani=Mundani controlledvocabulary.language.mundari=Mundari controlledvocabulary.language.mundat=Mundat -controlledvocabulary.language.munduruk�=Munduruk� +controlledvocabulary.language.munduruku=Mundurukú controlledvocabulary.language.mungaka=Mungaka controlledvocabulary.language.munggui=Munggui controlledvocabulary.language.mungkip=Mungkip @@ -4964,15 +4963,15 @@ controlledvocabulary.language.mycenaean_greek=Mycenaean Greek controlledvocabulary.language.myene=Myene controlledvocabulary.language.mysian=Mysian controlledvocabulary.language.mzieme_naga=Mzieme Naga -controlledvocabulary.language.m�ghd�=M�ghd� -controlledvocabulary.language.m�ku=M�ku -controlledvocabulary.language.m�nik=M�nik -controlledvocabulary.language.m�skito=M�skito -controlledvocabulary.language.m�cheno=M�cheno -controlledvocabulary.language.m�n_chin=M�n Chin -controlledvocabulary.language.m�nd�=M�nd� -controlledvocabulary.language.mhrri_prkrit=M?h?r???ri Pr?krit -controlledvocabulary.language.mori=M?ori +controlledvocabulary.language.maghdi=Mághdì +controlledvocabulary.language.maku=Máku +controlledvocabulary.language.menik=Ménik +controlledvocabulary.language.miskito=Mískito +controlledvocabulary.language.mocheno=Mócheno +controlledvocabulary.language.mun_chin=Mün Chin +controlledvocabulary.language.mundu=Mündü +controlledvocabulary.language.maharastri_prakrit=Māhārāṣṭri Prākrit +controlledvocabulary.language.maori=Māori, Maori controlledvocabulary.language.n'ko=N'Ko controlledvocabulary.language.na=Na controlledvocabulary.language.na-kara=Na-kara @@ -4984,7 +4983,7 @@ controlledvocabulary.language.nabak=Nabak controlledvocabulary.language.nabi=Nabi controlledvocabulary.language.nachering=Nachering controlledvocabulary.language.nadruvian=Nadruvian -controlledvocabulary.language.nad�b=Nad�b +controlledvocabulary.language.nadeb=Nadëb controlledvocabulary.language.nafaanra=Nafaanra controlledvocabulary.language.nafi=Nafi controlledvocabulary.language.nafri=Nafri @@ -5009,7 +5008,7 @@ controlledvocabulary.language.nali=Nali controlledvocabulary.language.nalik=Nalik controlledvocabulary.language.nalu=Nalu controlledvocabulary.language.naluo_yi=Naluo Yi -controlledvocabulary.language.nal�go=Nal�go +controlledvocabulary.language.nalogo=Nalögo controlledvocabulary.language.nama_(papua_new_guinea)=Nama (Papua New Guinea) controlledvocabulary.language.namakura=Namakura controlledvocabulary.language.namat=Namat @@ -5027,7 +5026,7 @@ controlledvocabulary.language.nanai=Nanai controlledvocabulary.language.nancere=Nancere controlledvocabulary.language.nande=Nande controlledvocabulary.language.nandi=Nandi -controlledvocabulary.language.nanerig�_s�noufo=Nanerig� S�noufo +controlledvocabulary.language.nanerige_senoufo=Nanerigé Sénoufo controlledvocabulary.language.nanga_dama_dogon=Nanga Dama Dogon controlledvocabulary.language.nankina=Nankina controlledvocabulary.language.nanti=Nanti @@ -5053,7 +5052,7 @@ controlledvocabulary.language.natchez=Natchez controlledvocabulary.language.nateni=Nateni controlledvocabulary.language.nathembo=Nathembo controlledvocabulary.language.natioro=Natioro -controlledvocabulary.language.nat�gu=Nat�gu +controlledvocabulary.language.natugu=Natügu controlledvocabulary.language.nauete=Nauete controlledvocabulary.language.naukan_yupik=Naukan Yupik controlledvocabulary.language.nauna=Nauna @@ -5126,8 +5125,8 @@ controlledvocabulary.language.nengone=Nengone controlledvocabulary.language.neo=Neo controlledvocabulary.language.neo-hittite=Neo-Hittite controlledvocabulary.language.nepalese_sign_language=Nepalese Sign Language -controlledvocabulary.language.nepali=Nepali controlledvocabulary.language.nepali_(individual_language)=Nepali (individual language) +controlledvocabulary.language.nepali=Nepali (macrolanguage), Nepali controlledvocabulary.language.nete=Nete controlledvocabulary.language.new_caledonian_javanese=New Caledonian Javanese controlledvocabulary.language.new_zealand_sign_language=New Zealand Sign Language @@ -5191,7 +5190,7 @@ controlledvocabulary.language.ngile=Ngile controlledvocabulary.language.ngindo=Ngindo controlledvocabulary.language.ngiti=Ngiti controlledvocabulary.language.ngizim=Ngizim -controlledvocabulary.language.ngk�lmpw_kanum=Ngk�lmpw Kanum +controlledvocabulary.language.ngkalmpw_kanum=Ngkâlmpw Kanum controlledvocabulary.language.ngom=Ngom controlledvocabulary.language.ngomba=Ngomba controlledvocabulary.language.ngombale=Ngombale @@ -5212,11 +5211,11 @@ controlledvocabulary.language.ngundu=Ngundu controlledvocabulary.language.ngungwel=Ngungwel controlledvocabulary.language.ngurimi=Ngurimi controlledvocabulary.language.ngurmbur=Ngurmbur -controlledvocabulary.language.ngu�n=Ngu�n +controlledvocabulary.language.nguon=Nguôn controlledvocabulary.language.ngwaba=Ngwaba controlledvocabulary.language.ngwe=Ngwe controlledvocabulary.language.ngwo=Ngwo -controlledvocabulary.language.ng�bere=Ng�bere +controlledvocabulary.language.ngabere=Ngäbere controlledvocabulary.language.nhanda=Nhanda controlledvocabulary.language.nhengatu=Nhengatu controlledvocabulary.language.nhirrpi=Nhirrpi @@ -5256,7 +5255,7 @@ controlledvocabulary.language.nisi_(china)=Nisi (China) controlledvocabulary.language.niuafo'ou=Niuafo'ou controlledvocabulary.language.niuatoputapu=Niuatoputapu controlledvocabulary.language.niuean=Niuean -controlledvocabulary.language.nivacl�=Nivacl� +controlledvocabulary.language.nivacle=Nivaclé controlledvocabulary.language.niwer_mil=Niwer Mil controlledvocabulary.language.njalgulgule=Njalgulgule controlledvocabulary.language.njebi=Njebi @@ -5308,7 +5307,7 @@ controlledvocabulary.language.north_central_mixe=North Central Mixe controlledvocabulary.language.north_efate=North Efate controlledvocabulary.language.north_fali=North Fali controlledvocabulary.language.north_giziga=North Giziga -controlledvocabulary.language.north_jun�n_quechua=North Jun�n Quechua +controlledvocabulary.language.north_junin_quechua=North Junín Quechua controlledvocabulary.language.north_marquesan=North Marquesan controlledvocabulary.language.north_mesopotamian_arabic=North Mesopotamian Arabic controlledvocabulary.language.north_midlands_tasmanian=North Midlands Tasmanian @@ -5334,14 +5333,14 @@ controlledvocabulary.language.northern_altai=Northern Altai controlledvocabulary.language.northern_amami-oshima=Northern Amami-Oshima controlledvocabulary.language.northern_betsimisaraka_malagasy=Northern Betsimisaraka Malagasy controlledvocabulary.language.northern_binukidnon=Northern Binukidnon -controlledvocabulary.language.northern_bobo_madar�=Northern Bobo Madar� +controlledvocabulary.language.northern_bobo_madare=Northern Bobo Madaré controlledvocabulary.language.northern_bontok=Northern Bontok controlledvocabulary.language.northern_catanduanes_bikol=Northern Catanduanes Bikol controlledvocabulary.language.northern_conchucos_ancash_quechua=Northern Conchucos Ancash Quechua controlledvocabulary.language.northern_dagara=Northern Dagara controlledvocabulary.language.northern_dong=Northern Dong controlledvocabulary.language.northern_east_cree=Northern East Cree -controlledvocabulary.language.northern_ember�=Northern Ember� +controlledvocabulary.language.northern_embera=Northern Emberá controlledvocabulary.language.northern_frisian=Northern Frisian controlledvocabulary.language.northern_ghale=Northern Ghale controlledvocabulary.language.northern_gondi=Northern Gondi @@ -5360,7 +5359,7 @@ controlledvocabulary.language.northern_luri=Northern Luri controlledvocabulary.language.northern_mashan_hmong=Northern Mashan Hmong controlledvocabulary.language.northern_muji=Northern Muji controlledvocabulary.language.northern_nago=Northern Nago -controlledvocabulary.language.northern_ndebele=Northern Ndebele +controlledvocabulary.language.northern_ndebele=Northern Ndebele, North Ndebele controlledvocabulary.language.northern_ngbandi=Northern Ngbandi controlledvocabulary.language.northern_nisu=Northern Nisu controlledvocabulary.language.northern_nuni=Northern Nuni @@ -5407,7 +5406,7 @@ controlledvocabulary.language.northwestern_nisu=Northwestern Nisu controlledvocabulary.language.northwestern_ojibwa=Northwestern Ojibwa controlledvocabulary.language.northwestern_tasmanian=Northwestern Tasmanian controlledvocabulary.language.norwegian=Norwegian -controlledvocabulary.language.norwegian_bokm�l=Norwegian Bokm�l +controlledvocabulary.language.norwegian_bokmal=Norwegian Bokmål controlledvocabulary.language.norwegian_nynorsk=Norwegian Nynorsk controlledvocabulary.language.norwegian_sign_language=Norwegian Sign Language controlledvocabulary.language.notre=Notre @@ -5429,7 +5428,7 @@ controlledvocabulary.language.nuer=Nuer controlledvocabulary.language.nugunu_(australia)=Nugunu (Australia) controlledvocabulary.language.nugunu_(cameroon)=Nugunu (Cameroon) controlledvocabulary.language.nuk=Nuk -controlledvocabulary.language.nukak_mak�=Nukak Mak� +controlledvocabulary.language.nukak_maku=Nukak Makú controlledvocabulary.language.nukna=Nukna controlledvocabulary.language.nukuini=Nukuini controlledvocabulary.language.nukumanu=Nukumanu @@ -5441,12 +5440,11 @@ controlledvocabulary.language.numanggang=Numanggang controlledvocabulary.language.numbami=Numbami controlledvocabulary.language.nume=Nume controlledvocabulary.language.numidian=Numidian -controlledvocabulary.language.num��=Num�� +controlledvocabulary.language.numee=Numèè controlledvocabulary.language.nung_(viet_nam)=Nung (Viet Nam) controlledvocabulary.language.nungali=Nungali controlledvocabulary.language.nunggubuyu=Nunggubuyu controlledvocabulary.language.nungu=Nungu -controlledvocabulary.language.nuosu=Nuosu controlledvocabulary.language.nupbikha=Nupbikha controlledvocabulary.language.nupe-nupe-tako=Nupe-Nupe-Tako controlledvocabulary.language.nusa_laut=Nusa Laut @@ -5498,36 +5496,36 @@ controlledvocabulary.language.nyoro=Nyoro controlledvocabulary.language.nyulnyul=Nyulnyul controlledvocabulary.language.nyungar=Nyungar controlledvocabulary.language.nyungwe=Nyungwe -controlledvocabulary.language.ny�layu=Ny�layu +controlledvocabulary.language.nyalayu=Nyâlayu controlledvocabulary.language.nzadi=Nzadi controlledvocabulary.language.nzakambay=Nzakambay controlledvocabulary.language.nzakara=Nzakara controlledvocabulary.language.nzanyi=Nzanyi controlledvocabulary.language.nzima=Nzima -controlledvocabulary.language.n�-meo=N�-Meo -controlledvocabulary.language.n�l�mwa-nixumwak=N�l�mwa-Nixumwak -controlledvocabulary.language.n�pode_huitoto=N�pode Huitoto -controlledvocabulary.language.nng=N?ng +controlledvocabulary.language.na-meo=Ná-Meo +controlledvocabulary.language.nelemwa-nixumwak=Nêlêmwa-Nixumwak +controlledvocabulary.language.nupode_huitoto=Nüpode Huitoto +controlledvocabulary.language.nǁng=Nǁng controlledvocabulary.language.o'chi'chi'=O'chi'chi' controlledvocabulary.language.o'du=O'du controlledvocabulary.language.obanliku=Obanliku -controlledvocabulary.language.obispe�o=Obispe�o +controlledvocabulary.language.obispeno=Obispeño controlledvocabulary.language.oblo=Oblo controlledvocabulary.language.obo_manobo=Obo Manobo controlledvocabulary.language.obokuitai=Obokuitai controlledvocabulary.language.obolo=Obolo controlledvocabulary.language.obulom=Obulom controlledvocabulary.language.ocaina=Ocaina -controlledvocabulary.language.occitan=Occitan +controlledvocabulary.language.occitan=Occitan (post 1500), Occitan controlledvocabulary.language.ocotepec_mixtec=Ocotepec Mixtec -controlledvocabulary.language.ocotl�n_zapotec=Ocotl�n Zapotec +controlledvocabulary.language.ocotlan_zapotec=Ocotlán Zapotec controlledvocabulary.language.od=Od controlledvocabulary.language.odia=Odia controlledvocabulary.language.odiai=Odiai controlledvocabulary.language.odoodee=Odoodee controlledvocabulary.language.odual=Odual controlledvocabulary.language.odut=Odut -controlledvocabulary.language.ofay�=Ofay� +controlledvocabulary.language.ofaye=Ofayé controlledvocabulary.language.official_aramaic_(700-300_bce)=Official Aramaic (700-300 BCE) controlledvocabulary.language.ofo=Ofo controlledvocabulary.language.ogbah=Ogbah @@ -5537,7 +5535,7 @@ controlledvocabulary.language.ogbronuagum=Ogbronuagum controlledvocabulary.language.ogea=Ogea controlledvocabulary.language.oirata=Oirata controlledvocabulary.language.ojibwe,_ojibwa=Ojibwe, Ojibwa -controlledvocabulary.language.ojitl�n_chinantec=Ojitl�n Chinantec +controlledvocabulary.language.ojitlan_chinantec=Ojitlán Chinantec controlledvocabulary.language.okanagan=Okanagan controlledvocabulary.language.oki-no-erabu=Oki-No-Erabu controlledvocabulary.language.okiek=Okiek @@ -5558,7 +5556,6 @@ controlledvocabulary.language.old_breton=Old Breton controlledvocabulary.language.old_burmese=Old Burmese controlledvocabulary.language.old_cham=Old Cham controlledvocabulary.language.old_chinese=Old Chinese -controlledvocabulary.language.old_church_slavonic,_church_slavonic,_old_bulgarian=Old Church Slavonic, Church Slavonic, Old Bulgarian controlledvocabulary.language.old_cornish=Old Cornish controlledvocabulary.language.old_dutch=Old Dutch controlledvocabulary.language.old_english_(ca._450-1100)=Old English (ca. 450-1100) @@ -5582,7 +5579,7 @@ controlledvocabulary.language.old_norse=Old Norse controlledvocabulary.language.old_nubian=Old Nubian controlledvocabulary.language.old_ossetic=Old Ossetic controlledvocabulary.language.old_persian_(ca._600-400_b.c.)=Old Persian (ca. 600-400 B.C.) -controlledvocabulary.language.old_proven�al_(to_1500)=Old Proven�al (to 1500) +controlledvocabulary.language.old_provencal_(to_1500)=Old Provençal (to 1500) controlledvocabulary.language.old_russian=Old Russian controlledvocabulary.language.old_saxon=Old Saxon controlledvocabulary.language.old_spanish=Old Spanish @@ -5627,9 +5624,9 @@ controlledvocabulary.language.opata=Opata controlledvocabulary.language.orang_kanaq=Orang Kanaq controlledvocabulary.language.orang_seletar=Orang Seletar controlledvocabulary.language.oraon_sadri=Oraon Sadri -controlledvocabulary.language.orej�n=Orej�n +controlledvocabulary.language.orejon=Orejón controlledvocabulary.language.oring=Oring -controlledvocabulary.language.oriya=Oriya +controlledvocabulary.language.oriya=Oriya, Oriya (macrolanguage) controlledvocabulary.language.orizaba_nahuatl=Orizaba Nahuatl controlledvocabulary.language.orma=Orma controlledvocabulary.language.ormu=Ormu @@ -5671,7 +5668,7 @@ controlledvocabulary.language.oya'oya=Oya'oya controlledvocabulary.language.oyda=Oyda controlledvocabulary.language.oyster_bay_tasmanian=Oyster Bay Tasmanian controlledvocabulary.language.ozolotepec_zapotec=Ozolotepec Zapotec -controlledvocabulary.language.ozumac�n_chinantec=Ozumac�n Chinantec +controlledvocabulary.language.ozumacin_chinantec=Ozumacín Chinantec controlledvocabulary.language.pa_di=Pa Di controlledvocabulary.language.pa'a=Pa'a controlledvocabulary.language.pa'o_karen=Pa'o Karen @@ -5696,13 +5693,13 @@ controlledvocabulary.language.pahi=Pahi controlledvocabulary.language.pahlavani=Pahlavani controlledvocabulary.language.pahlavi=Pahlavi controlledvocabulary.language.pai_tavytera=Pai Tavytera -controlledvocabulary.language.paic�=Paic� +controlledvocabulary.language.paici=Paicî controlledvocabulary.language.paipai=Paipai controlledvocabulary.language.paite_chin=Paite Chin controlledvocabulary.language.paiwan=Paiwan controlledvocabulary.language.pak-tong=Pak-Tong controlledvocabulary.language.pakanha=Pakanha -controlledvocabulary.language.paka�snovos=Paka�snovos +controlledvocabulary.language.pakaasnovos=Pakaásnovos controlledvocabulary.language.pakistan_sign_language=Pakistan Sign Language controlledvocabulary.language.paku=Paku controlledvocabulary.language.paku_karen=Paku Karen @@ -5713,7 +5710,7 @@ controlledvocabulary.language.palantla_chinantec=Palantla Chinantec controlledvocabulary.language.palauan=Palauan controlledvocabulary.language.paleni=Paleni controlledvocabulary.language.palenquero=Palenquero -controlledvocabulary.language.palik�r=Palik�r +controlledvocabulary.language.palikur=Palikúr controlledvocabulary.language.paliyan=Paliyan controlledvocabulary.language.pallanganmiddang=Pallanganmiddang controlledvocabulary.language.paloor=Paloor @@ -5730,8 +5727,8 @@ controlledvocabulary.language.pana_(burkina_faso)=Pana (Burkina Faso) controlledvocabulary.language.pana_(central_african_republic)=Pana (Central African Republic) controlledvocabulary.language.panamanian_sign_language=Panamanian Sign Language controlledvocabulary.language.panamint=Panamint -controlledvocabulary.language.panao_hu�nuco_quechua=Panao Hu�nuco Quechua -controlledvocabulary.language.panar�=Panar� +controlledvocabulary.language.panao_huanuco_quechua=Panao Huánuco Quechua +controlledvocabulary.language.panara=Panará controlledvocabulary.language.panasuan=Panasuan controlledvocabulary.language.panawa=Panawa controlledvocabulary.language.pancana=Pancana @@ -5746,12 +5743,12 @@ controlledvocabulary.language.pangwali=Pangwali controlledvocabulary.language.panim=Panim controlledvocabulary.language.paniya=Paniya controlledvocabulary.language.panjabi,_punjabi=Panjabi, Punjabi -controlledvocabulary.language.pankarar�=Pankarar� -controlledvocabulary.language.pankarar�=Pankarar� +controlledvocabulary.language.pankarare=Pankararé +controlledvocabulary.language.pankararu=Pankararú controlledvocabulary.language.pankhu=Pankhu controlledvocabulary.language.pannei=Pannei controlledvocabulary.language.pano=Pano -controlledvocabulary.language.panoan_katuk�na=Panoan Katuk�na +controlledvocabulary.language.panoan_katukina=Panoan Katukína controlledvocabulary.language.panobo=Panobo controlledvocabulary.language.panyi_bai=Panyi Bai controlledvocabulary.language.papantla_totonac=Papantla Totonac @@ -5766,32 +5763,32 @@ controlledvocabulary.language.papua_new_guinean_sign_language=Papua New Guinean controlledvocabulary.language.papuan_malay=Papuan Malay controlledvocabulary.language.papuma=Papuma controlledvocabulary.language.parachi=Parachi -controlledvocabulary.language.paraguayan_guaran�=Paraguayan Guaran� +controlledvocabulary.language.paraguayan_guarani=Paraguayan Guaraní controlledvocabulary.language.paraguayan_sign_language=Paraguayan Sign Language -controlledvocabulary.language.parakan�=Parakan� +controlledvocabulary.language.parakana=Parakanã controlledvocabulary.language.paranan=Paranan -controlledvocabulary.language.paranaw�t=Paranaw�t +controlledvocabulary.language.paranawat=Paranawát controlledvocabulary.language.paraujano=Paraujano controlledvocabulary.language.parauk=Parauk controlledvocabulary.language.parawen=Parawen controlledvocabulary.language.pardhan=Pardhan controlledvocabulary.language.pardhi=Pardhi controlledvocabulary.language.pare=Pare -controlledvocabulary.language.parec�s=Parec�s +controlledvocabulary.language.parecis=Parecís controlledvocabulary.language.parenga=Parenga controlledvocabulary.language.parkari_koli=Parkari Koli controlledvocabulary.language.parkwa=Parkwa controlledvocabulary.language.parsi-dari=Parsi-Dari controlledvocabulary.language.parthian=Parthian controlledvocabulary.language.parya=Parya -controlledvocabulary.language.par�_ar�ra=Par� Ar�ra -controlledvocabulary.language.par�_gavi�o=Par� Gavi�o +controlledvocabulary.language.para_arara=Pará Arára +controlledvocabulary.language.para_gaviao=Pará Gavião controlledvocabulary.language.pashto,_pushto=Pashto, Pushto controlledvocabulary.language.pasi=Pasi controlledvocabulary.language.pass_valley_yali=Pass Valley Yali controlledvocabulary.language.patamona=Patamona controlledvocabulary.language.patani=Patani -controlledvocabulary.language.patax�_h�-ha-h�e=Patax� H�-Ha-H�e +controlledvocabulary.language.pataxo_ha-ha-hae=Pataxó Hã-Ha-Hãe controlledvocabulary.language.patep=Patep controlledvocabulary.language.pathiya=Pathiya controlledvocabulary.language.patpatar=Patpatar @@ -5800,7 +5797,7 @@ controlledvocabulary.language.pattani_malay=Pattani Malay controlledvocabulary.language.pattapu=Pattapu controlledvocabulary.language.patwin=Patwin controlledvocabulary.language.paulohi=Paulohi -controlledvocabulary.language.paumar�=Paumar� +controlledvocabulary.language.paumari=Paumarí controlledvocabulary.language.paunaka=Paunaka controlledvocabulary.language.pauri_bareli=Pauri Bareli controlledvocabulary.language.pauserna=Pauserna @@ -5831,13 +5828,13 @@ controlledvocabulary.language.peranakan_indonesian=Peranakan Indonesian controlledvocabulary.language.pere=Pere controlledvocabulary.language.peripheral_mongolian=Peripheral Mongolian controlledvocabulary.language.pero=Pero -controlledvocabulary.language.persian_(farsi)=Persian (Farsi) +controlledvocabulary.language.persian_(farsi)=Persian, Persian (Farsi) controlledvocabulary.language.peruvian_sign_language=Peruvian Sign Language controlledvocabulary.language.pesse=Pesse controlledvocabulary.language.petapa_zapotec=Petapa Zapotec controlledvocabulary.language.petats=Petats controlledvocabulary.language.petjo=Petjo -controlledvocabulary.language.pe�oles_mixtec=Pe�oles Mixtec +controlledvocabulary.language.penoles_mixtec=Peñoles Mixtec controlledvocabulary.language.pfaelzisch=Pfaelzisch controlledvocabulary.language.phai=Phai controlledvocabulary.language.phake=Phake @@ -5871,14 +5868,14 @@ controlledvocabulary.language.piame=Piame controlledvocabulary.language.piapoco=Piapoco controlledvocabulary.language.piaroa=Piaroa controlledvocabulary.language.picard=Picard -controlledvocabulary.language.pichis_ash�ninka=Pichis Ash�ninka +controlledvocabulary.language.pichis_asheninka=Pichis Ashéninka controlledvocabulary.language.pictish=Pictish controlledvocabulary.language.pidgin_delaware=Pidgin Delaware controlledvocabulary.language.piemontese=Piemontese controlledvocabulary.language.pijao=Pijao controlledvocabulary.language.pije=Pije controlledvocabulary.language.pijin=Pijin -controlledvocabulary.language.pilag�=Pilag� +controlledvocabulary.language.pilaga=Pilagá controlledvocabulary.language.pileni=Pileni controlledvocabulary.language.pima_bajo=Pima Bajo controlledvocabulary.language.pimbwe=Pimbwe @@ -5892,7 +5889,7 @@ controlledvocabulary.language.pinotepa_nacional_mixtec=Pinotepa Nacional Mixtec controlledvocabulary.language.pintupi-luritja=Pintupi-Luritja controlledvocabulary.language.pinyin=Pinyin controlledvocabulary.language.pipil=Pipil -controlledvocabulary.language.pirah�=Pirah� +controlledvocabulary.language.piraha=Pirahã controlledvocabulary.language.piratapuyo=Piratapuyo controlledvocabulary.language.pirlatapa=Pirlatapa controlledvocabulary.language.piro=Piro @@ -5921,7 +5918,7 @@ controlledvocabulary.language.pochutec=Pochutec controlledvocabulary.language.podena=Podena controlledvocabulary.language.pogolo=Pogolo controlledvocabulary.language.pohnpeian=Pohnpeian -controlledvocabulary.language.pokang�=Pokang� +controlledvocabulary.language.pokanga=Pokangá controlledvocabulary.language.poke=Poke controlledvocabulary.language.pokomo=Pokomo controlledvocabulary.language.polabian=Polabian @@ -5945,13 +5942,13 @@ controlledvocabulary.language.port_vato=Port Vato controlledvocabulary.language.portuguese=Portuguese controlledvocabulary.language.portuguese_sign_language=Portuguese Sign Language controlledvocabulary.language.potawatomi=Potawatomi -controlledvocabulary.language.potigu�ra=Potigu�ra +controlledvocabulary.language.potiguara=Potiguára controlledvocabulary.language.pottangi_ollar_gadaba=Pottangi Ollar Gadaba controlledvocabulary.language.poumei_naga=Poumei Naga controlledvocabulary.language.pouye=Pouye controlledvocabulary.language.powari=Powari controlledvocabulary.language.powhatan=Powhatan -controlledvocabulary.language.poyan�wa=Poyan�wa +controlledvocabulary.language.poyanawa=Poyanáwa controlledvocabulary.language.prasuni=Prasuni controlledvocabulary.language.primitive_irish=Primitive Irish controlledvocabulary.language.principense=Principense @@ -5973,7 +5970,7 @@ controlledvocabulary.language.pular=Pular controlledvocabulary.language.puluwatese=Puluwatese controlledvocabulary.language.puma=Puma controlledvocabulary.language.pumpokol=Pumpokol -controlledvocabulary.language.pum�=Pum� +controlledvocabulary.language.pume=Pumé controlledvocabulary.language.punan_aput=Punan Aput controlledvocabulary.language.punan_bah-biau=Punan Bah-Biau controlledvocabulary.language.punan_batu_1=Punan Batu 1 @@ -5991,9 +5988,9 @@ controlledvocabulary.language.purari=Purari controlledvocabulary.language.purepecha=Purepecha controlledvocabulary.language.puri=Puri controlledvocabulary.language.purik=Purik -controlledvocabulary.language.purisime�o=Purisime�o +controlledvocabulary.language.purisimeno=Purisimeño controlledvocabulary.language.puroik=Puroik -controlledvocabulary.language.purubor�=Purubor� +controlledvocabulary.language.purubora=Puruborá controlledvocabulary.language.purum=Purum controlledvocabulary.language.putai=Putai controlledvocabulary.language.putoh=Putoh @@ -6002,7 +5999,7 @@ controlledvocabulary.language.puyo=Puyo controlledvocabulary.language.puyo-paekche=Puyo-Paekche controlledvocabulary.language.puyuma=Puyuma controlledvocabulary.language.pwaamei=Pwaamei -controlledvocabulary.language.pwapw�=Pwapw� +controlledvocabulary.language.pwapwa=Pwapwâ controlledvocabulary.language.pwo_eastern_karen=Pwo Eastern Karen controlledvocabulary.language.pwo_northern_karen=Pwo Northern Karen controlledvocabulary.language.pwo_western_karen=Pwo Western Karen @@ -6011,13 +6008,13 @@ controlledvocabulary.language.pye_krumen=Pye Krumen controlledvocabulary.language.pyen=Pyen controlledvocabulary.language.pyu_(myanmar)=Pyu (Myanmar) controlledvocabulary.language.pyu_(papua_new_guinea)=Pyu (Papua New Guinea) -controlledvocabulary.language.p�ez=P�ez -controlledvocabulary.language.p��fang=P��fang -controlledvocabulary.language.p�ri=P�ri -controlledvocabulary.language.p�mono=P�mono -controlledvocabulary.language.p�v�=P�v� -controlledvocabulary.language.p�koot=P�koot -controlledvocabulary.language.pli=P?li +controlledvocabulary.language.paez=Páez +controlledvocabulary.language.paafang=Pááfang +controlledvocabulary.language.pari=Päri +controlledvocabulary.language.pemono=Pémono +controlledvocabulary.language.peve=Pévé +controlledvocabulary.language.pokoot=Pökoot +controlledvocabulary.language.pali=Pāli, Pali controlledvocabulary.language.q'anjob'al=Q'anjob'al controlledvocabulary.language.qabiao=Qabiao controlledvocabulary.language.qaqet=Qaqet @@ -6033,14 +6030,14 @@ controlledvocabulary.language.quebec_sign_language=Quebec Sign Language controlledvocabulary.language.quechan=Quechan controlledvocabulary.language.quechua=Quechua controlledvocabulary.language.quenya=Quenya -controlledvocabulary.language.quer�taro_otomi=Quer�taro Otomi +controlledvocabulary.language.queretaro_otomi=Querétaro Otomi controlledvocabulary.language.quetzaltepec_mixe=Quetzaltepec Mixe controlledvocabulary.language.queyu=Queyu controlledvocabulary.language.quiavicuzas_zapotec=Quiavicuzas Zapotec controlledvocabulary.language.quileute=Quileute controlledvocabulary.language.quinault=Quinault controlledvocabulary.language.quinqui=Quinqui -controlledvocabulary.language.quioquitani-quier�_zapotec=Quioquitani-Quier� Zapotec +controlledvocabulary.language.quioquitani-quieri_zapotec=Quioquitani-Quierí Zapotec controlledvocabulary.language.quiotepec_chinantec=Quiotepec Chinantec controlledvocabulary.language.quiripi=Quiripi controlledvocabulary.language.rabha=Rabha @@ -6085,7 +6082,7 @@ controlledvocabulary.language.rawang=Rawang controlledvocabulary.language.rawat=Rawat controlledvocabulary.language.rawngtu_chin=Rawngtu Chin controlledvocabulary.language.rawo=Rawo -controlledvocabulary.language.ray�n_zoque=Ray�n Zoque +controlledvocabulary.language.rayon_zoque=Rayón Zoque controlledvocabulary.language.razajerdi=Razajerdi controlledvocabulary.language.red_gelao=Red Gelao controlledvocabulary.language.reel=Reel @@ -6107,7 +6104,7 @@ controlledvocabulary.language.rer_bare=Rer Bare controlledvocabulary.language.rerau=Rerau controlledvocabulary.language.rerep=Rerep controlledvocabulary.language.reshe=Reshe -controlledvocabulary.language.res�garo=Res�garo +controlledvocabulary.language.resigaro=Resígaro controlledvocabulary.language.retta=Retta controlledvocabulary.language.reyesano=Reyesano controlledvocabulary.language.riang_(india)=Riang (India) @@ -6118,7 +6115,7 @@ controlledvocabulary.language.ribun=Ribun controlledvocabulary.language.rigwe=Rigwe controlledvocabulary.language.rikbaktsa=Rikbaktsa controlledvocabulary.language.rinconada_bikol=Rinconada Bikol -controlledvocabulary.language.rinc�n_zapotec=Rinc�n Zapotec +controlledvocabulary.language.rincon_zapotec=Rincón Zapotec controlledvocabulary.language.ringgou=Ringgou controlledvocabulary.language.ririo=Ririo controlledvocabulary.language.rishiwa=Rishiwa @@ -6160,6 +6157,7 @@ controlledvocabulary.language.rukai=Rukai controlledvocabulary.language.ruma=Ruma controlledvocabulary.language.rumai_palaung=Rumai Palaung controlledvocabulary.language.rumu=Rumu +controlledvocabulary.language.kirundi=Rundi, Kirundi controlledvocabulary.language.runga=Runga controlledvocabulary.language.rungtu_chin=Rungtu Chin controlledvocabulary.language.rungus=Rungus @@ -6175,8 +6173,8 @@ controlledvocabulary.language.ruund=Ruund controlledvocabulary.language.ruwila=Ruwila controlledvocabulary.language.rwa=Rwa controlledvocabulary.language.rwandan_sign_language=Rwandan Sign Language -controlledvocabulary.language.r�union_creole_french=R�union Creole French -controlledvocabulary.language.rzi=R?zi?? +controlledvocabulary.language.reunion_creole_french=Réunion Creole French +controlledvocabulary.language.razihi=Rāziḥī controlledvocabulary.language.s'gaw_karen=S'gaw Karen controlledvocabulary.language.sa=Sa controlledvocabulary.language.sa'a=Sa'a @@ -6190,11 +6188,11 @@ controlledvocabulary.language.saba=Saba controlledvocabulary.language.sabaean=Sabaean controlledvocabulary.language.sabah_bisaya=Sabah Bisaya controlledvocabulary.language.sabah_malay=Sabah Malay -controlledvocabulary.language.saban�=Saban� +controlledvocabulary.language.sabane=Sabanê controlledvocabulary.language.sabaot=Sabaot controlledvocabulary.language.sabine=Sabine controlledvocabulary.language.sabu=Sabu -controlledvocabulary.language.sab�m=Sab�m +controlledvocabulary.language.sabum=Sabüm controlledvocabulary.language.sacapulteco=Sacapulteco controlledvocabulary.language.sadri=Sadri controlledvocabulary.language.saek=Saek @@ -6216,7 +6214,7 @@ controlledvocabulary.language.sakalava_malagasy=Sakalava Malagasy controlledvocabulary.language.sakao=Sakao controlledvocabulary.language.sakata=Sakata controlledvocabulary.language.sake=Sake -controlledvocabulary.language.sakirabi�=Sakirabi� +controlledvocabulary.language.sakirabia=Sakirabiá controlledvocabulary.language.sakizaya=Sakizaya controlledvocabulary.language.sala=Sala controlledvocabulary.language.salampasu=Salampasu @@ -6230,7 +6228,7 @@ controlledvocabulary.language.salinan=Salinan controlledvocabulary.language.sallands=Sallands controlledvocabulary.language.salt-yui=Salt-Yui controlledvocabulary.language.saluan=Saluan -controlledvocabulary.language.salum�=Salum� +controlledvocabulary.language.saluma=Salumá controlledvocabulary.language.salvadoran_sign_language=Salvadoran Sign Language controlledvocabulary.language.sam=Sam controlledvocabulary.language.samaritan=Samaritan @@ -6255,21 +6253,21 @@ controlledvocabulary.language.sampang=Sampang controlledvocabulary.language.samre=Samre controlledvocabulary.language.samtao=Samtao controlledvocabulary.language.samvedi=Samvedi -controlledvocabulary.language.san_agust�n_mixtepec_zapotec=San Agust�n Mixtepec Zapotec +controlledvocabulary.language.san_agustin_mixtepec_zapotec=San Agustín Mixtepec Zapotec controlledvocabulary.language.san_baltazar_loxicha_zapotec=San Baltazar Loxicha Zapotec controlledvocabulary.language.san_blas_kuna=San Blas Kuna controlledvocabulary.language.san_dionisio_del_mar_huave=San Dionisio Del Mar Huave controlledvocabulary.language.san_felipe_otlaltepec_popoloca=San Felipe Otlaltepec Popoloca controlledvocabulary.language.san_francisco_del_mar_huave=San Francisco Del Mar Huave controlledvocabulary.language.san_francisco_matlatzinca=San Francisco Matlatzinca -controlledvocabulary.language.san_jer�nimo_tec�atl_mazatec=San Jer�nimo Tec�atl Mazatec +controlledvocabulary.language.san_jeronimo_tecoatl_mazatec=San Jerónimo Tecóatl Mazatec controlledvocabulary.language.san_juan_atzingo_popoloca=San Juan Atzingo Popoloca controlledvocabulary.language.san_juan_colorado_mixtec=San Juan Colorado Mixtec controlledvocabulary.language.san_juan_teita_mixtec=San Juan Teita Mixtec -controlledvocabulary.language.san_lu�s_temalacayuca_popoloca=San Lu�s Temalacayuca Popoloca +controlledvocabulary.language.san_luis_temalacayuca_popoloca=San Luís Temalacayuca Popoloca controlledvocabulary.language.san_marcos_tlacoyalco_popoloca=San Marcos Tlacoyalco Popoloca -controlledvocabulary.language.san_mart�n_itunyoso_triqui=San Mart�n Itunyoso Triqui -controlledvocabulary.language.san_mart�n_quechua=San Mart�n Quechua +controlledvocabulary.language.san_martin_itunyoso_triqui=San Martín Itunyoso Triqui +controlledvocabulary.language.san_martin_quechua=San Martín Quechua controlledvocabulary.language.san_mateo_del_mar_huave=San Mateo Del Mar Huave controlledvocabulary.language.san_miguel_creole_french=San Miguel Creole French controlledvocabulary.language.san_miguel_el_grande_mixtec=San Miguel El Grande Mixtec @@ -6277,9 +6275,9 @@ controlledvocabulary.language.san_miguel_piedras_mixtec=San Miguel Piedras Mixte controlledvocabulary.language.san_pedro_amuzgos_amuzgo=San Pedro Amuzgos Amuzgo controlledvocabulary.language.san_pedro_quiatoni_zapotec=San Pedro Quiatoni Zapotec controlledvocabulary.language.san_salvador_kongo=San Salvador Kongo -controlledvocabulary.language.san_vicente_coatl�n_zapotec=San Vicente Coatl�n Zapotec +controlledvocabulary.language.san_vicente_coatlan_zapotec=San Vicente Coatlán Zapotec controlledvocabulary.language.sanaani_arabic=Sanaani Arabic -controlledvocabulary.language.sanapan�=Sanapan� +controlledvocabulary.language.sanapana=Sanapaná controlledvocabulary.language.sandawe=Sandawe controlledvocabulary.language.sanga_(democratic_republic_of_congo)=Sanga (Democratic Republic of Congo) controlledvocabulary.language.sanga_(nigeria)=Sanga (Nigeria) @@ -6298,33 +6296,33 @@ controlledvocabulary.language.sanie=Sanie controlledvocabulary.language.saniyo-hiyewe=Saniyo-Hiyewe controlledvocabulary.language.sankaran_maninka=Sankaran Maninka controlledvocabulary.language.sansi=Sansi -controlledvocabulary.language.sanskrit_(saskta)=Sanskrit (Sa?sk?ta) +controlledvocabulary.language.sanskrit_(samskrta)=Sanskrit (Saṁskṛta), Sanskrit controlledvocabulary.language.santa_ana_de_tusi_pasco_quechua=Santa Ana de Tusi Pasco Quechua controlledvocabulary.language.santa_catarina_albarradas_zapotec=Santa Catarina Albarradas Zapotec -controlledvocabulary.language.santa_in�s_ahuatempan_popoloca=Santa In�s Ahuatempan Popoloca -controlledvocabulary.language.santa_in�s_yatzechi_zapotec=Santa In�s Yatzechi Zapotec -controlledvocabulary.language.santa_luc�a_monteverde_mixtec=Santa Luc�a Monteverde Mixtec -controlledvocabulary.language.santa_mar�a_del_mar_huave=Santa Mar�a Del Mar Huave -controlledvocabulary.language.santa_mar�a_la_alta_nahuatl=Santa Mar�a La Alta Nahuatl -controlledvocabulary.language.santa_mar�a_quiegolani_zapotec=Santa Mar�a Quiegolani Zapotec -controlledvocabulary.language.santa_mar�a_zacatepec_mixtec=Santa Mar�a Zacatepec Mixtec +controlledvocabulary.language.santa_ines_ahuatempan_popoloca=Santa Inés Ahuatempan Popoloca +controlledvocabulary.language.santa_ines_yatzechi_zapotec=Santa Inés Yatzechi Zapotec +controlledvocabulary.language.santa_lucia_monteverde_mixtec=Santa Lucía Monteverde Mixtec +controlledvocabulary.language.santa_maria_del_mar_huave=Santa María Del Mar Huave +controlledvocabulary.language.santa_maria_la_alta_nahuatl=Santa María La Alta Nahuatl +controlledvocabulary.language.santa_maria_quiegolani_zapotec=Santa María Quiegolani Zapotec +controlledvocabulary.language.santa_maria_zacatepec_mixtec=Santa María Zacatepec Mixtec controlledvocabulary.language.santa_teresa_cora=Santa Teresa Cora controlledvocabulary.language.santali=Santali controlledvocabulary.language.santiago_xanica_zapotec=Santiago Xanica Zapotec controlledvocabulary.language.santiago_del_estero_quichua=Santiago del Estero Quichua controlledvocabulary.language.santo_domingo_albarradas_zapotec=Santo Domingo Albarradas Zapotec -controlledvocabulary.language.sanum�=Sanum� +controlledvocabulary.language.sanuma=Sanumá controlledvocabulary.language.saparua=Saparua controlledvocabulary.language.sapo=Sapo controlledvocabulary.language.saponi=Saponi controlledvocabulary.language.saposa=Saposa controlledvocabulary.language.sapuan=Sapuan -controlledvocabulary.language.sap�=Sap� +controlledvocabulary.language.sape=Sapé controlledvocabulary.language.sar=Sar controlledvocabulary.language.sara=Sara controlledvocabulary.language.sara_kaba=Sara Kaba controlledvocabulary.language.sara_kaba_deme=Sara Kaba Deme -controlledvocabulary.language.sara_kaba_n��=Sara Kaba N�� +controlledvocabulary.language.sara_kaba_naa=Sara Kaba Náà controlledvocabulary.language.saraiki=Saraiki controlledvocabulary.language.saramaccan=Saramaccan controlledvocabulary.language.sarangani_blaan=Sarangani Blaan @@ -6345,9 +6343,9 @@ controlledvocabulary.language.sasaru=Sasaru controlledvocabulary.language.sassarese_sardinian=Sassarese Sardinian controlledvocabulary.language.satawalese=Satawalese controlledvocabulary.language.saterfriesisch=Saterfriesisch -controlledvocabulary.language.sater�-maw�=Sater�-Maw� +controlledvocabulary.language.satere-mawe=Sateré-Mawé controlledvocabulary.language.saudi_arabian_sign_language=Saudi Arabian Sign Language -controlledvocabulary.language.sauraseni_prkrit=Sauraseni Pr?krit +controlledvocabulary.language.sauraseni_prakrit=Sauraseni Prākrit controlledvocabulary.language.saurashtra=Saurashtra controlledvocabulary.language.sauri=Sauri controlledvocabulary.language.sauria_paharia=Sauria Paharia @@ -6411,7 +6409,7 @@ controlledvocabulary.language.semnam=Semnam controlledvocabulary.language.semnani=Semnani controlledvocabulary.language.sempan=Sempan controlledvocabulary.language.sena=Sena -controlledvocabulary.language.senara_s�noufo=Senara S�noufo +controlledvocabulary.language.senara_senoufo=Senara Sénoufo controlledvocabulary.language.senaya=Senaya controlledvocabulary.language.sene=Sene controlledvocabulary.language.seneca=Seneca @@ -6515,6 +6513,7 @@ controlledvocabulary.language.siberian_tatar=Siberian Tatar controlledvocabulary.language.sibu_melanau=Sibu Melanau controlledvocabulary.language.sicanian=Sicanian controlledvocabulary.language.sicel=Sicel +controlledvocabulary.language.nuosu=Sichuan Yi, Nuosu controlledvocabulary.language.sicilian=Sicilian controlledvocabulary.language.siculo_arabic=Siculo Arabic controlledvocabulary.language.sidamo=Sidamo @@ -6522,7 +6521,7 @@ controlledvocabulary.language.sidetic=Sidetic controlledvocabulary.language.sie=Sie controlledvocabulary.language.sierra_leone_sign_language=Sierra Leone Sign Language controlledvocabulary.language.sierra_negra_nahuatl=Sierra Negra Nahuatl -controlledvocabulary.language.sierra_de_ju�rez_zapotec=Sierra de Ju�rez Zapotec +controlledvocabulary.language.sierra_de_juarez_zapotec=Sierra de Juárez Zapotec controlledvocabulary.language.sighu=Sighu controlledvocabulary.language.sihan=Sihan controlledvocabulary.language.sihuas_ancash_quechua=Sihuas Ancash Quechua @@ -6572,7 +6571,7 @@ controlledvocabulary.language.siraya=Siraya controlledvocabulary.language.sirenik_yupik=Sirenik Yupik controlledvocabulary.language.siri=Siri controlledvocabulary.language.siriano=Siriano -controlledvocabulary.language.sirion�=Sirion� +controlledvocabulary.language.siriono=Sirionó controlledvocabulary.language.sirmauri=Sirmauri controlledvocabulary.language.siroi=Siroi controlledvocabulary.language.sissala=Sissala @@ -6593,9 +6592,9 @@ controlledvocabulary.language.slave_(athapascan)=Slave (Athapascan) controlledvocabulary.language.slavomolisano=Slavomolisano controlledvocabulary.language.slovak=Slovak controlledvocabulary.language.slovakian_sign_language=Slovakian Sign Language -controlledvocabulary.language.slovenian=Slovenian +controlledvocabulary.language.slovenian=Slovenian, Slovene controlledvocabulary.language.small_flowery_miao=Small Flowery Miao -controlledvocabulary.language.sm�rky_kanum=Sm�rky Kanum +controlledvocabulary.language.smarky_kanum=Smärky Kanum controlledvocabulary.language.snohomish=Snohomish controlledvocabulary.language.so_(democratic_republic_of_congo)=So (Democratic Republic of Congo) controlledvocabulary.language.so'a=So'a @@ -6652,11 +6651,12 @@ controlledvocabulary.language.south_giziga=South Giziga controlledvocabulary.language.south_lembata=South Lembata controlledvocabulary.language.south_marquesan=South Marquesan controlledvocabulary.language.south_muyu=South Muyu +controlledvocabulary.language.southern_ndebele=South Ndebele, Southern Ndebele controlledvocabulary.language.south_nuaulu=South Nuaulu controlledvocabulary.language.south_picene=South Picene controlledvocabulary.language.south_slavey=South Slavey controlledvocabulary.language.south_tairora=South Tairora -controlledvocabulary.language.south_ucayali_ash�ninka=South Ucayali Ash�ninka +controlledvocabulary.language.south_ucayali_asheninka=South Ucayali Ashéninka controlledvocabulary.language.south_watut=South Watut controlledvocabulary.language.south_west_bay=South West Bay controlledvocabulary.language.southeast_ambrym=Southeast Ambrym @@ -6665,9 +6665,9 @@ controlledvocabulary.language.southeast_ijo=Southeast Ijo controlledvocabulary.language.southeast_pashai=Southeast Pashai controlledvocabulary.language.southeast_tasmanian=Southeast Tasmanian controlledvocabulary.language.southeastern_dinka=Southeastern Dinka -controlledvocabulary.language.southeastern_ixtl�n_zapotec=Southeastern Ixtl�n Zapotec +controlledvocabulary.language.southeastern_ixtlan_zapotec=Southeastern Ixtlán Zapotec controlledvocabulary.language.southeastern_kolami=Southeastern Kolami -controlledvocabulary.language.southeastern_nochixtl�n_mixtec=Southeastern Nochixtl�n Mixtec +controlledvocabulary.language.southeastern_nochixtlan_mixtec=Southeastern Nochixtlán Mixtec controlledvocabulary.language.southeastern_pomo=Southeastern Pomo controlledvocabulary.language.southeastern_puebla_nahuatl=Southeastern Puebla Nahuatl controlledvocabulary.language.southeastern_tarahumara=Southeastern Tarahumara @@ -6681,7 +6681,7 @@ controlledvocabulary.language.southern_balochi=Southern Balochi controlledvocabulary.language.southern_betsimisaraka_malagasy=Southern Betsimisaraka Malagasy controlledvocabulary.language.southern_binukidnon=Southern Binukidnon controlledvocabulary.language.southern_birifor=Southern Birifor -controlledvocabulary.language.southern_bobo_madar�=Southern Bobo Madar� +controlledvocabulary.language.southern_bobo_madare=Southern Bobo Madaré controlledvocabulary.language.southern_bontok=Southern Bontok controlledvocabulary.language.southern_carrier=Southern Carrier controlledvocabulary.language.southern_catanduanes_bikol=Southern Catanduanes Bikol @@ -6707,8 +6707,7 @@ controlledvocabulary.language.southern_mashan_hmong=Southern Mashan Hmong controlledvocabulary.language.southern_mnong=Southern Mnong controlledvocabulary.language.southern_muji=Southern Muji controlledvocabulary.language.southern_nago=Southern Nago -controlledvocabulary.language.southern_nambiku�ra=Southern Nambiku�ra -controlledvocabulary.language.southern_ndebele=Southern Ndebele +controlledvocabulary.language.southern_nambikuara=Southern Nambikuára controlledvocabulary.language.southern_ngbandi=Southern Ngbandi controlledvocabulary.language.southern_nicobarese=Southern Nicobarese controlledvocabulary.language.southern_nisu=Southern Nisu @@ -6763,7 +6762,6 @@ controlledvocabulary.language.sowanda=Sowanda controlledvocabulary.language.soyaltepec_mazatec=Soyaltepec Mazatec controlledvocabulary.language.soyaltepec_mixtec=Soyaltepec Mixtec controlledvocabulary.language.spanish_sign_language=Spanish Sign Language -controlledvocabulary.language.spanish,_castilian=Spanish, Castilian controlledvocabulary.language.spiti_bhoti=Spiti Bhoti controlledvocabulary.language.spokane=Spokane controlledvocabulary.language.squamish=Squamish @@ -6823,20 +6821,20 @@ controlledvocabulary.language.surgujia=Surgujia controlledvocabulary.language.surigaonon=Surigaonon controlledvocabulary.language.surjapuri=Surjapuri controlledvocabulary.language.sursurunga=Sursurunga -controlledvocabulary.language.suruah�=Suruah� +controlledvocabulary.language.suruaha=Suruahá controlledvocabulary.language.surubu=Surubu -controlledvocabulary.language.suru�=Suru� -controlledvocabulary.language.suru�_do_par�=Suru� Do Par� +controlledvocabulary.language.surui=Suruí +controlledvocabulary.language.surui_do_para=Suruí Do Pará controlledvocabulary.language.susquehannock=Susquehannock controlledvocabulary.language.susu=Susu controlledvocabulary.language.susuami=Susuami controlledvocabulary.language.suundi=Suundi controlledvocabulary.language.suwawa=Suwawa -controlledvocabulary.language.suy�=Suy� +controlledvocabulary.language.suya=Suyá controlledvocabulary.language.svan=Svan controlledvocabulary.language.swabian=Swabian -controlledvocabulary.language.swahili=Swahili controlledvocabulary.language.swahili_(individual_language)=Swahili (individual language) +controlledvocabulary.language.swahili=Swahili, Swahili (macrolanguage) controlledvocabulary.language.swampy_cree=Swampy Cree controlledvocabulary.language.swati=Swati controlledvocabulary.language.swedish=Swedish @@ -6849,11 +6847,10 @@ controlledvocabulary.language.swo=Swo controlledvocabulary.language.syenara_senoufo=Syenara Senoufo controlledvocabulary.language.sylheti=Sylheti controlledvocabulary.language.syriac=Syriac -controlledvocabulary.language.s�liba=S�liba -controlledvocabulary.language.s�o_paulo_kaing�ng=S�o Paulo Kaing�ng -controlledvocabulary.language.s�otomense=S�otomense -controlledvocabulary.language.s�c�t�_s�noufo=S�c�t� S�noufo -controlledvocabulary.language.s�=S� +controlledvocabulary.language.sao_paulo_kaingang=São Paulo Kaingáng +controlledvocabulary.language.saotomense=Sãotomense +controlledvocabulary.language.sicite_senoufo=Sìcìté Sénoufo +controlledvocabulary.language.so=Sô controlledvocabulary.language.t'apo=T'apo controlledvocabulary.language.t'en=T'en controlledvocabulary.language.ta'izzi-adeni_arabic=Ta'izzi-Adeni Arabic @@ -6897,12 +6894,12 @@ controlledvocabulary.language.tai=Tai controlledvocabulary.language.tai_daeng=Tai Daeng controlledvocabulary.language.tai_dam=Tai Dam controlledvocabulary.language.tai_do=Tai Do -controlledvocabulary.language.tai_d�n=Tai D�n +controlledvocabulary.language.tai_don=Tai Dón controlledvocabulary.language.tai_hongjin=Tai Hongjin controlledvocabulary.language.tai_laing=Tai Laing controlledvocabulary.language.tai_loi=Tai Loi controlledvocabulary.language.tai_long=Tai Long -controlledvocabulary.language.tai_n�a=Tai N�a +controlledvocabulary.language.tai_nua=Tai Nüa controlledvocabulary.language.tai_pao=Tai Pao controlledvocabulary.language.tai_thanh=Tai Thanh controlledvocabulary.language.tai_ya=Tai Ya @@ -6977,14 +6974,14 @@ controlledvocabulary.language.tangoa=Tangoa controlledvocabulary.language.tanguat=Tanguat controlledvocabulary.language.tangut=Tangut controlledvocabulary.language.tanimbili=Tanimbili -controlledvocabulary.language.tanimuca-retuar�=Tanimuca-Retuar� +controlledvocabulary.language.tanimuca-retuara=Tanimuca-Retuarã controlledvocabulary.language.tanjijili=Tanjijili controlledvocabulary.language.tanosy_malagasy=Tanosy Malagasy controlledvocabulary.language.tanudan_kalinga=Tanudan Kalinga controlledvocabulary.language.tanzanian_sign_language=Tanzanian Sign Language controlledvocabulary.language.tapei=Tapei -controlledvocabulary.language.tapiet�=Tapiet� -controlledvocabulary.language.tapirap�=Tapirap� +controlledvocabulary.language.tapiete=Tapieté +controlledvocabulary.language.tapirape=Tapirapé controlledvocabulary.language.tarao_naga=Tarao Naga controlledvocabulary.language.tareng=Tareng controlledvocabulary.language.tariana=Tariana @@ -7014,7 +7011,7 @@ controlledvocabulary.language.tavoyan=Tavoyan controlledvocabulary.language.tavringer_romani=Tavringer Romani controlledvocabulary.language.tawala=Tawala controlledvocabulary.language.tawallammat_tamajaq=Tawallammat Tamajaq -controlledvocabulary.language.tawand�=Tawand� +controlledvocabulary.language.tawande=Tawandê controlledvocabulary.language.tawang_monpa=Tawang Monpa controlledvocabulary.language.tawara=Tawara controlledvocabulary.language.taworta=Taworta @@ -7032,7 +7029,7 @@ controlledvocabulary.language.te'un=Te'un controlledvocabulary.language.teanu=Teanu controlledvocabulary.language.tebul_sign_language=Tebul Sign Language controlledvocabulary.language.tebul_ure_dogon=Tebul Ure Dogon -controlledvocabulary.language.tecpatl�n_totonac=Tecpatl�n Totonac +controlledvocabulary.language.tecpatlan_totonac=Tecpatlán Totonac controlledvocabulary.language.tedaga=Tedaga controlledvocabulary.language.tedim_chin=Tedim Chin controlledvocabulary.language.tee=Tee @@ -7058,7 +7055,7 @@ controlledvocabulary.language.temacine_tamazight=Temacine Tamazight controlledvocabulary.language.temascaltepec_nahuatl=Temascaltepec Nahuatl controlledvocabulary.language.tembo_(kitembo)=Tembo (Kitembo) controlledvocabulary.language.tembo_(motembo)=Tembo (Motembo) -controlledvocabulary.language.temb�=Temb� +controlledvocabulary.language.tembe=Tembé controlledvocabulary.language.teme=Teme controlledvocabulary.language.temein=Temein controlledvocabulary.language.temi=Temi @@ -7094,7 +7091,7 @@ controlledvocabulary.language.teribe=Teribe controlledvocabulary.language.terik=Terik controlledvocabulary.language.termanu=Termanu controlledvocabulary.language.ternate=Ternate -controlledvocabulary.language.ternate�o=Ternate�o +controlledvocabulary.language.ternateno=Ternateño controlledvocabulary.language.tesaka_malagasy=Tesaka Malagasy controlledvocabulary.language.tese=Tese controlledvocabulary.language.teshenawa=Teshenawa @@ -7112,7 +7109,7 @@ controlledvocabulary.language.tewe=Tewe controlledvocabulary.language.texcatepec_otomi=Texcatepec Otomi controlledvocabulary.language.texistepec_popoluca=Texistepec Popoluca controlledvocabulary.language.texmelucan_zapotec=Texmelucan Zapotec -controlledvocabulary.language.tezoatl�n_mixtec=Tezoatl�n Mixtec +controlledvocabulary.language.tezoatlan_mixtec=Tezoatlán Mixtec controlledvocabulary.language.tha=Tha controlledvocabulary.language.thachanadan=Thachanadan controlledvocabulary.language.thado_chin=Thado Chin @@ -7144,10 +7141,10 @@ controlledvocabulary.language.tibetan_sign_language=Tibetan Sign Language controlledvocabulary.language.tibetan,_tibetan_standard,_central=Tibetan, Tibetan Standard, Central controlledvocabulary.language.tichurong=Tichurong controlledvocabulary.language.ticuna=Ticuna -controlledvocabulary.language.tida�_mixtec=Tida� Mixtec +controlledvocabulary.language.tidaa_mixtec=Tidaá Mixtec controlledvocabulary.language.tidikelt_tamazight=Tidikelt Tamazight controlledvocabulary.language.tidore=Tidore -controlledvocabulary.language.tiemac�w�_bozo=Tiemac�w� Bozo +controlledvocabulary.language.tiemacewe_bozo=Tiemacèwè Bozo controlledvocabulary.language.tiene=Tiene controlledvocabulary.language.tifal=Tifal controlledvocabulary.language.tigak=Tigak @@ -7186,8 +7183,8 @@ controlledvocabulary.language.tiv=Tiv controlledvocabulary.language.tiwa=Tiwa controlledvocabulary.language.tiwi=Tiwi controlledvocabulary.language.tiyaa=Tiyaa -controlledvocabulary.language.ti�fo=Ti�fo -controlledvocabulary.language.ti�yaxo_bozo=Ti�yaxo Bozo +controlledvocabulary.language.tiefo=Tiéfo +controlledvocabulary.language.tieyaxo_bozo=Tiéyaxo Bozo controlledvocabulary.language.tjungundji=Tjungundji controlledvocabulary.language.tjupany=Tjupany controlledvocabulary.language.tjurruru=Tjurruru @@ -7268,7 +7265,7 @@ controlledvocabulary.language.torona=Torona controlledvocabulary.language.torres_strait_creole=Torres Strait Creole controlledvocabulary.language.torricelli=Torricelli controlledvocabulary.language.torwali=Torwali -controlledvocabulary.language.tor�=Tor� +controlledvocabulary.language.tora=Torá controlledvocabulary.language.tosk_albanian=Tosk Albanian controlledvocabulary.language.totela=Totela controlledvocabulary.language.toto=Toto @@ -7277,7 +7274,7 @@ controlledvocabulary.language.totomachapan_zapotec=Totomachapan Zapotec controlledvocabulary.language.totontepec_mixe=Totontepec Mixe controlledvocabulary.language.totoro=Totoro controlledvocabulary.language.touo=Touo -controlledvocabulary.language.toura_(c�te_d'ivoire)=Toura (C�te d'Ivoire) +controlledvocabulary.language.toura_(cote_d'ivoire)=Toura (Côte d'Ivoire) controlledvocabulary.language.toura_(papua_new_guinea)=Toura (Papua New Guinea) controlledvocabulary.language.towei=Towei controlledvocabulary.language.transalpine_gaulish=Transalpine Gaulish @@ -7285,7 +7282,7 @@ controlledvocabulary.language.traveller_danish=Traveller Danish controlledvocabulary.language.traveller_norwegian=Traveller Norwegian controlledvocabulary.language.traveller_scottish=Traveller Scottish controlledvocabulary.language.tregami=Tregami -controlledvocabulary.language.trememb�=Trememb� +controlledvocabulary.language.tremembe=Tremembé controlledvocabulary.language.trieng=Trieng controlledvocabulary.language.trimuris=Trimuris controlledvocabulary.language.tring=Tring @@ -7293,10 +7290,10 @@ controlledvocabulary.language.tringgus-sembaan_bidayuh=Tringgus-Sembaan Bidayuh controlledvocabulary.language.trinidad_and_tobago_sign_language=Trinidad and Tobago Sign Language controlledvocabulary.language.trinidadian_creole_english=Trinidadian Creole English controlledvocabulary.language.trinitario=Trinitario -controlledvocabulary.language.tri�=Tri� -controlledvocabulary.language.truk�=Truk� +controlledvocabulary.language.trio=Trió +controlledvocabulary.language.truka=Truká controlledvocabulary.language.trumai=Trumai -controlledvocabulary.language.ts'�n-lao=Ts'�n-Lao +controlledvocabulary.language.ts'un-lao=Ts'ün-Lao controlledvocabulary.language.tsaangi=Tsaangi controlledvocabulary.language.tsakhur=Tsakhur controlledvocabulary.language.tsakonian=Tsakonian @@ -7307,7 +7304,7 @@ controlledvocabulary.language.tseku=Tseku controlledvocabulary.language.tsetsaut=Tsetsaut controlledvocabulary.language.tshangla=Tshangla controlledvocabulary.language.tsikimba=Tsikimba -controlledvocabulary.language.tsiman�=Tsiman� +controlledvocabulary.language.tsimane=Tsimané controlledvocabulary.language.tsimihety_malagasy=Tsimihety Malagasy controlledvocabulary.language.tsimshian=Tsimshian controlledvocabulary.language.tsishingini=Tsishingini @@ -7336,7 +7333,7 @@ controlledvocabulary.language.tukang_besi_south=Tukang Besi South controlledvocabulary.language.tuki=Tuki controlledvocabulary.language.tukpa=Tukpa controlledvocabulary.language.tukudede=Tukudede -controlledvocabulary.language.tukumanf�d=Tukumanf�d +controlledvocabulary.language.tukumanfed=Tukumanféd controlledvocabulary.language.tula=Tula controlledvocabulary.language.tulai=Tulai controlledvocabulary.language.tulehu=Tulehu @@ -7365,13 +7362,13 @@ controlledvocabulary.language.tunjung=Tunjung controlledvocabulary.language.tunni=Tunni controlledvocabulary.language.tunzu=Tunzu controlledvocabulary.language.tuotomb=Tuotomb -controlledvocabulary.language.tupar�=Tupar� -controlledvocabulary.language.tupinamb�=Tupinamb� +controlledvocabulary.language.tupari=Tuparí +controlledvocabulary.language.tupinamba=Tupinambá controlledvocabulary.language.tupinikin=Tupinikin controlledvocabulary.language.tupuri=Tupuri controlledvocabulary.language.turaka=Turaka controlledvocabulary.language.turi=Turi -controlledvocabulary.language.turiw�ra=Turiw�ra +controlledvocabulary.language.turiwara=Turiwára controlledvocabulary.language.turka=Turka controlledvocabulary.language.turkana=Turkana controlledvocabulary.language.turkish=Turkish @@ -7393,8 +7390,8 @@ controlledvocabulary.language.tuvinian=Tuvinian controlledvocabulary.language.tuwali_ifugao=Tuwali Ifugao controlledvocabulary.language.tuwari=Tuwari controlledvocabulary.language.tuwuli=Tuwuli -controlledvocabulary.language.tuxin�wa=Tuxin�wa -controlledvocabulary.language.tux�=Tux� +controlledvocabulary.language.tuxinawa=Tuxináwa +controlledvocabulary.language.tuxa=Tuxá controlledvocabulary.language.tuyuca=Tuyuca controlledvocabulary.language.twana=Twana controlledvocabulary.language.twendi=Twendi @@ -7404,21 +7401,21 @@ controlledvocabulary.language.tyap=Tyap controlledvocabulary.language.tz'utujil=Tz'utujil controlledvocabulary.language.tzeltal=Tzeltal controlledvocabulary.language.tzotzil=Tzotzil -controlledvocabulary.language.t�y=T�y -controlledvocabulary.language.t�y_sa_pa=T�y Sa Pa -controlledvocabulary.language.t�y_tac=T�y Tac -controlledvocabulary.language.t��n=T��n -controlledvocabulary.language.t�batulabal=T�batulabal +controlledvocabulary.language.tay=Tày +controlledvocabulary.language.tay_sa_pa=Tày Sa Pa +controlledvocabulary.language.tay_tac=Tày Tac +controlledvocabulary.language.teen=Téén +controlledvocabulary.language.tubatulabal=Tübatulabal controlledvocabulary.language.u=U controlledvocabulary.language.uab_meto=Uab Meto -controlledvocabulary.language.uamu�=Uamu� +controlledvocabulary.language.uamue=Uamué controlledvocabulary.language.uare=Uare controlledvocabulary.language.ubaghara=Ubaghara controlledvocabulary.language.ubang=Ubang controlledvocabulary.language.ubi=Ubi controlledvocabulary.language.ubir=Ubir controlledvocabulary.language.ubykh=Ubykh -controlledvocabulary.language.ucayali-yur�a_ash�ninka=Ucayali-Yur�a Ash�ninka +controlledvocabulary.language.ucayali-yurua_asheninka=Ucayali-Yurúa Ashéninka controlledvocabulary.language.uda=Uda controlledvocabulary.language.udi=Udi controlledvocabulary.language.udihe=Udihe @@ -7466,7 +7463,7 @@ controlledvocabulary.language.umeda=Umeda controlledvocabulary.language.umiida=Umiida controlledvocabulary.language.umiray_dumaget_agta=Umiray Dumaget Agta controlledvocabulary.language.umon=Umon -controlledvocabulary.language.umot�na=Umot�na +controlledvocabulary.language.umotina=Umotína controlledvocabulary.language.umpila=Umpila controlledvocabulary.language.una=Una controlledvocabulary.language.unami=Unami @@ -7515,8 +7512,8 @@ controlledvocabulary.language.uru-eu-wau-wau=Uru-Eu-Wau-Wau controlledvocabulary.language.uru-pa-in=Uru-Pa-In controlledvocabulary.language.uruangnirin=Uruangnirin controlledvocabulary.language.uruava=Uruava -controlledvocabulary.language.urub�-kaapor=Urub�-Kaapor -controlledvocabulary.language.urub�-kaapor_sign_language=Urub�-Kaapor Sign Language +controlledvocabulary.language.urubu-kaapor=Urubú-Kaapor +controlledvocabulary.language.urubu-kaapor_sign_language=Urubú-Kaapor Sign Language controlledvocabulary.language.uruguayan_sign_language=Uruguayan Sign Language controlledvocabulary.language.urum=Urum controlledvocabulary.language.urumi=Urumi @@ -7572,7 +7569,7 @@ controlledvocabulary.language.venetian=Venetian controlledvocabulary.language.venetic=Venetic controlledvocabulary.language.venezuelan_sign_language=Venezuelan Sign Language controlledvocabulary.language.vengo=Vengo -controlledvocabulary.language.venture�o=Venture�o +controlledvocabulary.language.ventureno=Ventureño controlledvocabulary.language.veps=Veps controlledvocabulary.language.vera'a=Vera'a controlledvocabulary.language.vestinian=Vestinian @@ -7593,7 +7590,7 @@ controlledvocabulary.language.vitu=Vitu controlledvocabulary.language.vlaams=Vlaams controlledvocabulary.language.vlaamse_gebarentaal=Vlaamse Gebarentaal controlledvocabulary.language.vlax_romani=Vlax Romani -controlledvocabulary.language.volap�k=Volap�k +controlledvocabulary.language.volapuk=Volapük controlledvocabulary.language.volscian=Volscian controlledvocabulary.language.vono=Vono controlledvocabulary.language.voro=Voro @@ -7601,10 +7598,9 @@ controlledvocabulary.language.votic=Votic controlledvocabulary.language.vumbu=Vumbu controlledvocabulary.language.vunapu=Vunapu controlledvocabulary.language.vunjo=Vunjo -controlledvocabulary.language.vur�s=Vur�s +controlledvocabulary.language.vures=Vurës controlledvocabulary.language.vute=Vute controlledvocabulary.language.vwanji=Vwanji -controlledvocabulary.language.v�ro=V�ro controlledvocabulary.language.wa=Wa controlledvocabulary.language.wa'ema=Wa'ema controlledvocabulary.language.waama=Waama @@ -7650,7 +7646,7 @@ controlledvocabulary.language.wakabunga=Wakabunga controlledvocabulary.language.wakawaka=Wakawaka controlledvocabulary.language.wakde=Wakde controlledvocabulary.language.wakhi=Wakhi -controlledvocabulary.language.wakon�=Wakon� +controlledvocabulary.language.wakona=Wakoná controlledvocabulary.language.wala=Wala controlledvocabulary.language.walak=Walak controlledvocabulary.language.walangama=Walangama @@ -7695,13 +7691,13 @@ controlledvocabulary.language.wano=Wano controlledvocabulary.language.wantoat=Wantoat controlledvocabulary.language.wanukaka=Wanukaka controlledvocabulary.language.wanyi=Wanyi -controlledvocabulary.language.wan�=Wan� +controlledvocabulary.language.wane=Wané controlledvocabulary.language.waorani=Waorani controlledvocabulary.language.wapan=Wapan controlledvocabulary.language.wapishana=Wapishana controlledvocabulary.language.wappo=Wappo controlledvocabulary.language.war-jaintia=War-Jaintia -controlledvocabulary.language.wara=Wara +controlledvocabulary.language.wara=Wara W�ra controlledvocabulary.language.warao=Warao controlledvocabulary.language.waray_(australia)=Waray (Australia) controlledvocabulary.language.waray_(philippines)=Waray (Philippines) @@ -7738,7 +7734,7 @@ controlledvocabulary.language.wathawurrung=Wathawurrung controlledvocabulary.language.watiwa=Watiwa controlledvocabulary.language.watubela=Watubela controlledvocabulary.language.waube=Waube -controlledvocabulary.language.waur�=Waur� +controlledvocabulary.language.waura=Waurá controlledvocabulary.language.wauyai=Wauyai controlledvocabulary.language.wawa=Wawa controlledvocabulary.language.wawonii=Wawonii @@ -7746,7 +7742,7 @@ controlledvocabulary.language.waxianghua=Waxianghua controlledvocabulary.language.wayampi=Wayampi controlledvocabulary.language.wayana=Wayana controlledvocabulary.language.wayanad_chetti=Wayanad Chetti -controlledvocabulary.language.wayor�=Wayor� +controlledvocabulary.language.wayoro=Wayoró controlledvocabulary.language.wayu=Wayu controlledvocabulary.language.wayuu=Wayuu controlledvocabulary.language.wedau=Wedau @@ -7785,7 +7781,7 @@ controlledvocabulary.language.western_apache=Western Apache controlledvocabulary.language.western_armenian=Western Armenian controlledvocabulary.language.western_arrarnta=Western Arrarnta controlledvocabulary.language.western_balochi=Western Balochi -controlledvocabulary.language.western_bolivian_guaran�=Western Bolivian Guaran� +controlledvocabulary.language.western_bolivian_guarani=Western Bolivian Guaraní controlledvocabulary.language.western_bru=Western Bru controlledvocabulary.language.western_bukidnon_manobo=Western Bukidnon Manobo controlledvocabulary.language.western_cham=Western Cham @@ -7837,9 +7833,9 @@ controlledvocabulary.language.white_lachi=White Lachi controlledvocabulary.language.whitesands=Whitesands controlledvocabulary.language.wiarumus=Wiarumus controlledvocabulary.language.wichita=Wichita -controlledvocabulary.language.wich�_lhamt�s_g�isnay=Wich� Lhamt�s G�isnay -controlledvocabulary.language.wich�_lhamt�s_nocten=Wich� Lhamt�s Nocten -controlledvocabulary.language.wich�_lhamt�s_vejoz=Wich� Lhamt�s Vejoz +controlledvocabulary.language.wichi_lhamtes_guisnay=Wichí Lhamtés Güisnay +controlledvocabulary.language.wichi_lhamtes_nocten=Wichí Lhamtés Nocten +controlledvocabulary.language.wichi_lhamtes_vejoz=Wichí Lhamtés Vejoz controlledvocabulary.language.wik_ngathan=Wik Ngathan controlledvocabulary.language.wik-epa=Wik-Epa controlledvocabulary.language.wik-iiyanh=Wik-Iiyanh @@ -7850,10 +7846,10 @@ controlledvocabulary.language.wikalkan=Wikalkan controlledvocabulary.language.wikngenchera=Wikngenchera controlledvocabulary.language.wilawila=Wilawila controlledvocabulary.language.wintu=Wintu -controlledvocabulary.language.winy�=Winy� +controlledvocabulary.language.winye=Winyé controlledvocabulary.language.wipi=Wipi controlledvocabulary.language.wiradjuri=Wiradjuri -controlledvocabulary.language.wiraf�d=Wiraf�d +controlledvocabulary.language.wirafed=Wiraféd controlledvocabulary.language.wirangu=Wirangu controlledvocabulary.language.wiru=Wiru controlledvocabulary.language.wiyot=Wiyot @@ -7904,37 +7900,36 @@ controlledvocabulary.language.wuvulu-aua=Wuvulu-Aua controlledvocabulary.language.wuzlam=Wuzlam controlledvocabulary.language.wyandot=Wyandot controlledvocabulary.language.wymysorys=Wymysorys -controlledvocabulary.language.w�ra=W�ra -controlledvocabulary.language.w�pha=W�pha -controlledvocabulary.language.w�_northern=W� Northern -controlledvocabulary.language.w�_southern=W� Southern -controlledvocabulary.language.w�_western=W� Western +controlledvocabulary.language.wapha=Wãpha +controlledvocabulary.language.we_northern=Wè Northern +controlledvocabulary.language.we_southern=Wè Southern +controlledvocabulary.language.we_western=Wè Western controlledvocabulary.language.xaasongaxango=Xaasongaxango controlledvocabulary.language.xadani_zapotec=Xadani Zapotec -controlledvocabulary.language.xakriab�=Xakriab� +controlledvocabulary.language.xakriaba=Xakriabá controlledvocabulary.language.xamtanga=Xamtanga -controlledvocabulary.language.xanagu�a_zapotec=Xanagu�a Zapotec -controlledvocabulary.language.xav�nte=Xav�nte -controlledvocabulary.language.xer�nte=Xer�nte -controlledvocabulary.language.xet�=Xet� +controlledvocabulary.language.xanaguia_zapotec=Xanaguía Zapotec +controlledvocabulary.language.xavante=Xavánte +controlledvocabulary.language.xerente=Xerénte +controlledvocabulary.language.xeta=Xetá controlledvocabulary.language.xhosa=Xhosa controlledvocabulary.language.xiang_chinese=Xiang Chinese controlledvocabulary.language.xibe=Xibe -controlledvocabulary.language.xicotepec_de_ju�rez_totonac=Xicotepec De Ju�rez Totonac +controlledvocabulary.language.xicotepec_de_juarez_totonac=Xicotepec De Juárez Totonac controlledvocabulary.language.xinca=Xinca -controlledvocabulary.language.xing�_asurin�=Xing� Asurin� +controlledvocabulary.language.xingu_asurini=Xingú Asuriní controlledvocabulary.language.xipaya=Xipaya controlledvocabulary.language.xiri=Xiri -controlledvocabulary.language.xiri�na=Xiri�na +controlledvocabulary.language.xiriana=Xiriâna controlledvocabulary.language.xishanba_lalo=Xishanba Lalo controlledvocabulary.language.xokleng=Xokleng -controlledvocabulary.language.xukur�=Xukur� +controlledvocabulary.language.xukuru=Xukurú controlledvocabulary.language.xwela_gbe=Xwela Gbe -controlledvocabulary.language.x�r�c��=X�r�c�� -controlledvocabulary.language.x�r�gur�=X�r�gur� +controlledvocabulary.language.xaracuu=Xârâcùù +controlledvocabulary.language.xaragure=Xârâgurè controlledvocabulary.language.yaaku=Yaaku controlledvocabulary.language.yabarana=Yabarana -controlledvocabulary.language.yaba�na=Yaba�na +controlledvocabulary.language.yabaana=Yabaâna controlledvocabulary.language.yabem=Yabem controlledvocabulary.language.yaben=Yaben controlledvocabulary.language.yabong=Yabong @@ -7967,7 +7962,7 @@ controlledvocabulary.language.yalarnnga=Yalarnnga controlledvocabulary.language.yale=Yale controlledvocabulary.language.yaleba=Yaleba controlledvocabulary.language.yalunka=Yalunka -controlledvocabulary.language.yal�lag_zapotec=Yal�lag Zapotec +controlledvocabulary.language.yalalag_zapotec=Yalálag Zapotec controlledvocabulary.language.yamap=Yamap controlledvocabulary.language.yamba=Yamba controlledvocabulary.language.yambes=Yambes @@ -7980,7 +7975,7 @@ controlledvocabulary.language.yamna=Yamna controlledvocabulary.language.yamongeri=Yamongeri controlledvocabulary.language.yamphu=Yamphu controlledvocabulary.language.yan-nhangu=Yan-nhangu -controlledvocabulary.language.yan-nhau_sign_language=Yan-nha?u Sign Language +controlledvocabulary.language.yan-nhangu_sign_language=Yan-nha?u Sign Language controlledvocabulary.language.yana=Yana controlledvocabulary.language.yanahuanca_pasco_quechua=Yanahuanca Pasco Quechua controlledvocabulary.language.yanda=Yanda @@ -7998,13 +7993,13 @@ controlledvocabulary.language.yangum_dey=Yangum Dey controlledvocabulary.language.yangum_gel=Yangum Gel controlledvocabulary.language.yangum_mon=Yangum Mon controlledvocabulary.language.yankunytjatjara=Yankunytjatjara -controlledvocabulary.language.yanomam�=Yanomam� -controlledvocabulary.language.yanom�mi=Yanom�mi +controlledvocabulary.language.yanomamo=Yanomamö +controlledvocabulary.language.yanomami=Yanomámi controlledvocabulary.language.yansi=Yansi controlledvocabulary.language.yanyuwa=Yanyuwa controlledvocabulary.language.yao=Yao controlledvocabulary.language.yaosakor_asmat=Yaosakor Asmat -controlledvocabulary.language.yaour�=Yaour� +controlledvocabulary.language.yaoure=Yaouré controlledvocabulary.language.yapese=Yapese controlledvocabulary.language.yapunda=Yapunda controlledvocabulary.language.yaqay=Yaqay @@ -8014,7 +8009,7 @@ controlledvocabulary.language.yardliyawarra=Yardliyawarra controlledvocabulary.language.yareba=Yareba controlledvocabulary.language.yareni_zapotec=Yareni Zapotec controlledvocabulary.language.yarluyandi=Yarluyandi -controlledvocabulary.language.yaroam�=Yaroam� +controlledvocabulary.language.yaroame=Yaroamë controlledvocabulary.language.yarsun=Yarsun controlledvocabulary.language.yasa=Yasa controlledvocabulary.language.yassic=Yassic @@ -8030,7 +8025,7 @@ controlledvocabulary.language.yautepec_zapotec=Yautepec Zapotec controlledvocabulary.language.yauyos_quechua=Yauyos Quechua controlledvocabulary.language.yavitero=Yavitero controlledvocabulary.language.yawa=Yawa -controlledvocabulary.language.yawalapit�=Yawalapit� +controlledvocabulary.language.yawalapiti=Yawalapití controlledvocabulary.language.yawanawa=Yawanawa controlledvocabulary.language.yawarawarga=Yawarawarga controlledvocabulary.language.yaweyuha=Yaweyuha @@ -8082,14 +8077,14 @@ controlledvocabulary.language.yirrk-mel=Yirrk-Mel controlledvocabulary.language.yis=Yis controlledvocabulary.language.yitha_yitha=Yitha Yitha controlledvocabulary.language.yoba=Yoba -controlledvocabulary.language.yocobou�_dida=Yocobou� Dida +controlledvocabulary.language.yocoboue_dida=Yocoboué Dida controlledvocabulary.language.yogad=Yogad controlledvocabulary.language.yoidik=Yoidik controlledvocabulary.language.yoke=Yoke controlledvocabulary.language.yokuts=Yokuts controlledvocabulary.language.yola=Yola controlledvocabulary.language.yoloxochitl_mixtec=Yoloxochitl Mixtec -controlledvocabulary.language.yolu_sign_language=Yol?u Sign Language +controlledvocabulary.language.yolngu_sign_language=Yol?u Sign Language controlledvocabulary.language.yom=Yom controlledvocabulary.language.yombe=Yombe controlledvocabulary.language.yonaguni=Yonaguni @@ -8102,7 +8097,7 @@ controlledvocabulary.language.yora=Yora controlledvocabulary.language.yoron=Yoron controlledvocabulary.language.yorta_yorta=Yorta Yorta controlledvocabulary.language.yoruba=Yoruba -controlledvocabulary.language.yosond�a_mixtec=Yosond�a Mixtec +controlledvocabulary.language.yosondua_mixtec=Yosondúa Mixtec controlledvocabulary.language.yotti=Yotti controlledvocabulary.language.youjiang_zhuang=Youjiang Zhuang controlledvocabulary.language.youle_jinuo=Youle Jinuo @@ -8113,7 +8108,7 @@ controlledvocabulary.language.yuanga=Yuanga controlledvocabulary.language.yucatec_maya_sign_language=Yucatec Maya Sign Language controlledvocabulary.language.yucateco=Yucateco controlledvocabulary.language.yuchi=Yuchi -controlledvocabulary.language.yucua�e_mixtec=Yucua�e Mixtec +controlledvocabulary.language.yucuane_mixtec=Yucuañe Mixtec controlledvocabulary.language.yucuna=Yucuna controlledvocabulary.language.yue_chinese=Yue Chinese controlledvocabulary.language.yug=Yug @@ -8130,16 +8125,16 @@ controlledvocabulary.language.yuracare=Yuracare controlledvocabulary.language.yurats=Yurats controlledvocabulary.language.yurok=Yurok controlledvocabulary.language.yuru=Yuru -controlledvocabulary.language.yurut�=Yurut� +controlledvocabulary.language.yuruti=Yurutí controlledvocabulary.language.yutanduchi_mixtec=Yutanduchi Mixtec controlledvocabulary.language.yuwana=Yuwana controlledvocabulary.language.yuyu=Yuyu controlledvocabulary.language.ywom=Ywom -controlledvocabulary.language.y�mana=Y�mana +controlledvocabulary.language.yamana=Yámana controlledvocabulary.language.zaachila_zapotec=Zaachila Zapotec controlledvocabulary.language.zabana=Zabana controlledvocabulary.language.zacatepec_chatino=Zacatepec Chatino -controlledvocabulary.language.zacatl�n-ahuacatl�n-tepetzintla_nahuatl=Zacatl�n-Ahuacatl�n-Tepetzintla Nahuatl +controlledvocabulary.language.zacatlan-ahuacatlan-tepetzintla_nahuatl=Zacatlán-Ahuacatlán-Tepetzintla Nahuatl controlledvocabulary.language.zaghawa=Zaghawa controlledvocabulary.language.zaiwa=Zaiwa controlledvocabulary.language.zakhring=Zakhring @@ -8184,7 +8179,7 @@ controlledvocabulary.language.zimbabwe_sign_language=Zimbabwe Sign Language controlledvocabulary.language.zinza=Zinza controlledvocabulary.language.zire=Zire controlledvocabulary.language.zizilivakan=Zizilivakan -controlledvocabulary.language.zo'�=Zo'� +controlledvocabulary.language.zo'e=Zo'é controlledvocabulary.language.zokhuo=Zokhuo controlledvocabulary.language.zoogocho_zapotec=Zoogocho Zapotec controlledvocabulary.language.zoroastrian_dari=Zoroastrian Dari @@ -8199,20 +8194,20 @@ controlledvocabulary.language.zumbun=Zumbun controlledvocabulary.language.zuni=Zuni controlledvocabulary.language.zuojiang_zhuang=Zuojiang Zhuang controlledvocabulary.language.zyphe_chin=Zyphe Chin -controlledvocabulary.language.z�paro=Z�paro +controlledvocabulary.language.zaparo=Záparo controlledvocabulary.language.stodsde=sTodsde controlledvocabulary.language.us-saare=us-Saare controlledvocabulary.language.ut-hun=ut-Hun controlledvocabulary.language.ut-ma'in=ut-Ma'in -controlledvocabulary.language.�h�n=�h�n -controlledvocabulary.language.�nc�=�nc� -controlledvocabulary.language.�mie=�mie -controlledvocabulary.language.�nge=�nge -controlledvocabulary.language.gwi=Gwi -controlledvocabulary.language.xam=Xam -controlledvocabulary.language.ani=Ani -controlledvocabulary.language.xegwi=Xegwi -controlledvocabulary.language.hua=Hua -controlledvocabulary.language.ungkue=Ungkue -controlledvocabulary.language.x��=X�� -controlledvocabulary.language.not_applicable=Not applicable +controlledvocabulary.language.ahan=Àhàn +controlledvocabulary.language.anca=Áncá +controlledvocabulary.language.omie=Ömie +controlledvocabulary.language.onge=Önge +controlledvocabulary.language.gwi=ǀGwi +controlledvocabulary.language.xam=ǀXam +controlledvocabulary.language.ani=ǁAni +controlledvocabulary.language.xegwi=ǁXegwi +controlledvocabulary.language.hua=ǂHua +controlledvocabulary.language.ungkue=ǂUngkue +controlledvocabulary.language.xoo=ǃXóõ +controlledvocabulary.language.not_applicable=Not Applicable diff --git a/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java b/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java index 42ac42956e2..18c703a71cb 100644 --- a/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/MetadataBlockTest.java @@ -2,6 +2,7 @@ import edu.harvard.iq.dataverse.mocks.MocksFactory; import edu.harvard.iq.dataverse.util.BundleUtil; +import org.apache.commons.lang3.StringUtils; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; @@ -99,7 +100,7 @@ public void testLanguageBundle() throws Exception { if (line.startsWith("\tlanguage")) { String[] values = line.split("\t"); String key = values[2]; - bundleKey = BundleUtil.getKeyFromRawString("controlledvocabulary.language." + key); + bundleKey = StringUtils.stripAccents("controlledvocabulary.language." + key.toLowerCase().replace(" ", "_")); if (languages.contains(bundleKey)) { languages.remove(bundleKey); } else { From 43e14d60ff69e14a29f4d03cb0c08181a0771aa5 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:27:25 -0400 Subject: [PATCH 264/366] fixing language list --- scripts/api/data/metadatablocks/citation.tsv | 4 ++-- src/main/java/propertyFiles/citation.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index ae806edf0f4..37f6cbbfcd6 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -7818,7 +7818,7 @@ language Yamongeri ymg 7681 ymg language Yamphu ybi 7682 ybi language Yan-nhangu jay 7683 jay - language Yan-nhangu Sign Language yhs 7684 yhs Yan-nhaŋu Sign Language + language Yan-nhangu Sign Language yhs 7684 yhs Yan-nhaŋu Sign Language language Yana ynn 7685 ynn language Yanahuanca Pasco Quechua qur 7686 qur language Yanda yda 7687 yda @@ -7927,7 +7927,7 @@ language Yokuts yok 7790 yok language Yola yol 7791 yol language Yoloxochitl Mixtec xty 7792 xty - language Yolngu Sign Language ygs 7793 ygs Yolŋu Sign Language + language Yolngu Sign Language ygs 7793 ygs Yolŋu Sign Language language Yom pil 7794 pil language Yombe yom 7795 yom language Yonaguni yoi 7796 yoi diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 605206066b6..61bddc89c4a 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -7975,7 +7975,7 @@ controlledvocabulary.language.yamna=Yamna controlledvocabulary.language.yamongeri=Yamongeri controlledvocabulary.language.yamphu=Yamphu controlledvocabulary.language.yan-nhangu=Yan-nhangu -controlledvocabulary.language.yan-nhangu_sign_language=Yan-nha?u Sign Language +controlledvocabulary.language.yan-nhangu_sign_language=Yan-nhaŋu Sign Language controlledvocabulary.language.yana=Yana controlledvocabulary.language.yanahuanca_pasco_quechua=Yanahuanca Pasco Quechua controlledvocabulary.language.yanda=Yanda @@ -8084,7 +8084,7 @@ controlledvocabulary.language.yoke=Yoke controlledvocabulary.language.yokuts=Yokuts controlledvocabulary.language.yola=Yola controlledvocabulary.language.yoloxochitl_mixtec=Yoloxochitl Mixtec -controlledvocabulary.language.yolngu_sign_language=Yol?u Sign Language +controlledvocabulary.language.yolngu_sign_language=Yolŋu Sign Language controlledvocabulary.language.yom=Yom controlledvocabulary.language.yombe=Yombe controlledvocabulary.language.yonaguni=Yonaguni From 9f786fe868bf42ddde2568225406a69f1cef1f75 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:30:53 -0400 Subject: [PATCH 265/366] fixing language list --- scripts/api/data/metadatablocks/citation.tsv | 10 +++++----- src/main/java/propertyFiles/citation.properties | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index 37f6cbbfcd6..2f4f49d593a 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -294,7 +294,7 @@ language Akwa akw 153 akw language Akyaung Ari Naga nqy 154 nqy language Al-Sayyid Bedouin Sign Language syy 155 syy - language Alaba-K’abeena alw 156 alw + language Alaba-K'abeena alw 156 alw language Alabama akz 157 akz language Alabat Island Agta dul 158 dul language Alacatlatzala Mixtec mim 159 mim @@ -2408,7 +2408,7 @@ language Gweda grw 2268 grw language Gweno gwe 2269 gwe language Gwere gwr 2270 gwr - language Gwichʼin gwi 2271 gwi + language Gwich'in gwi 2271 gwi language Gyalsumdo gyo 2272 gyo language Gyele gyi 2273 gyi language Gyem gye 2274 gye @@ -2885,7 +2885,7 @@ language Jutish jut 2745 jut language Juwal mwb 2746 mwb language Juxtlahuaca Mixtec vmc 2747 vmc - language Juǀʼhoan ktz 2748 ktz + language Juǀ'hoan ktz 2748 ktz language Jwira-Pepesa jwi 2749 jwi language Jèrriais nrf 2750 nrf language Júma jua 2751 jua @@ -7818,7 +7818,7 @@ language Yamongeri ymg 7681 ymg language Yamphu ybi 7682 ybi language Yan-nhangu jay 7683 jay - language Yan-nhangu Sign Language yhs 7684 yhs Yan-nhaŋu Sign Language + language Yan-nhangu Sign Language yhs 7684 yhs Yan-nhaŋu Sign Language language Yana ynn 7685 ynn language Yanahuanca Pasco Quechua qur 7686 qur language Yanda yda 7687 yda @@ -7927,7 +7927,7 @@ language Yokuts yok 7790 yok language Yola yol 7791 yol language Yoloxochitl Mixtec xty 7792 xty - language Yolngu Sign Language ygs 7793 ygs Yolŋu Sign Language + language Yolngu Sign Language ygs 7793 ygs Yolŋu Sign Language language Yom pil 7794 pil language Yombe yom 7795 yom language Yonaguni yoi 7796 yoi diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 61bddc89c4a..9a3705cbcb7 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -451,7 +451,7 @@ controlledvocabulary.language.akurio=Akurio controlledvocabulary.language.akwa=Akwa controlledvocabulary.language.akyaung_ari_naga=Akyaung Ari Naga controlledvocabulary.language.al-sayyid_bedouin_sign_language=Al-Sayyid Bedouin Sign Language -controlledvocabulary.language.alaba-k’abeena=Alaba-K’abeena +controlledvocabulary.language.alaba-k'abeena=Alaba-K’abeena controlledvocabulary.language.alabama=Alabama controlledvocabulary.language.alabat_island_agta=Alabat Island Agta controlledvocabulary.language.alacatlatzala_mixtec=Alacatlatzala Mixtec @@ -659,7 +659,7 @@ controlledvocabulary.language.aribwatsa=Aribwatsa controlledvocabulary.language.aribwaung=Aribwaung controlledvocabulary.language.arifama-miniafia=Arifama-Miniafia controlledvocabulary.language.arigidi=Arigidi -controlledvocabulary.language.arikapu=Arikapú +controlledvocabulary.language.arikapu=Arikapú controlledvocabulary.language.arikara=Arikara controlledvocabulary.language.arikem=Arikem controlledvocabulary.language.arin=Arin @@ -2565,7 +2565,7 @@ controlledvocabulary.language.gwandara=Gwandara controlledvocabulary.language.gweda=Gweda controlledvocabulary.language.gweno=Gweno controlledvocabulary.language.gwere=Gwere -controlledvocabulary.language.gwichʼin=Gwichʼin +controlledvocabulary.language.gwich'in=Gwichʼin controlledvocabulary.language.gyalsumdo=Gyalsumdo controlledvocabulary.language.gyele=Gyele controlledvocabulary.language.gyem=Gyem @@ -3042,7 +3042,7 @@ controlledvocabulary.language.juruna=Jurúna controlledvocabulary.language.jutish=Jutish controlledvocabulary.language.juwal=Juwal controlledvocabulary.language.juxtlahuaca_mixtec=Juxtlahuaca Mixtec -controlledvocabulary.language.juǀʼhoan=Juǀʼhoan +controlledvocabulary.language.juǀ'hoan=Juǀʼhoan controlledvocabulary.language.jwira-pepesa=Jwira-Pepesa controlledvocabulary.language.jerriais=Jèrriais controlledvocabulary.language.juma=Júma @@ -4287,7 +4287,7 @@ controlledvocabulary.language.makolkol=Makolkol controlledvocabulary.language.makonde=Makonde controlledvocabulary.language.maku'a=Maku'a controlledvocabulary.language.makuri_naga=Makuri Naga -controlledvocabulary.language.makurap=Makuráp +controlledvocabulary.language.makurap=Makuráp controlledvocabulary.language.makwe=Makwe controlledvocabulary.language.makyan_naga=Makyan Naga controlledvocabulary.language.mal=Mal @@ -5797,7 +5797,7 @@ controlledvocabulary.language.pattani_malay=Pattani Malay controlledvocabulary.language.pattapu=Pattapu controlledvocabulary.language.patwin=Patwin controlledvocabulary.language.paulohi=Paulohi -controlledvocabulary.language.paumari=Paumarí +controlledvocabulary.language.paumari=Paumarí controlledvocabulary.language.paunaka=Paunaka controlledvocabulary.language.pauri_bareli=Pauri Bareli controlledvocabulary.language.pauserna=Pauserna From 7f7143cdbb84ca262d718c69d57a8b369db65e44 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:45:21 -0400 Subject: [PATCH 266/366] fixing language list --- scripts/api/data/metadatablocks/citation.tsv | 4 ++-- src/main/java/propertyFiles/citation.properties | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index 2f4f49d593a..3c6f84baf19 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -7818,7 +7818,7 @@ language Yamongeri ymg 7681 ymg language Yamphu ybi 7682 ybi language Yan-nhangu jay 7683 jay - language Yan-nhangu Sign Language yhs 7684 yhs Yan-nhaŋu Sign Language + language Yan-nhaŋu Sign Language yhs 7684 yhs language Yana ynn 7685 ynn language Yanahuanca Pasco Quechua qur 7686 qur language Yanda yda 7687 yda @@ -7927,7 +7927,7 @@ language Yokuts yok 7790 yok language Yola yol 7791 yol language Yoloxochitl Mixtec xty 7792 xty - language Yolngu Sign Language ygs 7793 ygs Yolŋu Sign Language + language Yolŋu Sign Language ygs 7793 ygs language Yom pil 7794 pil language Yombe yom 7795 yom language Yonaguni yoi 7796 yoi diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 9a3705cbcb7..31bda4fa79d 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -7697,7 +7697,7 @@ controlledvocabulary.language.wapan=Wapan controlledvocabulary.language.wapishana=Wapishana controlledvocabulary.language.wappo=Wappo controlledvocabulary.language.war-jaintia=War-Jaintia -controlledvocabulary.language.wara=Wara W�ra +controlledvocabulary.language.wara=Wara Wára controlledvocabulary.language.warao=Warao controlledvocabulary.language.waray_(australia)=Waray (Australia) controlledvocabulary.language.waray_(philippines)=Waray (Philippines) @@ -7975,7 +7975,7 @@ controlledvocabulary.language.yamna=Yamna controlledvocabulary.language.yamongeri=Yamongeri controlledvocabulary.language.yamphu=Yamphu controlledvocabulary.language.yan-nhangu=Yan-nhangu -controlledvocabulary.language.yan-nhangu_sign_language=Yan-nhaŋu Sign Language +controlledvocabulary.language.yan-nhaŋu_sign_language=Yan-nhaŋu Sign Language controlledvocabulary.language.yana=Yana controlledvocabulary.language.yanahuanca_pasco_quechua=Yanahuanca Pasco Quechua controlledvocabulary.language.yanda=Yanda @@ -8084,7 +8084,7 @@ controlledvocabulary.language.yoke=Yoke controlledvocabulary.language.yokuts=Yokuts controlledvocabulary.language.yola=Yola controlledvocabulary.language.yoloxochitl_mixtec=Yoloxochitl Mixtec -controlledvocabulary.language.yolngu_sign_language=Yolŋu Sign Language +controlledvocabulary.language.yolŋu_sign_language=Yolŋu Sign Language controlledvocabulary.language.yom=Yom controlledvocabulary.language.yombe=Yombe controlledvocabulary.language.yonaguni=Yonaguni From 7257de22873061ba98bf3b38949acfd6635a3a94 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:49:33 -0400 Subject: [PATCH 267/366] fixing language list --- src/main/java/propertyFiles/citation.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 31bda4fa79d..2b975e09c7e 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -659,7 +659,7 @@ controlledvocabulary.language.aribwatsa=Aribwatsa controlledvocabulary.language.aribwaung=Aribwaung controlledvocabulary.language.arifama-miniafia=Arifama-Miniafia controlledvocabulary.language.arigidi=Arigidi -controlledvocabulary.language.arikapu=Arikapú +controlledvocabulary.language.arikapu=Arikapú controlledvocabulary.language.arikara=Arikara controlledvocabulary.language.arikem=Arikem controlledvocabulary.language.arin=Arin @@ -4287,7 +4287,7 @@ controlledvocabulary.language.makolkol=Makolkol controlledvocabulary.language.makonde=Makonde controlledvocabulary.language.maku'a=Maku'a controlledvocabulary.language.makuri_naga=Makuri Naga -controlledvocabulary.language.makurap=Makuráp +controlledvocabulary.language.makurap=Makuráp controlledvocabulary.language.makwe=Makwe controlledvocabulary.language.makyan_naga=Makyan Naga controlledvocabulary.language.mal=Mal @@ -5797,7 +5797,7 @@ controlledvocabulary.language.pattani_malay=Pattani Malay controlledvocabulary.language.pattapu=Pattapu controlledvocabulary.language.patwin=Patwin controlledvocabulary.language.paulohi=Paulohi -controlledvocabulary.language.paumari=Paumarí +controlledvocabulary.language.paumari=Paumarí controlledvocabulary.language.paunaka=Paunaka controlledvocabulary.language.pauri_bareli=Pauri Bareli controlledvocabulary.language.pauserna=Pauserna From a87783190696055a67aef799aa956ce906716891 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:56:29 -0400 Subject: [PATCH 268/366] fixing language list --- scripts/api/data/metadatablocks/citation.tsv | 17 +++++++++-------- src/main/java/propertyFiles/citation.properties | 15 ++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/api/data/metadatablocks/citation.tsv b/scripts/api/data/metadatablocks/citation.tsv index 3c6f84baf19..b9d6ca025f1 100644 --- a/scripts/api/data/metadatablocks/citation.tsv +++ b/scripts/api/data/metadatablocks/citation.tsv @@ -2158,7 +2158,7 @@ language Gamo gmv 2018 gmv language Gamo-Ningi bte 2019 bte language Gan Chinese gan 2020 gan - language Gana gnq 2021 gnq gnk ǁGana + language Gana gnq 2021 gnq language Ganang gne 2022 gne language Ganda lug 2023 lug lg language Gane gzn 2024 gzn @@ -8046,11 +8046,12 @@ language Áncá acb 7909 acb language Ömie aom 7910 aom language Önge oon 7911 oon - language Gwi gwj 7912 gwj ǀGwi - language Xam xam 7913 xam ǀXam - language Ani hnh 7914 hnh ǁAni - language Xegwi xeg 7916 xeg ǁXegwi - language Hua huc 7917 huc ǂHua - language Ungkue gku 7918 gku ǂUngkue - language Xóõ nmn 7919 nmn ǃXóõ + language ǀGwi gwj 7912 gwj + language ǀXam xam 7913 xam + language ǁAni hnh 7914 hnh + language ǁGana gnk 7915 gnk + language ǁXegwi xeg 7916 xeg + language ǂHua huc 7917 huc + language ǂUngkue gku 7918 gku + language ǃXóõ nmn 7919 nmn language Not applicable 7920 diff --git a/src/main/java/propertyFiles/citation.properties b/src/main/java/propertyFiles/citation.properties index 2b975e09c7e..2eb8867242c 100644 --- a/src/main/java/propertyFiles/citation.properties +++ b/src/main/java/propertyFiles/citation.properties @@ -8203,11 +8203,12 @@ controlledvocabulary.language.ahan=Àhàn controlledvocabulary.language.anca=Áncá controlledvocabulary.language.omie=Ömie controlledvocabulary.language.onge=Önge -controlledvocabulary.language.gwi=ǀGwi -controlledvocabulary.language.xam=ǀXam -controlledvocabulary.language.ani=ǁAni -controlledvocabulary.language.xegwi=ǁXegwi -controlledvocabulary.language.hua=ǂHua -controlledvocabulary.language.ungkue=ǂUngkue -controlledvocabulary.language.xoo=ǃXóõ +controlledvocabulary.language.ǀgwi=ǀGwi +controlledvocabulary.language.ǀxam=ǀXam +controlledvocabulary.language.ǁani=ǁAni +controlledvocabulary.language.ǁgana=ǁGana +controlledvocabulary.language.ǁxegwi=ǁXegwi +controlledvocabulary.language.ǂhua=ǂHua +controlledvocabulary.language.ǂungkue=ǂUngkue +controlledvocabulary.language.ǃxoo=ǃXóõ controlledvocabulary.language.not_applicable=Not Applicable From 405da5954877ad5df8a68e879c1ac0c316a3c13c Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 16:16:40 -0400 Subject: [PATCH 269/366] changes per review comments --- .../source/installation/config.rst | 50 ++----------------- .../crossref/CrossRefDOIRegisterService.java | 22 +++----- .../doi/crossref/CrossRefRESTfullClient.java | 6 +-- .../dataverse/pidproviders/PidUtilTest.java | 5 +- .../dataverse/settings/JvmSettingsTest.java | 6 --- 5 files changed, 19 insertions(+), 70 deletions(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index a96a867c216..9bfd2488062 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -523,7 +523,11 @@ PID Providers of type ``crossref`` require six additional parameters that define CrossRef has two APIs that are used in Dataverse: The base URL of the `CrossRef `_, -used to mint and manage DOIs. Current valid values for ``dataverse.pid.*.datacite.mds-api-url`` are "https://mds.datacite.org" (production) and "https://mds.test.datacite.org" (testing, the default). +used to mint and manage DOIs. Current valid values for ``dataverse.pid.*.crossref.url`` are "https://doi.crossref.org" and ``dataverse.pid.*.crossref.rest-api-url`` are "https://api.crossref.org" (production). +``dataverse.pid.*.crossref.username=crusername`` +``dataverse.pid.*.crossref.password=secret`` +``dataverse.pid.*.crossref.depositor=xyz`` +``dataverse.pid.*.crossref.depositor-email=xyz@example.com`` CrossRef uses `HTTP Basic authentication `_ XML files can be POSTed to CrossRef where they are added to the submission queue to await processing @@ -2871,50 +2875,6 @@ should delete the old JVM option and the wrapped password alias, then recreate as shown for :ref:`dataverse.pid.datacite.password` but with the EZID alias name. -.. _dataverse.pid.crossref.url: - -dataverse.pid.crossref.url -++++++++++++++++++++++++++ - -CrossRef url used to post metadata. - -.. _dataverse.pid.crossref.rest-api-url: - -dataverse.pid.crossref.rest-api-url -+++++++++++++++++++++++++++++++++++ - -CrossRef API url to retrieve metadata information - -.. _dataverse.pid.crossref.username: - -dataverse.pid.crossref.username -+++++++++++++++++++++++++++++++ - -CrossRef uses `HTTP Basic authentication `_ -for their APIs. -- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.password`. - -.. _dataverse.pid.crossref.password: - -dataverse.pid.crossref.password -+++++++++++++++++++++++++++++++ - -- Used in conjunction with :ref:`dataverse.pid.crossref.url` and :ref:`dataverse.pid.crossref.username`. - -.. _dataverse.pid.crossref.depositor: - -dataverse.pid.crossref.depositor -++++++++++++++++++++++++++++++++ - -The entity, such as a person or organization, that deposited the Dataset in the repository - -.. _dataverse.pid.crossref.depositor-email: - -dataverse.pid.crossref.depositor-email -++++++++++++++++++++++++++++++++++++++ - -Contact email to the indicated Depositor - .. _dataverse.timerServer: dataverse.timerServer diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java index 4e369799c1f..e103030d1bf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java @@ -77,7 +77,7 @@ public HashMap getMetadata(String identifier) throws IOException } public String reserveIdentifier(String identifier, DvObject dvObject) throws IOException { - logger.info("Crossref reserveIdentifier"); + logger.fine("Crossref reserveIdentifier"); String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); CrossRefRESTfullClient client = getClient(); @@ -85,7 +85,7 @@ public String reserveIdentifier(String identifier, DvObject dvObject) throws IOE } public void modifyIdentifier(String identifier, DvObject dvObject) throws IOException { - logger.info("Crossref modifyIdentifier"); + logger.fine("Crossref modifyIdentifier"); String xmlMetadata = getMetadataFromDvObject(identifier, dvObject); CrossRefRESTfullClient client = getClient(); @@ -305,22 +305,14 @@ public static void close(InputStream in) { } } - public static String readAndClose(InputStream inStream, String encoding) { + public static String readAndClose(InputStream inStream, String encoding) throws IOException { ByteArrayOutputStream outStream = new ByteArrayOutputStream(); byte[] buf = new byte[128]; - String data; - try { - int cnt; - while ((cnt = inStream.read(buf)) >= 0) { - outStream.write(buf, 0, cnt); - } - data = outStream.toString(encoding); - } catch (IOException ioe) { - throw new RuntimeException("IOException"); - } finally { - close(inStream); + int cnt; + while ((cnt = inStream.read(buf)) >= 0) { + outStream.write(buf, 0, cnt); } - return data; + return outStream.toString(encoding); } } diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java index 4e989fe691d..ebdf875e664 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefRESTfullClient.java @@ -72,12 +72,12 @@ public String getMetadata(String doi) { String data = EntityUtils.toString(response.getEntity(), encoding); if (response.getStatusLine().getStatusCode() != 200) { String errMsg = "Response from getMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; - logger.info(errMsg); + logger.warning(errMsg); throw new RuntimeException(errMsg); } return data; } catch (IOException ioe) { - logger.info("IOException when get metadata"); + logger.warning("IOException when get metadata"); throw new RuntimeException("IOException when get metadata", ioe); } } @@ -99,7 +99,7 @@ public String postMetadata(String xml) throws IOException { String data = EntityUtils.toString(response.getEntity(), encoding); if (response.getStatusLine().getStatusCode() != 200) { String errMsg = "Response from postMetadata: " + response.getStatusLine().getStatusCode() + ", " + data; - logger.info(errMsg); + logger.warning(errMsg); throw new IOException(errMsg); } return data; diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java index 1661dd57174..2cf756cfb50 100644 --- a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java @@ -265,7 +265,10 @@ public void testDOIParsing() throws IOException { assertEquals(pid6String, pid6.asString()); assertEquals("fake1", pid6.getProviderId()); - + String pid7String = "doi:10.11111/DVN/ABCDEF"; + GlobalId pid7 = PidUtil.parseAsGlobalID(pid7String); + assertEquals(pid7String, pid7.asString()); + assertEquals("crossref1", pid7.getProviderId()); } @Test diff --git a/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java index e75954fa908..b66dbf703c9 100644 --- a/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java @@ -22,12 +22,6 @@ void lookupPidProviderSetting() { assertEquals("test", JvmSettings.DATACITE_USERNAME.lookup("datacite")); } - @Test - @SystemProperty(key = "dataverse.pid.crossref1.crossref.username", value = "test") - void lookupPidProviderSetting2() { - assertEquals("test", JvmSettings.CROSSREF_USERNAME.lookup("crossref1")); - } - @Test @SystemProperty(key = "dataverse.ingest.rserve.port", value = "1234") void lookupSettingViaAliasWithDefaultInMPCFile() { From 4939183349347751a04b7f893d51dbdb5b6c7143 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 10 Sep 2024 16:19:22 -0400 Subject: [PATCH 270/366] changes per review comments --- .../edu/harvard/iq/dataverse/settings/JvmSettingsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java index b66dbf703c9..f4494b7116e 100644 --- a/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/settings/JvmSettingsTest.java @@ -21,11 +21,11 @@ void lookupSetting() { void lookupPidProviderSetting() { assertEquals("test", JvmSettings.DATACITE_USERNAME.lookup("datacite")); } - + @Test @SystemProperty(key = "dataverse.ingest.rserve.port", value = "1234") void lookupSettingViaAliasWithDefaultInMPCFile() { assertEquals("1234", JvmSettings.RSERVE_PORT.lookup()); } -} +} \ No newline at end of file From 4f539bacce507862e6b38a5d636ccb2d952d6dc0 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 09:07:35 -0400 Subject: [PATCH 271/366] support no pubIdType for URLs --- .../pidproviders/doi/XmlMetadataTemplate.java | 83 +++++++++---------- 1 file changed, 41 insertions(+), 42 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 88954d54bbe..7887bc9b6c5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -995,48 +995,47 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th } logger.info("Related identifier: " + relatedIdentifier); // For types where we understand the protocol, get the canonical form - if (pubIdType != null) { - switch (pubIdType) { - case "DOI": - if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) { - relatedIdentifier = "doi:" + relatedIdentifier; - } - logger.info("Intermediate Related identifier: " + relatedIdentifier); - try { - GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); - relatedIdentifier = pid.asRawIdentifier(); - } catch (IllegalArgumentException e) { - logger.warning("Invalid DOI: " + e.getLocalizedMessage()); - relatedIdentifier = null; - } - logger.info("Final Related identifier: " + relatedIdentifier); - break; - case "Handle": - if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) { - relatedIdentifier = "hdl:" + relatedIdentifier; - } - try { - GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); - relatedIdentifier = pid.asRawIdentifier(); - } catch (IllegalArgumentException e) { - relatedIdentifier = null; - } - break; - case "URL": - break; - default: - - // For non-URL types, if a URL is given, split the string to get a schemeUri - try { - URL relatedUrl = new URI(relatedIdentifier).toURL(); - String protocol = relatedUrl.getProtocol(); - String authority = relatedUrl.getAuthority(); - String site = String.format("%s://%s", protocol, authority); - relatedIdentifier = relatedIdentifier.substring(site.length()); - attributes.put("schemeURI", site); - } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { - // Just an identifier - } + + switch (pubIdType != null ? pubIdType : "none") { + case "DOI": + if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) { + relatedIdentifier = "doi:" + relatedIdentifier; + } + logger.info("Intermediate Related identifier: " + relatedIdentifier); + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + } catch (IllegalArgumentException e) { + logger.warning("Invalid DOI: " + e.getLocalizedMessage()); + relatedIdentifier = null; + } + logger.info("Final Related identifier: " + relatedIdentifier); + break; + case "Handle": + if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) { + relatedIdentifier = "hdl:" + relatedIdentifier; + } + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + } catch (IllegalArgumentException e) { + relatedIdentifier = null; + } + break; + case "URL": + break; + default: + + // For non-URL types, if a URL is given, split the string to get a schemeUri + try { + URL relatedUrl = new URI(relatedIdentifier).toURL(); + String protocol = relatedUrl.getProtocol(); + String authority = relatedUrl.getAuthority(); + String site = String.format("%s://%s", protocol, authority); + relatedIdentifier = relatedIdentifier.substring(site.length()); + attributes.put("schemeURI", site); + } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { + // Just an identifier } } if (StringUtils.isNotBlank(relatedIdentifier)) { From 25d63a710f2f40362bf1c255e54b2bdf5a2c5520 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 17:07:15 -0400 Subject: [PATCH 272/366] direct people to the log for failures - they aren't in the response --- src/main/java/propertyFiles/Bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties index 6c771d8337b..4ba5e4a9f14 100644 --- a/src/main/java/propertyFiles/Bundle.properties +++ b/src/main/java/propertyFiles/Bundle.properties @@ -2698,7 +2698,7 @@ files.api.fileNotFound=File could not be found. datasets.api.updatePIDMetadata.failure.dataset.must.be.released=Modify Registration Metadata must be run on a published dataset. datasets.api.updatePIDMetadata.auth.mustBeSuperUser=Forbidden. You must be a superuser. datasets.api.updatePIDMetadata.success.for.single.dataset=Dataset {0} PID Metadata updated successfully. -datasets.api.updatePIDMetadata.success.for.update.all=All Dataset PID Metadata update completed successfully. +datasets.api.updatePIDMetadata.success.for.update.all=All Dataset PID Metadata update completed. See log for any issues. datasets.api.moveDataset.error.targetDataverseNotFound=Target dataverse not found. datasets.api.moveDataset.error.suggestForce=Use the query parameter forceMove=true to complete the move. datasets.api.moveDataset.success=Dataset moved successfully. From 92bf051b9a8bff14a366fd489915007cedca3e11 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 17:07:42 -0400 Subject: [PATCH 273/366] bug - the _target url isn't being set elsewhere --- .../dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java index 0250266bbdd..d84b7760a96 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java @@ -126,6 +126,7 @@ public String modifyIdentifierTargetURL(DvObject dvObject) throws Exception { String identifier = getIdentifier(dvObject); try { Map metadata = getIdentifierMetadata(dvObject); + metadata.put("_target", getTargetUrl(dvObject)); doiDataCiteRegisterService.modifyIdentifier(identifier, metadata, dvObject); } catch (Exception e) { logger.log(Level.WARNING, "modifyMetadata failed", e); From f4c516460e1bc23af1b73082a1a7b3bde82ea1d6 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 17:08:17 -0400 Subject: [PATCH 274/366] avoid failing when the entity is null for error statuses --- .../pidproviders/doi/datacite/DataCiteRESTfullClient.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteRESTfullClient.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteRESTfullClient.java index d185b0249b9..465b10ee407 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteRESTfullClient.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteRESTfullClient.java @@ -21,6 +21,7 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.HttpEntity; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.CloseableHttpClient; @@ -75,7 +76,12 @@ public String getUrl(String doi) { HttpGet httpGet = new HttpGet(this.url + "/doi/" + doi); try { HttpResponse response = httpClient.execute(httpGet,context); - String data = EntityUtils.toString(response.getEntity(), encoding); + HttpEntity entity = response.getEntity(); + String data = null; + + if(entity != null) { + data = EntityUtils.toString(entity, encoding); + } if (response.getStatusLine().getStatusCode() != 200) { throw new RuntimeException("Response code: " + response.getStatusLine().getStatusCode() + ", " + data); } From 45156be860b5b781350769c0b955cac5d4b409e9 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 17:11:31 -0400 Subject: [PATCH 275/366] don't update unpublished files - no need and it will fail the updateIdentifier call is checking for the findable metadata which is not available before publication. (We don't update DataCite after dataset edits, so unpublished datasets don't go through here, but unpublished files on published datasets would hit this code) --- .../command/impl/UpdateDatasetTargetURLCommand.java | 12 +++++++----- .../impl/UpdateDvObjectPIDMetadataCommand.java | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java index 5a0ae7cbf5d..8cf2d0109d6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDatasetTargetURLCommand.java @@ -46,11 +46,13 @@ protected void executeImpl(CommandContext ctxt) throws CommandException { ctxt.em().merge(target); ctxt.em().flush(); for (DataFile df : target.getFiles()) { - doiRetString = pidProvider.modifyIdentifierTargetURL(df); - if (doiRetString != null && doiRetString.contains(df.getIdentifier())) { - df.setGlobalIdCreateTime(new Timestamp(new Date().getTime())); - ctxt.em().merge(df); - ctxt.em().flush(); + if (df.isReleased()) { + doiRetString = pidProvider.modifyIdentifierTargetURL(df); + if (doiRetString != null && doiRetString.contains(df.getIdentifier())) { + df.setGlobalIdCreateTime(new Timestamp(new Date().getTime())); + ctxt.em().merge(df); + ctxt.em().flush(); + } } } } else { diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java index 5bf54ac1ec1..14d17dcd900 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java @@ -69,7 +69,8 @@ protected void executeImpl(CommandContext ctxt) throws CommandException { for (DataFile df : target.getFiles()) { if (isFilePIDsEnabled && // using file PIDs and (!(df.getIdentifier() == null || df.getIdentifier().isEmpty()) || // identifier exists, or - canCreatePidsForFiles) // we can create PIDs for files + canCreatePidsForFiles) && // we can create PIDs for files and + df.isReleased() // the file is not a draft ) { doiRetString = pidProvider.updateIdentifier(df); if (doiRetString) { From 5998e7a01501f96cd880b415a9f0384149cf21f5 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 17:12:33 -0400 Subject: [PATCH 276/366] lower logging, add null check on relatedIdentifier --- .../pidproviders/doi/XmlMetadataTemplate.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 7887bc9b6c5..eb99bba2337 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -97,7 +97,7 @@ public String generateXML(DvObject dvObject) { generateXML(dvObject, outputStream); String xml = outputStream.toString(); - logger.info(xml); + logger.fine(xml); return XmlPrinter.prettyPrintXml(xml); } catch (XMLStreamException | IOException e) { logger.severe("Unable to generate DataCite XML for DOI: " + dvObject.getGlobalId().asString() + " : " + e.getMessage()); @@ -984,16 +984,16 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th * way those two fields are used for all identifier types. The code here is * ~best effort to interpret those fields. */ - logger.info("Found relpub: " + pubIdType + " " + identifier + " " + url); + logger.fine("Found relpub: " + pubIdType + " " + identifier + " " + url); pubIdType = getCanonicalPublicationType(pubIdType); -logger.info("Canonical type: " + pubIdType); + logger.fine("Canonical type: " + pubIdType); // Prefer url if set, otherwise check identifier String relatedIdentifier = url; if (StringUtils.isBlank(relatedIdentifier)) { relatedIdentifier = identifier; } - logger.info("Related identifier: " + relatedIdentifier); + logger.fine("Related identifier: " + relatedIdentifier); // For types where we understand the protocol, get the canonical form switch (pubIdType != null ? pubIdType : "none") { @@ -1001,7 +1001,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) { relatedIdentifier = "doi:" + relatedIdentifier; } - logger.info("Intermediate Related identifier: " + relatedIdentifier); + logger.fine("Intermediate Related identifier: " + relatedIdentifier); try { GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); relatedIdentifier = pid.asRawIdentifier(); @@ -1009,7 +1009,7 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th logger.warning("Invalid DOI: " + e.getLocalizedMessage()); relatedIdentifier = null; } - logger.info("Final Related identifier: " + relatedIdentifier); + logger.fine("Final Related identifier: " + relatedIdentifier); break; case "Handle": if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) { @@ -1025,17 +1025,18 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th case "URL": break; default: - - // For non-URL types, if a URL is given, split the string to get a schemeUri - try { - URL relatedUrl = new URI(relatedIdentifier).toURL(); - String protocol = relatedUrl.getProtocol(); - String authority = relatedUrl.getAuthority(); - String site = String.format("%s://%s", protocol, authority); - relatedIdentifier = relatedIdentifier.substring(site.length()); - attributes.put("schemeURI", site); - } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { - // Just an identifier + if (relatedIdentifier != null) { + // For non-URL types, if a URL is given, split the string to get a schemeUri + try { + URL relatedUrl = new URI(relatedIdentifier).toURL(); + String protocol = relatedUrl.getProtocol(); + String authority = relatedUrl.getAuthority(); + String site = String.format("%s://%s", protocol, authority); + relatedIdentifier = relatedIdentifier.substring(site.length()); + attributes.put("schemeURI", site); + } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { + // Just an identifier + } } } if (StringUtils.isNotBlank(relatedIdentifier)) { From 3ef95577f81c7613847d1fe276c65aba206ae5f5 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 18:34:12 -0400 Subject: [PATCH 277/366] Change to use POST for all --- src/main/java/edu/harvard/iq/dataverse/api/Datasets.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java index 034ba4536a1..f26b6d67edf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java @@ -658,7 +658,7 @@ public Response getLinkset(@Context ContainerRequestContext crc, @PathParam("id" } } - @GET + @POST @AuthRequired @Path("{id}/modifyRegistration") public Response updateDatasetTargetURL(@Context ContainerRequestContext crc, @PathParam("id") String id ) { @@ -706,7 +706,7 @@ public Response updateDatasetPIDMetadata(@Context ContainerRequestContext crc, @ }, getRequestUser(crc)); } - @GET + @POST @AuthRequired @Path("/modifyRegistrationPIDMetadataAll") public Response updateDatasetPIDMetadataAll(@Context ContainerRequestContext crc) { From 4e7d22ddd60bbe57c18b5887e242161af3e5e1b8 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 10 Sep 2024 18:34:26 -0400 Subject: [PATCH 278/366] Documentation and updated release note --- .../10632-DataCiteXMLandRelationType.md | 14 +++++++- .../source/admin/dataverses-datasets.rst | 35 +++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/doc/release-notes/10632-DataCiteXMLandRelationType.md b/doc/release-notes/10632-DataCiteXMLandRelationType.md index 90569041dc7..f714423f05d 100644 --- a/doc/release-notes/10632-DataCiteXMLandRelationType.md +++ b/doc/release-notes/10632-DataCiteXMLandRelationType.md @@ -19,4 +19,16 @@ To update existing datasets (and files using DataCite DOIs): Exports can be updated by running curl http://localhost:8080/api/admin/metadata/reExportAll -Entries at DataCite can be updated on a per-dataset basis http://localhost:8080/api/datasets//modifyRegistrationMetadata. (Smaller instances may be able to use the undocumented curl http://localhost:8080/api/datasets/modifyRegistrationPIDMetadataAll, but this is likely to cause DataCite failures with many DOIs involved.) +Entries at DataCite for published datasets can be updated by a superuser on a per-dataset basis using + +`curl -X POST -H 'X-Dataverse-key:' http://localhost:8080/api/datasets//modifyRegistrationMetadata` + +(Installations can also try the newly documented + +`curl -X POST -H 'X-Dataverse-key:' http://localhost:8080/api/datasets/modifyRegistrationPIDMetadataAll` + +This will loop through all published datasets (and released files with PIDs). Any PIDs for which the update fails can be found using + +`grep 'Failure for id' server.log` + +Failures may occur if PIDs were never registered, or if they were never made findable. Any such cases can be fixed manually in DataCite Fabrica or using the [Reserve a PID](https://guides.dataverse.org/en/latest/api/native-api.html#reserve-a-pid) API call and the newly documented `/api/datasets//modifyRegistration` call respectively. See https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#send-dataset-metadata-to-pid-provider. Please reach out with any questions.) diff --git a/doc/sphinx-guides/source/admin/dataverses-datasets.rst b/doc/sphinx-guides/source/admin/dataverses-datasets.rst index c6f15968f00..b4d365c4fd4 100644 --- a/doc/sphinx-guides/source/admin/dataverses-datasets.rst +++ b/doc/sphinx-guides/source/admin/dataverses-datasets.rst @@ -195,12 +195,41 @@ Mints a new identifier for a dataset previously registered with a handle. Only a .. _send-metadata-to-pid-provider: -Send Dataset metadata to PID provider -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Update Target URL for a Published Dataset at the PID provider +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forces update to metadata provided to the PID provider of a published dataset. Only accessible to superusers. :: +Forces update to the target URL provided to the PID provider of a published dataset and assures the PID is findable. +Only accessible to superusers. :: + + curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/$dataset-id/modifyRegistration + +Update Target URL for all Published Datasets at the PID provider +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Forces update to the target URL provided to the PID provider of all published datasets and assures the PID is findable. +Only accessible to superusers. :: + + curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/modifyRegistrationAll + +Update Metadata for a Published Dataset at the PID provider +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Checks to see that the PID metadata for a published dataset (and any released files in it using file PIDs) +is up-to-date at the provider and updates the metadata if necessary. +Only accessible to superusers. :: curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/$dataset-id/modifyRegistrationMetadata + +Update Metadata for all Published Datasets at the PID provider +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Checks to see that the PID metadata is up-to-date at the provider for all published datasets +(and any released files in them using file PIDs) and updates the metadata if necessary. +Only accessible to superusers. :: + + curl -H "X-Dataverse-key: $API_TOKEN" -X POST http://$SERVER/api/datasets/modifyRegistrationPIDMetadataAll + +The call returns 200/OK as long as the call completes. Any errors for individual datasets are reported in the log. Check for Unreserved PIDs and Reserve Them ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From 0fe339d13b243e6109702a082d9550f0e7b425f5 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 11 Sep 2024 10:52:26 -0400 Subject: [PATCH 279/366] changes per review comments --- .../pidproviders/doi/crossref/CrossRefDOIRegisterService.java | 3 ++- .../doi/{crossref => }/crossref_metadata_template.xml | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/{crossref => }/crossref_metadata_template.xml (100%) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java index e103030d1bf..825b18e7f4b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/crossref/CrossRefDOIRegisterService.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import edu.harvard.iq.dataverse.*; import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; +import edu.harvard.iq.dataverse.pidproviders.doi.XmlMetadataTemplate; import jakarta.enterprise.inject.spi.CDI; import org.apache.commons.text.StringEscapeUtils; @@ -133,7 +134,7 @@ class CrossRefMetadataTemplate { private static String template; static { - try (InputStream in = CrossRefMetadataTemplate.class.getResourceAsStream("crossref_metadata_template.xml")) { + try (InputStream in = XmlMetadataTemplate.class.getResourceAsStream("crossref_metadata_template.xml")) { template = CrossRefFileUtil.readAndClose(in, "utf-8"); } catch (Exception e) { logger.log(Level.SEVERE, "crossref metadata template load error"); diff --git a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref/crossref_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref_metadata_template.xml similarity index 100% rename from src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref/crossref_metadata_template.xml rename to src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/crossref_metadata_template.xml From 1865a81d1060fc5ca789ba0e7b49294e74fb0c55 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 11 Sep 2024 13:50:30 -0400 Subject: [PATCH 280/366] test fix - number of fields --- .../java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java index 186ab513681..0153d8dc893 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/MetadataBlocksIT.java @@ -51,7 +51,7 @@ void testListMetadataBlocks() { // onlyDisplayedOnCreate=true and returnDatasetFieldTypes=true listMetadataBlocksResponse = UtilIT.listMetadataBlocks(true, true); - expectedNumberOfMetadataFields = 25; + expectedNumberOfMetadataFields = 26; listMetadataBlocksResponse.then().assertThat() .statusCode(OK.getStatusCode()) .body("data[0].fields", not(equalTo(null))) From 4b96cec067fcd66f3a12be96bda91c5b049f00af Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Wed, 11 Sep 2024 15:00:32 -0400 Subject: [PATCH 281/366] Remap oai_dc fields dc:type and dc:date (#10737) * Remap oai_dc fields dc:type, dc:date, and dc:rights #8129. The `oai_dc` export and harvesting format has had the following fields remapped: - dc:type was mapped to the field "Kind of Data". Now it is hard-coded to the word "Dataset". - dc:date was mapped to the field "Production Date" when available and otherwise to "Publication Date". Now it is mapped only to the field "Publication Date". - dc:rights was not mapped to anything. Now it is mapped (when available) to terms of use, restrictions, and license. * add tests for export and citation date #8129 * map dc:date to pub date or field for citation date #8129 * back out of any changes to dc:rights #8129 * remove OAI-PMH changes from API changelog (also in release note) #8129 * tweak release note, mention backward incompatibility, reexport #8129 --- doc/release-notes/8129-harvesting.md | 18 ++++ doc/sphinx-guides/source/api/native-api.rst | 2 + .../dublincore/DublinCoreExportUtil.java | 33 +++++-- .../harvard/iq/dataverse/api/DatasetsIT.java | 88 +++++++++++++++++-- .../edu/harvard/iq/dataverse/api/UtilIT.java | 27 ++++++ 5 files changed, 157 insertions(+), 11 deletions(-) create mode 100644 doc/release-notes/8129-harvesting.md diff --git a/doc/release-notes/8129-harvesting.md b/doc/release-notes/8129-harvesting.md new file mode 100644 index 00000000000..63ca8744941 --- /dev/null +++ b/doc/release-notes/8129-harvesting.md @@ -0,0 +1,18 @@ +### Remap oai_dc export and harvesting format fields: dc:type and dc:date + +The `oai_dc` export and harvesting format has had the following fields remapped: + +- dc:type was mapped to the field "Kind of Data". Now it is hard-coded to the word "Dataset". +- dc:date was mapped to the field "Production Date" when available and otherwise to "Publication Date". Now it is mapped the field "Publication Date" or the field used for the citation date, if set (see [Set Citation Date Field Type for a Dataset](https://guides.dataverse.org/en/6.3/api/native-api.html#set-citation-date-field-type-for-a-dataset)). + +In order for these changes to be reflected in existing datasets, a [reexport all](https://guides.dataverse.org/en/6.3/admin/metadataexport.html#batch-exports-through-the-api) should be run. + +For more information, please see #8129 and #10737. + +### Backward incompatible changes + +See the "Remap oai_dc export" section above. + +### Upgrade instructions + +In order for changes to the `oai_dc` metadata export format to be reflected in existing datasets, a [reexport all](https://guides.dataverse.org/en/6.3/admin/metadataexport.html#batch-exports-through-the-api) should be run. diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst index ad1d217b9a1..117aceb141d 100644 --- a/doc/sphinx-guides/source/api/native-api.rst +++ b/doc/sphinx-guides/source/api/native-api.rst @@ -1836,6 +1836,8 @@ The fully expanded example above (without environment variables) looks like this .. note:: You cannot deaccession a dataset more than once. If you call this endpoint twice for the same dataset version, you will get a not found error on the second call, since the dataset you are looking for will no longer be published since it is already deaccessioned. +.. _set-citation-date-field: + Set Citation Date Field Type for a Dataset ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java index 6b7cb844f3e..9a2c3085d2d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java @@ -7,6 +7,8 @@ import com.google.gson.Gson; import edu.harvard.iq.dataverse.DatasetFieldConstant; +import edu.harvard.iq.dataverse.DatasetFieldType; +import edu.harvard.iq.dataverse.DatasetServiceBean; import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.api.dto.DatasetDTO; import edu.harvard.iq.dataverse.api.dto.DatasetVersionDTO; @@ -176,11 +178,24 @@ private static void createOAIDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, Str writeFullElementList(xmlw, dcFlavor+":"+"language", dto2PrimitiveList(version, DatasetFieldConstant.language)); - String date = dto2Primitive(version, DatasetFieldConstant.productionDate); - if (date == null) { - date = datasetDto.getPublicationDate(); + /** + * dc:date. "I suggest changing the Dataverse / DC Element (oai_dc) + * mapping, so that dc:date is mapped with Publication Date. This is + * also in line with citation recommendations. The publication date is + * the preferred date when citing research data; see, e.g., page 12 in + * The Tromsø Recommendations for Citation of Research Data in + * Linguistics; https://doi.org/10.15497/rda00040 ." -- + * https://github.com/IQSS/dataverse/issues/8129 + * + * However, if the citation date field has been set, use that. + */ + String date = datasetDto.getPublicationDate(); + DatasetFieldType citationDataType = jakarta.enterprise.inject.spi.CDI.current().select(DatasetServiceBean.class).get().findByGlobalId(globalId.asString()).getCitationDateDatasetFieldType(); + if (citationDataType != null) { + date = dto2Primitive(version, citationDataType.getName()); } - writeFullElement(xmlw, dcFlavor+":"+"date", date); + + writeFullElement(xmlw, dcFlavor+":"+"date", date); writeFullElement(xmlw, dcFlavor+":"+"contributor", dto2Primitive(version, DatasetFieldConstant.depositor)); @@ -188,10 +203,16 @@ private static void createOAIDC(XMLStreamWriter xmlw, DatasetDTO datasetDto, Str writeFullElementList(xmlw, dcFlavor+":"+"relation", dto2PrimitiveList(version, DatasetFieldConstant.relatedDatasets)); - writeFullElementList(xmlw, dcFlavor+":"+"type", dto2PrimitiveList(version, DatasetFieldConstant.kindOfData)); + /** + * dc:type. "Dublin Core (see + * https://www.dublincore.org/specifications/dublin-core/dcmi-terms/#http://purl.org/dc/terms/type + * ) recommends “to use a controlled vocabulary such as the DCMI Type + * Vocabulary” for dc:type." So we hard-coded it to "Dataset". See + * https://github.com/IQSS/dataverse/issues/8129 + */ + writeFullElement(xmlw, dcFlavor+":"+"type", "Dataset"); writeFullElementList(xmlw, dcFlavor+":"+"source", dto2PrimitiveList(version, DatasetFieldConstant.dataSources)); - } diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java index 3ff580268a9..f52aa4fe9bd 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetsIT.java @@ -630,8 +630,7 @@ public void testCreatePublishDestroyDataset() { Response exportDatasetAsDublinCore = UtilIT.exportDataset(datasetPersistentId, "oai_dc", apiToken); exportDatasetAsDublinCore.prettyPrint(); exportDatasetAsDublinCore.then().assertThat() - // FIXME: Get this working. See https://github.com/rest-assured/rest-assured/wiki/Usage#example-3---complex-parsing-and-validation - // .body("oai_dc:dc.find { it == 'dc:title' }.item", hasItems("Darwin's Finches")) + .body("oai_dc.title", is("Darwin's Finches")) .statusCode(OK.getStatusCode()); Response exportDatasetAsDdi = UtilIT.exportDataset(datasetPersistentId, "ddi", apiToken); @@ -1195,8 +1194,7 @@ public void testExport() { Response exportDatasetAsDublinCore = UtilIT.exportDataset(datasetPersistentId, "oai_dc", apiToken); exportDatasetAsDublinCore.prettyPrint(); exportDatasetAsDublinCore.then().assertThat() - // FIXME: Get this working. See https://github.com/rest-assured/rest-assured/wiki/Usage#example-3---complex-parsing-and-validation - // .body("oai_dc:dc.find { it == 'dc:title' }.item", hasItems("Darwin's Finches")) + .body("oai_dc.title", is("Dataset One")) .statusCode(OK.getStatusCode()); Response exportDatasetAsDdi = UtilIT.exportDataset(datasetPersistentId, "ddi", apiToken); @@ -4103,7 +4101,87 @@ public void getDatasetVersionCitation() { .assertThat().body("data.message", containsString(String.valueOf(persistentId))); } - + @Test + public void testCitationDate() throws IOException { + + Response createUser = UtilIT.createRandomUser(); + createUser.then().assertThat().statusCode(OK.getStatusCode()); + String username = UtilIT.getUsernameFromResponse(createUser); + String apiToken = UtilIT.getApiTokenFromResponse(createUser); + + Response createDataverse = UtilIT.createRandomDataverse(apiToken); + createDataverse.then().assertThat().statusCode(CREATED.getStatusCode()); + String dataverseAlias = UtilIT.getAliasFromResponse(createDataverse); + Integer dataverseId = UtilIT.getDataverseIdFromResponse(createDataverse); + Response createDataset = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken); + createDataset.then().assertThat().statusCode(CREATED.getStatusCode()); + Integer datasetId = UtilIT.getDatasetIdFromResponse(createDataset); + String datasetPid = JsonPath.from(createDataset.getBody().asString()).getString("data.persistentId"); + + Path pathToAddDateOfDepositJson = Paths.get(java.nio.file.Files.createTempDirectory(null) + File.separator + "dateOfDeposit.json"); + String dateOfDeposit = """ +{ + "fields": [ + { + "typeName": "dateOfDeposit", + "value": "1999-12-31" + } + ] +} +"""; + java.nio.file.Files.write(pathToAddDateOfDepositJson, dateOfDeposit.getBytes()); + + Response addDateOfDeposit = UtilIT.addDatasetMetadataViaNative(datasetPid, pathToAddDateOfDepositJson.toString(), apiToken); + addDateOfDeposit.prettyPrint(); + addDateOfDeposit.then().assertThat() + .statusCode(OK.getStatusCode()) + .body("data.metadataBlocks.citation.fields[5].value", equalTo("1999-12-31")); + + Response setCitationDate = UtilIT.setDatasetCitationDateField(datasetPid, "dateOfDeposit", apiToken); + setCitationDate.prettyPrint(); + setCitationDate.then().assertThat().statusCode(OK.getStatusCode()); + + UtilIT.publishDataverseViaNativeApi(dataverseAlias, apiToken); + UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken).then().assertThat().statusCode(OK.getStatusCode()); + + Response getCitationAfter = UtilIT.getDatasetVersionCitation(datasetId, DS_VERSION_LATEST_PUBLISHED, true, apiToken); + getCitationAfter.prettyPrint(); + + String doi = datasetPid.substring(4); + + // Note that the year 1999 appears in the citation because we + // set the citation date field to a field that has that year. + String expectedCitation = "Finch, Fiona, 1999, \"Darwin's Finches\", https://doi.org/" + doi + ", Root, V1"; + + getCitationAfter.then().assertThat() + .statusCode(OK.getStatusCode()) + .body("data.message", is(expectedCitation)); + + Response exportDatasetAsDublinCore = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken); + exportDatasetAsDublinCore.prettyPrint(); + exportDatasetAsDublinCore.then().assertThat() + .body("oai_dc.type", equalTo("Dataset")) + .body("oai_dc.date", equalTo("1999-12-31")) + .statusCode(OK.getStatusCode()); + + Response clearDateField = UtilIT.clearDatasetCitationDateField(datasetPid, apiToken); + clearDateField.prettyPrint(); + clearDateField.then().assertThat().statusCode(OK.getStatusCode()); + + // Clearing not enough. You have to reexport because the previous date is cached. + Response rexport = UtilIT.reexportDatasetAllFormats(datasetPid); + rexport.prettyPrint(); + rexport.then().assertThat().statusCode(OK.getStatusCode()); + + String todayDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + Response exportPostClear = UtilIT.exportDataset(datasetPid, "oai_dc", apiToken); + exportPostClear.prettyPrint(); + exportPostClear.then().assertThat() + .body("oai_dc.type", equalTo("Dataset")) + .body("oai_dc.date", equalTo(todayDate)) + .statusCode(OK.getStatusCode()); + } + @Test public void getVersionFiles() throws IOException, InterruptedException { Response createUser = UtilIT.createRandomUser(); diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java index 3dfb1a428d2..4e20e8e4c33 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java @@ -3735,6 +3735,33 @@ static Response getDatasetVersionCitation(Integer datasetId, String version, boo return response; } + static Response setDatasetCitationDateField(String datasetIdOrPersistentId, String dateField, String apiToken) { + String idInPath = datasetIdOrPersistentId; // Assume it's a number. + String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path. + if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) { + idInPath = ":persistentId"; + optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId; + } + Response response = given() + .header(API_TOKEN_HTTP_HEADER, apiToken) + .body(dateField) + .put("/api/datasets/" + idInPath + "/citationdate" + optionalQueryParam); + return response; + } + + static Response clearDatasetCitationDateField(String datasetIdOrPersistentId, String apiToken) { + String idInPath = datasetIdOrPersistentId; // Assume it's a number. + String optionalQueryParam = ""; // If idOrPersistentId is a number we'll just put it in the path. + if (!NumberUtils.isCreatable(datasetIdOrPersistentId)) { + idInPath = ":persistentId"; + optionalQueryParam = "?persistentId=" + datasetIdOrPersistentId; + } + Response response = given() + .header(API_TOKEN_HTTP_HEADER, apiToken) + .delete("/api/datasets/" + idInPath + "/citationdate" + optionalQueryParam); + return response; + } + static Response getFileCitation(Integer fileId, String datasetVersion, String apiToken) { Boolean includeDeaccessioned = null; return getFileCitation(fileId, datasetVersion, includeDeaccessioned, apiToken); From bb7adee71a5d863435dd412c89bdc3f438527267 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 12 Sep 2024 12:47:33 -0400 Subject: [PATCH 282/366] update release note --- .../10632-DataCiteXMLandRelationType.md | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/release-notes/10632-DataCiteXMLandRelationType.md b/doc/release-notes/10632-DataCiteXMLandRelationType.md index f714423f05d..d90edcad0e2 100644 --- a/doc/release-notes/10632-DataCiteXMLandRelationType.md +++ b/doc/release-notes/10632-DataCiteXMLandRelationType.md @@ -6,6 +6,12 @@ Additional metadata, including metadata about Related Publications is now being For details see https://github.com/IQSS/dataverse/pull/10632 and https://github.com/IQSS/dataverse/pull/10615 and the design document referenced there. +Multiple backward incompatible changes and bug fixes have been made to API calls (3 of the four of which were not documented) related to updating PID target urls and metadata at the provider service: +[Update Target URL for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider) +[Update Target URL for all Published Datasets at the PID provider](https://dataverse-guide--10632.org.readthedocs.build/en/10632/admin/dataverses-datasets.html#update-target-url-for-all-published-datasets-at-the-pid-provider) +[Update Metadata for a Published Dataset at the PID provider](https://dataverse-guide--10632.org.readthedocs.build/en/10632/admin/dataverses-datasets.html#update-metadata-for-a-published-dataset-at-the-pid-provider) +[Update Metadata for all Published Datasets at the PID provider](https://dataverse-guide--10632.org.readthedocs.build/en/10632/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider) + Upgrade instructions -------------------- @@ -19,16 +25,17 @@ To update existing datasets (and files using DataCite DOIs): Exports can be updated by running curl http://localhost:8080/api/admin/metadata/reExportAll -Entries at DataCite for published datasets can be updated by a superuser on a per-dataset basis using - -`curl -X POST -H 'X-Dataverse-key:' http://localhost:8080/api/datasets//modifyRegistrationMetadata` - -(Installations can also try the newly documented +Entries at DataCite for published datasets can be updated by a superuser using an api call (newly documented) `curl -X POST -H 'X-Dataverse-key:' http://localhost:8080/api/datasets/modifyRegistrationPIDMetadataAll` -This will loop through all published datasets (and released files with PIDs). Any PIDs for which the update fails can be found using +This will loop through all published datasets (and released files with PIDs). As long as the loop completes, the call will return a 200/OK response. Any PIDs for which the update fails can be found using `grep 'Failure for id' server.log` -Failures may occur if PIDs were never registered, or if they were never made findable. Any such cases can be fixed manually in DataCite Fabrica or using the [Reserve a PID](https://guides.dataverse.org/en/latest/api/native-api.html#reserve-a-pid) API call and the newly documented `/api/datasets//modifyRegistration` call respectively. See https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#send-dataset-metadata-to-pid-provider. Please reach out with any questions.) +Failures may occur if PIDs were never registered, or if they were never made findable. Any such cases can be fixed manually in DataCite Fabrica or using the [Reserve a PID](https://guides.dataverse.org/en/latest/api/native-api.html#reserve-a-pid) API call and the newly documented `/api/datasets//modifyRegistration` call respectively. See https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#send-dataset-metadata-to-pid-provider. Please reach out with any questions. + +PIDs can also be updated by a superuser on a per-dataset basis using + +`curl -X POST -H 'X-Dataverse-key:' http://localhost:8080/api/datasets//modifyRegistrationMetadata` + From bde514721f2f1baddd4320964ab486063cc35324 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 12 Sep 2024 14:07:50 -0400 Subject: [PATCH 283/366] check for ROR in grantAgency field too --- .../pidproviders/doi/XmlMetadataTemplate.java | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index eb99bba2337..93631ad8c0a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -623,29 +623,34 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin } if (StringUtils.isNotBlank(affiliation)) { - boolean isROR=false; - String orgName = affiliation; - ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR; - if (externalIdentifier.isValidIdentifier(affiliation)) { - isROR=true; - if(pidProvider instanceof DataCiteDOIProvider dcProvider) { - JsonObject jo = dcProvider.getExternalVocabularyValue(affiliation); - if(jo!=null) { - orgName = jo.getString("termName"); - } + String orgName = getOrganizationFromRORField(affiliation, attributeMap); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(orgName)); + } + xmlw.writeEndElement(); + } + + private String getOrganizationFromRORField(String nameOrRor, Map attributeMap) { + boolean isROR=false; + String orgName = nameOrRor; + ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR; + if (externalIdentifier.isValidIdentifier(nameOrRor)) { + isROR=true; + if(pidProvider instanceof DataCiteDOIProvider dcProvider) { + JsonObject jo = dcProvider.getExternalVocabularyValue(nameOrRor); + if(jo!=null) { + orgName = jo.getString("termName"); } } - - attributeMap.clear(); - if (isROR) { + } + + attributeMap.clear(); + if (isROR) { - attributeMap.put("schemeURI", "https://ror.org"); - attributeMap.put("affiliationIdentifierScheme", "ROR"); - attributeMap.put("affiliationIdentifier", affiliation); - } - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(orgName)); + attributeMap.put("schemeURI", "https://ror.org"); + attributeMap.put("affiliationIdentifierScheme", "ROR"); + attributeMap.put("affiliationIdentifier", nameOrRor); } - xmlw.writeEndElement(); + return orgName; } /** @@ -1493,8 +1498,10 @@ private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) thr } if (!StringUtils.isBlank(funder)) { fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); + Map attributeMap = new HashMap<>(); + funder = getOrganizationFromRORField(funder, attributeMap); xmlw.writeStartElement("fundingReference"); // - XmlWriterUtil.writeFullElement(xmlw, "funderName", StringEscapeUtils.escapeXml10(funder)); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "funderName", attributeMap, StringEscapeUtils.escapeXml10(funder)); if (StringUtils.isNotBlank(awardNumber)) { XmlWriterUtil.writeFullElement(xmlw, "awardNumber", StringEscapeUtils.escapeXml10(awardNumber)); } From ba660c30d08f26a2ecc85467afd308d67e9c2cb9 Mon Sep 17 00:00:00 2001 From: Benedikt Kruse <149382667+BenediktMeierUIT@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:13:31 +0200 Subject: [PATCH 284/366] 10527 404static.xhtml has an old date in the footer (2023 is hard-coded) and update URLs (#10535) * Javascript updates the year automatically and the URLs are customised. * add taps * only change year and and all the other errors are still there. --- src/main/webapp/404static.xhtml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/404static.xhtml b/src/main/webapp/404static.xhtml index 69ff17ebc0f..dabcb299aa5 100644 --- a/src/main/webapp/404static.xhtml +++ b/src/main/webapp/404static.xhtml @@ -93,7 +93,7 @@
-

Copyright © 2023, The President & Fellows of Harvard College | Privacy Policy +

Copyright ©, The President & Fellows of Harvard College | Privacy Policy

@@ -106,4 +106,13 @@
- + + + + \ No newline at end of file From 280ed49c48a97781ef8df69ea5d90d3456c81bd4 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 12 Sep 2024 15:31:23 -0400 Subject: [PATCH 285/366] adopt using CDI, fix funderIdentifier element per schema --- .../pidproviders/PidProviderFactoryBean.java | 5 +- .../pidproviders/doi/XmlMetadataTemplate.java | 68 ++++++++++++------- .../doi/datacite/DataCiteDOIProvider.java | 4 -- 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java index 2e3b96b2dd7..d7a19355a78 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java @@ -252,8 +252,5 @@ public PidProvider getDefaultPidGenerator() { return PidUtil.getPidProvider(protocol, authority, shoulder); } } - - public JsonObject getExternalVocabularyValue(String name) { - return datasetFieldServiceBean.getExternalVocabularyValue(name); - } + } \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 93631ad8c0a..fc9fbd79acf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -41,6 +41,7 @@ import edu.harvard.iq.dataverse.DatasetField; import edu.harvard.iq.dataverse.DatasetFieldCompoundValue; import edu.harvard.iq.dataverse.DatasetFieldConstant; +import edu.harvard.iq.dataverse.DatasetFieldServiceBean; import edu.harvard.iq.dataverse.DatasetFieldType; import edu.harvard.iq.dataverse.DatasetFieldValue; import edu.harvard.iq.dataverse.DatasetRelPublication; @@ -70,6 +71,7 @@ import edu.harvard.iq.dataverse.util.StringUtil; import edu.harvard.iq.dataverse.util.xml.XmlPrinter; import edu.harvard.iq.dataverse.util.xml.XmlWriterUtil; +import jakarta.enterprise.inject.spi.CDI; import jakarta.json.JsonObject; public class XmlMetadataTemplate { @@ -623,34 +625,32 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin } if (StringUtils.isNotBlank(affiliation)) { - String orgName = getOrganizationFromRORField(affiliation, attributeMap); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(orgName)); - } - xmlw.writeEndElement(); - } - - private String getOrganizationFromRORField(String nameOrRor, Map attributeMap) { - boolean isROR=false; - String orgName = nameOrRor; - ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR; - if (externalIdentifier.isValidIdentifier(nameOrRor)) { - isROR=true; - if(pidProvider instanceof DataCiteDOIProvider dcProvider) { - JsonObject jo = dcProvider.getExternalVocabularyValue(nameOrRor); - if(jo!=null) { + attributeMap.clear(); + boolean isROR=false; + String orgName = affiliation; + ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR; + if (externalIdentifier.isValidIdentifier(orgName)) { + isROR = true; + JsonObject jo = getExternalVocabularyValue(orgName); + if (jo != null) { orgName = jo.getString("termName"); } } - } - - attributeMap.clear(); - if (isROR) { + + if (isROR) { + + attributeMap.put("schemeURI", "https://ror.org"); + attributeMap.put("affiliationIdentifierScheme", "ROR"); + attributeMap.put("affiliationIdentifier", orgName); + } - attributeMap.put("schemeURI", "https://ror.org"); - attributeMap.put("affiliationIdentifierScheme", "ROR"); - attributeMap.put("affiliationIdentifier", nameOrRor); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "affiliation", attributeMap, StringEscapeUtils.escapeXml10(orgName)); } - return orgName; + xmlw.writeEndElement(); + } + + private JsonObject getExternalVocabularyValue(String id) { + return CDI.current().select(DatasetFieldServiceBean.class).get().getExternalVocabularyValue(id); } /** @@ -1498,10 +1498,26 @@ private void writeFundingReferences(XMLStreamWriter xmlw, DvObject dvObject) thr } if (!StringUtils.isBlank(funder)) { fundingReferenceWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "fundingReferences", fundingReferenceWritten); - Map attributeMap = new HashMap<>(); - funder = getOrganizationFromRORField(funder, attributeMap); + boolean isROR=false; + String funderIdentifier = null; + ExternalIdentifier externalIdentifier = ExternalIdentifier.ROR; + if (externalIdentifier.isValidIdentifier(funder)) { + isROR = true; + JsonObject jo = getExternalVocabularyValue(funder); + if (jo != null) { + funderIdentifier = funder; + funder = jo.getString("termName"); + } + } + xmlw.writeStartElement("fundingReference"); // - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "funderName", attributeMap, StringEscapeUtils.escapeXml10(funder)); + XmlWriterUtil.writeFullElement(xmlw, "funderName", StringEscapeUtils.escapeXml10(funder)); + if (isROR) { + Map attributeMap = new HashMap<>(); + attributeMap.put("schemeURI", "https://ror.org"); + attributeMap.put("funderIdentifierType", "ROR"); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "funderIdentifier", attributeMap, StringEscapeUtils.escapeXml10(funderIdentifier)); + } if (StringUtils.isNotBlank(awardNumber)) { XmlWriterUtil.writeFullElement(xmlw, "awardNumber", StringEscapeUtils.escapeXml10(awardNumber)); } diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java index d84b7760a96..5630844fb32 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/datacite/DataCiteDOIProvider.java @@ -342,9 +342,5 @@ public boolean updateIdentifier(DvObject dvObject) { return false; } } - - public JsonObject getExternalVocabularyValue(String name) { - return pidProviderService.getExternalVocabularyValue(name); - } } From aee157dbe5628c0a89827627ecca74fb4d8d4af3 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 12 Sep 2024 15:35:38 -0400 Subject: [PATCH 286/366] datasetTypes test fix --- src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java index 1dec51cc3ef..e8426b638d7 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java @@ -240,7 +240,8 @@ public void testAddAndDeleteDatasetType() { numbersOnly.prettyPrint(); numbersOnly.then().assertThat().statusCode(BAD_REQUEST.getStatusCode()); - String randomName = UUID.randomUUID().toString().substring(0, 8); + //Avoid all-numeric names (which are not allowed) + String randomName = "A" + UUID.randomUUID().toString().substring(0, 8); String jsonIn = Json.createObjectBuilder().add("name", randomName).build().toString(); System.out.println("adding type with name " + randomName); From f255f1996eb93917170aa7744a28ae29214db02b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 12 Sep 2024 16:43:58 -0400 Subject: [PATCH 287/366] release note/changelog changes --- doc/release-notes/10632-DataCiteXMLandRelationType.md | 6 +++--- doc/sphinx-guides/source/api/changelog.rst | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/10632-DataCiteXMLandRelationType.md b/doc/release-notes/10632-DataCiteXMLandRelationType.md index d90edcad0e2..10e9a830714 100644 --- a/doc/release-notes/10632-DataCiteXMLandRelationType.md +++ b/doc/release-notes/10632-DataCiteXMLandRelationType.md @@ -8,9 +8,9 @@ For details see https://github.com/IQSS/dataverse/pull/10632 and https://github. Multiple backward incompatible changes and bug fixes have been made to API calls (3 of the four of which were not documented) related to updating PID target urls and metadata at the provider service: [Update Target URL for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider) -[Update Target URL for all Published Datasets at the PID provider](https://dataverse-guide--10632.org.readthedocs.build/en/10632/admin/dataverses-datasets.html#update-target-url-for-all-published-datasets-at-the-pid-provider) -[Update Metadata for a Published Dataset at the PID provider](https://dataverse-guide--10632.org.readthedocs.build/en/10632/admin/dataverses-datasets.html#update-metadata-for-a-published-dataset-at-the-pid-provider) -[Update Metadata for all Published Datasets at the PID provider](https://dataverse-guide--10632.org.readthedocs.build/en/10632/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider) +[Update Target URL for all Published Datasets at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-all-published-datasets-at-the-pid-provider) +[Update Metadata for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-a-published-dataset-at-the-pid-provider) +[Update Metadata for all Published Datasets at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider) Upgrade instructions -------------------- diff --git a/doc/sphinx-guides/source/api/changelog.rst b/doc/sphinx-guides/source/api/changelog.rst index a7af3e84b28..b40d32f37d8 100644 --- a/doc/sphinx-guides/source/api/changelog.rst +++ b/doc/sphinx-guides/source/api/changelog.rst @@ -6,6 +6,12 @@ This API changelog is experimental and we would love feedback on its usefulness. .. contents:: |toctitle| :local: :depth: 1 +v6.4 +---- + +[**/api/datasets/$dataset-id/modifyRegistration**](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider) - changes from GET to POST +[**/api/datasets/modifyRegistrationPIDMetadataAll**](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider) - changes from GET to POST + v6.3 ---- From 2ecbd692bd5a4a6fbb2702af5c859a2f09e0f577 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 13 Sep 2024 12:26:04 +0200 Subject: [PATCH 288/366] chore(ct): update base image wait4x to 2.14.2 for stdlib update --- modules/container-base/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index e3717928285..802db62e5e4 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -106,7 +106,7 @@ EOF ARG JATTACH_VERSION="v2.2" ARG JATTACH_TGZ_CHECKSUM_AMD64="acd9e17f15749306be843df392063893e97bfecc5260eef73ee98f06e5cfe02f" ARG JATTACH_TGZ_CHECKSUM_ARM64="288ae5ed87ee7fe0e608c06db5a23a096a6217c9878ede53c4e33710bdcaab51" -ARG WAIT4X_VERSION="v2.14.1" +ARG WAIT4X_VERSION="v2.14.2" ARG PKGS="jq imagemagick curl unzip wget acl lsof procps netcat-openbsd dumb-init" # Installing the packages in an extra container layer for better caching From f20117406c72f2eef91371ed3276200d58bcbceb Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Fri, 13 Sep 2024 14:12:14 +0200 Subject: [PATCH 289/366] chore(ct): update base image wait4x to 2.14.2 for stdlib update #10844 --- modules/container-base/src/main/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/container-base/src/main/docker/Dockerfile b/modules/container-base/src/main/docker/Dockerfile index 29078e6896c..57ab5ac5787 100644 --- a/modules/container-base/src/main/docker/Dockerfile +++ b/modules/container-base/src/main/docker/Dockerfile @@ -106,7 +106,7 @@ EOF ARG JATTACH_VERSION="v2.2" ARG JATTACH_TGZ_CHECKSUM_AMD64="acd9e17f15749306be843df392063893e97bfecc5260eef73ee98f06e5cfe02f" ARG JATTACH_TGZ_CHECKSUM_ARM64="288ae5ed87ee7fe0e608c06db5a23a096a6217c9878ede53c4e33710bdcaab51" -ARG WAIT4X_VERSION="v2.14.0" +ARG WAIT4X_VERSION="v2.14.2" ARG PKGS="jq imagemagick curl unzip wget acl lsof procps netcat-openbsd dumb-init" # Installing the packages in an extra container layer for better caching From 194dae8172cd148233a6f2a0e1fbe9bcad6a0b51 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 13 Sep 2024 10:36:45 -0400 Subject: [PATCH 290/366] don't send contributors w/o contributorType --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index fc9fbd79acf..6259a41017f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -574,7 +574,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X } // QDR - doesn't have Funder in the contributor type list. // Using a string isn't i18n - if (StringUtils.isNotBlank(contributor) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) { + if (StringUtils.isNotBlank(contributor) && StringUtils.isNotBlank(contributorType) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) { contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(contributor, false, false); writeEntityElements(xmlw, "contributor", contributorType, entityObject, null, null, null); From 35ff432480800c1b99400bf00db9a64c3456981a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Fri, 13 Sep 2024 15:25:01 -0400 Subject: [PATCH 291/366] relatedIdentifierType is required --- .../pidproviders/doi/XmlMetadataTemplate.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 6259a41017f..6ed13a05301 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1031,6 +1031,13 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th break; default: if (relatedIdentifier != null) { + //See if it is a GlobalID we know + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + pubIdType = getCanonicalPublicationType(pid.getProtocol()); + } catch (IllegalArgumentException e) { + } // For non-URL types, if a URL is given, split the string to get a schemeUri try { URL relatedUrl = new URI(relatedIdentifier).toURL(); @@ -1039,16 +1046,16 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th String site = String.format("%s://%s", protocol, authority); relatedIdentifier = relatedIdentifier.substring(site.length()); attributes.put("schemeURI", site); + pubIdType = "URL"; } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { - // Just an identifier + // Just an identifier but without a pubIdType we won't include it + logger.warning("Related Identifier found without type: " + relatedIdentifier); } } } - if (StringUtils.isNotBlank(relatedIdentifier)) { + if (StringUtils.isNotBlank(relatedIdentifier) && StringUtils.isNotBlank(pubIdType)) { // Still have a valid entry - if (pubIdType != null) { - attributes.put("relatedIdentifierType", pubIdType); - } + attributes.put("relatedIdentifierType", pubIdType); attributes.put("relationType", relationType); relatedIdentifiersWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "relatedIdentifiers", relatedIdentifiersWritten); XmlWriterUtil.writeFullElementWithAttributes(xmlw, "relatedIdentifier", attributes, relatedIdentifier); @@ -1115,8 +1122,10 @@ private static String getCanonicalPublicationType(String pubIdType) { relatedIdentifierTypeMap.put("URL".toLowerCase(), "URL"); relatedIdentifierTypeMap.put("URN".toLowerCase(), "URN"); relatedIdentifierTypeMap.put("WOS".toLowerCase(), "WOS"); - // Add entry for Handle protocol so this can be used with GlobalId/getProtocol() + // Add entry for Handle,Perma protocols so this can be used with GlobalId/getProtocol() relatedIdentifierTypeMap.put("hdl".toLowerCase(), "Handle"); + relatedIdentifierTypeMap.put("perma".toLowerCase(), "URL"); + } return relatedIdentifierTypeMap.get(pubIdType); } From 6c8f73e47b5e77467a47d753f49d855c242727f8 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Sat, 14 Sep 2024 10:41:24 -0400 Subject: [PATCH 292/366] flip to prefer identifier over url seeing cases at QDR where the type is DOI, the identifier is the doi and the URL is a non-DOI reference (e.g. at pubmed). --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 6ed13a05301..6b9e6c31660 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -993,10 +993,10 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th pubIdType = getCanonicalPublicationType(pubIdType); logger.fine("Canonical type: " + pubIdType); - // Prefer url if set, otherwise check identifier - String relatedIdentifier = url; + // Prefer identifier if set, otherwise check url + String relatedIdentifier = identifier; if (StringUtils.isBlank(relatedIdentifier)) { - relatedIdentifier = identifier; + relatedIdentifier = url; } logger.fine("Related identifier: " + relatedIdentifier); // For types where we understand the protocol, get the canonical form From 86aec687f6451713377b9753bef83fbe5eb609e6 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Sat, 14 Sep 2024 10:56:49 -0400 Subject: [PATCH 293/366] Handle case where type is set but there's no identifier --- .../pidproviders/doi/XmlMetadataTemplate.java | 89 ++++++++++--------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 6b9e6c31660..77b9f9c63bb 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1000,56 +1000,57 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th } logger.fine("Related identifier: " + relatedIdentifier); // For types where we understand the protocol, get the canonical form - - switch (pubIdType != null ? pubIdType : "none") { - case "DOI": - if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) { - relatedIdentifier = "doi:" + relatedIdentifier; - } - logger.fine("Intermediate Related identifier: " + relatedIdentifier); - try { - GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); - relatedIdentifier = pid.asRawIdentifier(); - } catch (IllegalArgumentException e) { - logger.warning("Invalid DOI: " + e.getLocalizedMessage()); - relatedIdentifier = null; - } - logger.fine("Final Related identifier: " + relatedIdentifier); - break; - case "Handle": - if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) { - relatedIdentifier = "hdl:" + relatedIdentifier; - } - try { - GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); - relatedIdentifier = pid.asRawIdentifier(); - } catch (IllegalArgumentException e) { - relatedIdentifier = null; - } - break; - case "URL": - break; - default: - if (relatedIdentifier != null) { - //See if it is a GlobalID we know + if (StringUtils.isNotBlank(relatedIdentifier)) { + switch (pubIdType != null ? pubIdType : "none") { + case "DOI": + if (!(relatedIdentifier.startsWith("doi:") || relatedIdentifier.startsWith("http"))) { + relatedIdentifier = "doi:" + relatedIdentifier; + } + logger.fine("Intermediate Related identifier: " + relatedIdentifier); try { GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); relatedIdentifier = pid.asRawIdentifier(); - pubIdType = getCanonicalPublicationType(pid.getProtocol()); } catch (IllegalArgumentException e) { + logger.warning("Invalid DOI: " + e.getLocalizedMessage()); + relatedIdentifier = null; + } + logger.fine("Final Related identifier: " + relatedIdentifier); + break; + case "Handle": + if (!relatedIdentifier.startsWith("hdl:") || !relatedIdentifier.startsWith("http")) { + relatedIdentifier = "hdl:" + relatedIdentifier; } - // For non-URL types, if a URL is given, split the string to get a schemeUri try { - URL relatedUrl = new URI(relatedIdentifier).toURL(); - String protocol = relatedUrl.getProtocol(); - String authority = relatedUrl.getAuthority(); - String site = String.format("%s://%s", protocol, authority); - relatedIdentifier = relatedIdentifier.substring(site.length()); - attributes.put("schemeURI", site); - pubIdType = "URL"; - } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { - // Just an identifier but without a pubIdType we won't include it - logger.warning("Related Identifier found without type: " + relatedIdentifier); + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + } catch (IllegalArgumentException e) { + relatedIdentifier = null; + } + break; + case "URL": + break; + default: + if (relatedIdentifier != null) { + // See if it is a GlobalID we know + try { + GlobalId pid = PidUtil.parseAsGlobalID(relatedIdentifier); + relatedIdentifier = pid.asRawIdentifier(); + pubIdType = getCanonicalPublicationType(pid.getProtocol()); + } catch (IllegalArgumentException e) { + } + // For non-URL types, if a URL is given, split the string to get a schemeUri + try { + URL relatedUrl = new URI(relatedIdentifier).toURL(); + String protocol = relatedUrl.getProtocol(); + String authority = relatedUrl.getAuthority(); + String site = String.format("%s://%s", protocol, authority); + relatedIdentifier = relatedIdentifier.substring(site.length()); + attributes.put("schemeURI", site); + pubIdType = "URL"; + } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { + // Just an identifier but without a pubIdType we won't include it + logger.warning("Related Identifier found without type: " + relatedIdentifier); + } } } } From 203add1bb99bbdc2ffdec1c45c07f51d3b5db79a Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Sat, 14 Sep 2024 11:20:11 -0400 Subject: [PATCH 294/366] map non-standard contributors to Other, remove unused imports --- .../pidproviders/doi/XmlMetadataTemplate.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 77b9f9c63bb..c86baf17f90 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -10,16 +10,15 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.logging.Logger; -import java.util.stream.Collectors; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; @@ -27,14 +26,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; import org.ocpsoft.common.util.Strings; import edu.harvard.iq.dataverse.AlternativePersistentIdentifier; -import edu.harvard.iq.dataverse.ControlledVocabularyValue; import edu.harvard.iq.dataverse.DataFile; import edu.harvard.iq.dataverse.Dataset; import edu.harvard.iq.dataverse.DatasetAuthor; @@ -42,8 +36,6 @@ import edu.harvard.iq.dataverse.DatasetFieldCompoundValue; import edu.harvard.iq.dataverse.DatasetFieldConstant; import edu.harvard.iq.dataverse.DatasetFieldServiceBean; -import edu.harvard.iq.dataverse.DatasetFieldType; -import edu.harvard.iq.dataverse.DatasetFieldValue; import edu.harvard.iq.dataverse.DatasetRelPublication; import edu.harvard.iq.dataverse.DatasetVersion; import edu.harvard.iq.dataverse.DvObject; @@ -52,23 +44,16 @@ import edu.harvard.iq.dataverse.GlobalId; import edu.harvard.iq.dataverse.TermsOfUseAndAccess; import edu.harvard.iq.dataverse.api.Util; -import edu.harvard.iq.dataverse.api.dto.DatasetDTO; -import edu.harvard.iq.dataverse.api.dto.FieldDTO; -import edu.harvard.iq.dataverse.api.dto.MetadataBlockDTO; import edu.harvard.iq.dataverse.dataset.DatasetType; import edu.harvard.iq.dataverse.dataset.DatasetUtil; -import edu.harvard.iq.dataverse.export.DDIExporter; import edu.harvard.iq.dataverse.license.License; import edu.harvard.iq.dataverse.pidproviders.AbstractPidProvider; import edu.harvard.iq.dataverse.pidproviders.PidProvider; import edu.harvard.iq.dataverse.pidproviders.PidUtil; -import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider; -import edu.harvard.iq.dataverse.pidproviders.doi.datacite.DataCiteDOIProvider; import edu.harvard.iq.dataverse.pidproviders.handle.HandlePidProvider; import edu.harvard.iq.dataverse.pidproviders.perma.PermaLinkPidProvider; import edu.harvard.iq.dataverse.util.BundleUtil; import edu.harvard.iq.dataverse.util.PersonOrOrgUtil; -import edu.harvard.iq.dataverse.util.StringUtil; import edu.harvard.iq.dataverse.util.xml.XmlPrinter; import edu.harvard.iq.dataverse.util.xml.XmlWriterUtil; import jakarta.enterprise.inject.spi.CDI; @@ -575,6 +560,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X // QDR - doesn't have Funder in the contributor type list. // Using a string isn't i18n if (StringUtils.isNotBlank(contributor) && StringUtils.isNotBlank(contributorType) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) { + contributorType = getCanonicalContributorType(contributorType); contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(contributor, false, false); writeEntityElements(xmlw, "contributor", contributorType, entityObject, null, null, null); @@ -587,6 +573,18 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X } } + //List from https://schema.datacite.org/meta/kernel-4/include/datacite-contributorType-v4.xsd + private Set contributorTypes = new HashSet<>(Arrays.asList("ContactPerson", "DataCollector", "DataCurator", "DataManager", "Distributor", "Editor", + "HostingInstitution", "Other", "Producer", "ProjectLeader", "ProjectManager", "ProjectMember", "RegistrationAgency", "RegistrationAuthority", + "RelatedPerson", "ResearchGroup", "RightsHolder", "Researcher", "Sponsor", "Supervisor", "WorkPackageLeader")); + + private String getCanonicalContributorType(String contributorType) { + if(!contributorTypes.contains(contributorType)) { + return "Other"; + } + return contributorType; + } + private void writeEntityElements(XMLStreamWriter xmlw, String elementName, String type, JsonObject entityObject, String affiliation, String nameIdentifier, String nameIdentifierScheme) throws XMLStreamException { xmlw.writeStartElement(elementName); Map attributeMap = new HashMap(); From b06e620335bad37e07622c3e28a186d4505177f4 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Sat, 14 Sep 2024 11:31:50 -0400 Subject: [PATCH 295/366] Treat missing contrib type as Other --- .../iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index c86baf17f90..5ca62932e15 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -559,7 +559,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X } // QDR - doesn't have Funder in the contributor type list. // Using a string isn't i18n - if (StringUtils.isNotBlank(contributor) && StringUtils.isNotBlank(contributorType) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) { + if (StringUtils.isNotBlank(contributor) && !StringUtils.equalsIgnoreCase("Funder", contributorType)) { contributorType = getCanonicalContributorType(contributorType); contributorsCreated = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "contributors", contributorsCreated); JsonObject entityObject = PersonOrOrgUtil.getPersonOrOrganization(contributor, false, false); @@ -579,7 +579,7 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X "RelatedPerson", "ResearchGroup", "RightsHolder", "Researcher", "Sponsor", "Supervisor", "WorkPackageLeader")); private String getCanonicalContributorType(String contributorType) { - if(!contributorTypes.contains(contributorType)) { + if(StringUtils.isBlank(contributorType) || !contributorTypes.contains(contributorType)) { return "Other"; } return contributorType; From 66bcbbb12976e03b6f41feae39255b214580f481 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 15:03:39 +0200 Subject: [PATCH 296/366] chore(ci): delete duplicate action after renaming --- .../actions/check-newer-base-image/action.yml | 53 ------------------- 1 file changed, 53 deletions(-) delete mode 100644 .github/actions/check-newer-base-image/action.yml diff --git a/.github/actions/check-newer-base-image/action.yml b/.github/actions/check-newer-base-image/action.yml deleted file mode 100644 index d0c2e92d60a..00000000000 --- a/.github/actions/check-newer-base-image/action.yml +++ /dev/null @@ -1,53 +0,0 @@ ---- -name: "Check Newer Base Image" -description: "Determine if a base image is more recent than the derived." -inputs: - base: - description: 'The name and (rolling) tag of the base image to check - or - a shell command to get it' - required: true - derived: - description: 'The name and (rolling) tag of the derived image - or - a shell command to get it' - required: true -outputs: - is-more-recent: - description: "True if base image has a more recent update, false if not." - value: "${{ steps.determine.outputs.is_more_recent }}" - -runs: - using: composite - steps: - - shell: bash - id: determine - run: | - BASE_IMAGE="${{ inputs.base }}" - # Get namespace, default to "library" if not found - BASE_IMAGE_NS="${BASE_IMAGE%/*}" - if [[ "$BASE_IMAGE_NS" = "${BASE_IMAGE}" ]]; then - BASE_IMAGE_NS="library" - fi - BASE_IMAGE_REPO="${BASE_IMAGE%:*}" - BASE_IMAGE_TAG="${BASE_IMAGE#*:}" - - BASE_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${BASE_IMAGE_NS}/repositories/${BASE_IMAGE_REPO}/tags/${BASE_IMAGE_TAG}" | jq -r .last_updated )" - if [[ "$BASE_IMAGE_LAST_UPDATE" = "null" ]]; then - echo "::error title='Invalid Base Image'::Could not find ${BASE_IMAGE} in the registry" - exit 1 - fi - - DERIVED_IMAGE="${{ inputs.derived }}" - # Get namespace, default to "library" if not found - DERIVED_IMAGE_NS="${DERIVED_IMAGE%/*}" - if [[ "${DERIVED_IMAGE_NS}" = "${DERIVED_IMAGE}" ]]; then - DERIVED_IMAGE_NS="library" - fi - DERIVED_IMAGE_REPO="$( echo "${DERIVED_IMAGE%:*}" | cut -f2 -d/ )" - DERIVED_IMAGE_TAG="${DERIVED_IMAGE#*:}" - - DERIVED_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${DERIVED_IMAGE_NS}/repositories/${DERIVED_IMAGE_REPO}/tags/${DERIVED_IMAGE_TAG}" | jq -r .last_updated )" - if [[ "$DERIVED_IMAGE_LAST_UPDATE" = "null" || "$DERIVED_IMAGE_LAST_UPDATE" < "$BASE_IMAGE_LAST_UPDATE" ]]; then - echo "Base image $BASE_IMAGE has a newer release ($BASE_IMAGE_LAST_UPDATE), which is more recent than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" - echo "is_more_recent=true" >> $GITHUB_OUTPUT - else - echo "Base image $BASE_IMAGE ($BASE_IMAGE_LAST_UPDATE) is older than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" - echo "is_more_recent=false" >> $GITHUB_OUTPUT - fi From d3dc5c65b957aa8489168560b4fe398d7e8d8439 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 16:14:21 +0200 Subject: [PATCH 297/366] docs(ct): update base image tag policy from latest discussion #10827 As discussed during the 2024-09-12 containerization working group meeting (see ct.gdcc.io) and on https://dataverse.zulipchat.com/#narrow/stream/375812-containers/topic/change.20version.20scheme.20base.20image.3F/near/469884104 --- .../source/container/base-image.rst | 53 ++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index 83799397860..8d08f042e5d 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -37,39 +37,54 @@ Our tagging is inspired by `Bitnami .`` tag). +Expect disruptive changes in case of high risk security threats. + +- | **Latest** + | Definition: ``latest`` + | Summary: Rolling tag, always pointing to the latest revision of the most current Dataverse release. - | **Rolling Production** | Definition: ``.-`` | Example: ``6.4-noble`` - | Summary: A **rolling tag** for released versions of Dataverse that will always point to latest revision of an immutable production image (see below). - | The **three latest releases** of the Dataverse project will receive regular, scheduled updates to the image such as security patches for the underlying operating system. Content will be fairly stable as disruptive changes like Payara or Java upgrades will be handled in a new major or minor upgrade to Dataverse (a new ``.`` tag). Expect disruptive changes in case of high risk security threats. + | Summary: Rolling tag, pointing to the latest revision of an immutable production image for released versions of Dataverse. - | **Immutable Production** | Definition: ``.--r`` | Example: ``6.4-noble-r1`` | Summary: An **immutable tag** where the revision is incremented for rebuilds of the image. | This image should be especially attractive if you want explict control over when your images are updated. -We offer two rolling tags for developers: +Tags for Development Use +^^^^^^^^^^^^^^^^^^^^^^^^ -- | **Latest** - | Definition: ``latest`` - | Example: ``latest`` - | Summary: A **rolling tag** that tracks the ``develop`` branch (see also :ref:`develop-branch`). (`Dockerfile `__) +All of the tags below are strongly recommended for development purposes only due to their fast changing nature. +In addition to updates due to PR merges, the most recent are undergoing scheduled maintenance to ensure timely security fixes. +When a development cycle of the Dataverse project finishes, maintenance ceases for any tags carrying version numbers. +For now, stale images will be kept on Docker Hub indefinitely. + +- | **Unstable** + | Definition: ``unstable`` + | Summary: Rolling tag, tracking the ``develop`` branch (see also :ref:`develop-branch`). (`Dockerfile `__) | Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag. - Usage is recommended for **development purposes only**. +- | **Upcoming** + | Definition: ``.-`` + | Example: ``6.5-noble`` + | Summary: Rolling tag, equivalent to ``unstable`` for current development cycle. + Will roll over to the rolling production tag after a Dataverse release. - | **Flexible Stack** | Definition: ``.--p-j``: - | Example: ``6.4-noble-p6.2024.6-j17`` - | Summary: A **rolling tag** during a development cycle of the Dataverse software (`Dockerfile `__). - | *Note 1:* No updates for tags after a development cycle ends. - Usage is recommended for **development purposes only**. - | *Note 2:* The current tag will always be 1 minor version ahead of Datavere releases. - Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway. - The rolling tag in use during the cycle will be ``6.(x+1)-ffffff-p6.202P.P-jJJ``. - See also: :doc:`/developers/making-releases`. - -You can find these tags at https://hub.docker.com/r/gdcc/base/tags + | Example: ``6.5-noble-p6.2024.6-j17`` + | Summary: Rolling tag during a development cycle of the Dataverse software (`Dockerfile `__). + +**NOTE**: The current tag will always be 1 minor version ahead of Datavere releases. +Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway. +The rolling tag in use during the cycle will be ``6.(x+1)-FFF`` and ``6.(x+1)-FFF-p6.202P.P-jJJ``. +See also: :doc:`/developers/making-releases`. Image Contents ++++++++++++++ From 08a94bb84542b7980330c4d428a03debe6a95316 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 16:40:09 +0200 Subject: [PATCH 298/366] style,docs(ct): minor tweaks to base image policy as per @pdurbin --- doc/sphinx-guides/source/container/base-image.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index 8d08f042e5d..84f6c5ece02 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -77,11 +77,11 @@ For now, stale images will be kept on Docker Hub indefinitely. | Summary: Rolling tag, equivalent to ``unstable`` for current development cycle. Will roll over to the rolling production tag after a Dataverse release. - | **Flexible Stack** - | Definition: ``.--p-j``: + | Definition: ``.--p-j`` | Example: ``6.5-noble-p6.2024.6-j17`` | Summary: Rolling tag during a development cycle of the Dataverse software (`Dockerfile `__). -**NOTE**: The current tag will always be 1 minor version ahead of Datavere releases. +**NOTE**: In these tags for development usage, the version number will always be 1 minor version ahead of existing Dataverse releases. Example: Assume Dataverse ``6.x`` is released, ``6.(x+1)`` is underway. The rolling tag in use during the cycle will be ``6.(x+1)-FFF`` and ``6.(x+1)-FFF-p6.202P.P-jJJ``. See also: :doc:`/developers/making-releases`. From 8cc9d20326509af6236d51362ab5729087fb1f09 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 16:49:03 +0200 Subject: [PATCH 299/366] feat(ct): switch latest to unstable in base image flow As per latest discussion, we want to keep the unstable tag around. It shall still point to the latest from develop as it has been done before our revised tagging policy. Latest will be used for production images, much more aligned with the Bitnami policy --- .github/workflows/container_maintenance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index c09aad22916..80e063bc222 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -133,7 +133,7 @@ jobs: - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | - echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" + echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=unstable" | tee -a "${GITHUB_ENV}" - name: Deploy multi-arch base container image to Docker Hub if: ${{ steps.temurin-check.outputs.is-more-recent == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} id: build From 466d2ef4ec0c5a33253acca82b861fd05564a571 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 17:03:46 +0200 Subject: [PATCH 300/366] style,docs(ct): minor tweaks to base image policy as per @pdurbin --- doc/sphinx-guides/source/container/base-image.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sphinx-guides/source/container/base-image.rst b/doc/sphinx-guides/source/container/base-image.rst index 84f6c5ece02..a0852a5465f 100644 --- a/doc/sphinx-guides/source/container/base-image.rst +++ b/doc/sphinx-guides/source/container/base-image.rst @@ -72,12 +72,12 @@ For now, stale images will be kept on Docker Hub indefinitely. | Summary: Rolling tag, tracking the ``develop`` branch (see also :ref:`develop-branch`). (`Dockerfile `__) | Please expect abrupt changes like new Payara or Java versions as well as OS updates or flavor switches when using this tag. - | **Upcoming** - | Definition: ``.-`` + | Definition: ``.-`` | Example: ``6.5-noble`` | Summary: Rolling tag, equivalent to ``unstable`` for current development cycle. Will roll over to the rolling production tag after a Dataverse release. - | **Flexible Stack** - | Definition: ``.--p-j`` + | Definition: ``.--p-j`` | Example: ``6.5-noble-p6.2024.6-j17`` | Summary: Rolling tag during a development cycle of the Dataverse software (`Dockerfile `__). From 4c9e80fe09e0f607a039d61fd2dfbf190235660e Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 17:31:57 +0200 Subject: [PATCH 301/366] fix(ct): remove auth for revision action Maybe we won't run into a rate limit for now, as the limit of 180/s * 100 = 18000 tags/s seems to leave us some headroom for now. --- .github/actions/get-image-revision/action.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/get-image-revision/action.yml b/.github/actions/get-image-revision/action.yml index ca9eedeabe1..6eaf89abba2 100644 --- a/.github/actions/get-image-revision/action.yml +++ b/.github/actions/get-image-revision/action.yml @@ -39,14 +39,17 @@ runs: *) IMAGE_NS_REPO="library/$IMAGE_NS_REPO";; # bare repository name (docker official image); must convert to namespace/repository syntax esac - # Without such a token we run into rate limits + # Without such a token we may run into rate limits + # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits. token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$IMAGE_NS_REPO:pull" ) ALL_TAGS="$( i=0 while [ $? == 0 ]; do i=$((i+1)) - RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) + # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits. + # RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) + RESULT=$( curl -s "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) if [[ $( echo "$RESULT" | jq '.message' ) != "null" ]]; then # If we run into an error on the first attempt, that means we have a problem. if [[ "$i" == "1" ]]; then From 86f2c84d3ded51597f2e15f9bc86817e502afcec Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 17:44:39 +0200 Subject: [PATCH 302/366] fix(ct): try to avoid shell substitution in base image flow We might need more backslashes to avoid telling the shell to replace what we want to be a maven property --- .github/workflows/container_maintenance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 80e063bc222..c8fe2fa2937 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -129,7 +129,7 @@ jobs: uses: gdcc/wip-dataverse-base-image/.github/actions/get-image-revision@10478-version-base-img with: image-ref: ${{ env.BASE_IMAGE }} - tag-options-prefix: "-Dbase.image.tag=\\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=" + tag-options-prefix: "-Dbase.image.tag=\\\\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=" - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | From 997f7ebab9c61f578ddeb31197edfed847e3e64b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Mon, 16 Sep 2024 17:54:58 +0200 Subject: [PATCH 303/366] fix(ct): avoid shell substitutions going awry for base image release tag Instead of using a Maven reference and dealing with escaping of $ chars, override the suffix with an empty string --- .github/workflows/container_maintenance.yml | 4 ++-- modules/container-base/pom.xml | 4 ++-- modules/container-base/src/backports/v6.1/001-pom.xml.patch | 4 ++-- modules/container-base/src/backports/v6.2/001-pom.xml.patch | 4 ++-- modules/container-base/src/backports/v6.3/001-pom.xml.patch | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index c8fe2fa2937..b7f8fcf45fa 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -96,7 +96,7 @@ jobs: if [[ "${{ matrix.branch }}" = "${{ env.DEVELOP_BRANCH }}" ]]; then NAME=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout ) else - NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag="\${base.image.tag.release}" -q -DforceStdout ) + NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout ) fi echo "BASE_IMAGE=${NAME}" | tee -a "${GITHUB_ENV}" @@ -129,7 +129,7 @@ jobs: uses: gdcc/wip-dataverse-base-image/.github/actions/get-image-revision@10478-version-base-img with: image-ref: ${{ env.BASE_IMAGE }} - tag-options-prefix: "-Dbase.image.tag=\\\\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=" + tag-options-prefix: "-Dbase.image.tag.suffix='' -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=" - name: Configure update of "latest" tag for development branch if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index e707c6a69c8..b6667077d98 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -43,8 +43,8 @@ gdcc/base:${base.image.tag} - ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} - ${base.image.version}-${java.image.flavor} + ${base.image.version}-${java.image.flavor}${base.image.tag.suffix} + -p${payara.version}-j${target.java.version} eclipse-temurin:${target.java.version}-jre-${java.image.flavor} noble 1000 diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch index ef0fbdda9fc..6498f972889 100644 --- a/modules/container-base/src/backports/v6.1/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.1/001-pom.xml.patch @@ -7,8 +7,8 @@ - unstable - eclipse-temurin:${target.java.version}-jre + gdcc/base:${base.image.tag} -+ ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} -+ ${base.image.version}-${java.image.flavor} ++ ${base.image.version}-${java.image.flavor}${base.image.tag.suffix} ++ -p${payara.version}-j${target.java.version} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 diff --git a/modules/container-base/src/backports/v6.2/001-pom.xml.patch b/modules/container-base/src/backports/v6.2/001-pom.xml.patch index ef0fbdda9fc..6498f972889 100644 --- a/modules/container-base/src/backports/v6.2/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.2/001-pom.xml.patch @@ -7,8 +7,8 @@ - unstable - eclipse-temurin:${target.java.version}-jre + gdcc/base:${base.image.tag} -+ ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} -+ ${base.image.version}-${java.image.flavor} ++ ${base.image.version}-${java.image.flavor}${base.image.tag.suffix} ++ -p${payara.version}-j${target.java.version} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 diff --git a/modules/container-base/src/backports/v6.3/001-pom.xml.patch b/modules/container-base/src/backports/v6.3/001-pom.xml.patch index ef0fbdda9fc..6498f972889 100644 --- a/modules/container-base/src/backports/v6.3/001-pom.xml.patch +++ b/modules/container-base/src/backports/v6.3/001-pom.xml.patch @@ -7,8 +7,8 @@ - unstable - eclipse-temurin:${target.java.version}-jre + gdcc/base:${base.image.tag} -+ ${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version} -+ ${base.image.version}-${java.image.flavor} ++ ${base.image.version}-${java.image.flavor}${base.image.tag.suffix} ++ -p${payara.version}-j${target.java.version} + eclipse-temurin:${target.java.version}-jre-${java.image.flavor} + jammy 1000 From d76556ab422d48ca0044f7be1a67722f4f420a0d Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Mon, 16 Sep 2024 16:35:20 -0400 Subject: [PATCH 304/366] add trailing / after hostname for perma base-url #10775 --- doc/sphinx-guides/source/installation/config.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 1a09e575cdc..2f4a605260c 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -536,6 +536,7 @@ be configured with the ``base-url`` of a resolution service. PermaLinks also all Note: +- If you configure ``base-url``, it should include a "/" after the hostname like this: ``https://demo.dataverse.org/``. - When using multiple PermaLink providers, you should avoid ambiguous authority/separator/shoulder combinations that would result in the same overall prefix. - In general, PermaLink authority/shoulder values should be alphanumeric. For other cases, admins may need to consider the potential impact of special characters in S3 storage identifiers, resolver URLs, exports, etc. From 48ccdf2bbcbdf8b0cd739fcd504b2465d4cc93c4 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 09:01:14 +0200 Subject: [PATCH 305/366] ci(ct): remove out of scope actions for #10478 We will deal with shipping the updated application container images separately as part of issue #10618. Adding some comments about why some stuff is still around. --- .github/workflows/container_maintenance.yml | 22 +++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index b7f8fcf45fa..c10215a7ccb 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -141,23 +141,25 @@ jobs: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${{ steps.revision-tag.outputs.tag-options }} -Ddocker.platforms=${{ env.PLATFORMS }} echo "rebuild=true" | tee -a "${GITHUB_OUTPUT}" + # TODO: this is here to not drop the knowledge about matrix output workarounds (for now) # - if: always() # name: Save status (workaround for matrix outputs) # run: | # # steps.build.outcome is the status BEFORE continue-on-error # echo "STATUS_$( echo "${{ matrix.branch }}" | tr ".:;,-/ " "_" )=${{ steps.build.outcome }}" | tee -a "${GITHUB_ENV}" - - name: Rebuild application container - if: ${{ steps.build.outputs.rebuild }} - uses: ./.github/actions/deploy-app-container - with: - registry: "" - registry_token: "" - ref: "" - base_image: "" - base_image_tag: "" - + # TODO: As part of issue #10618 we will need to create this action, shipping updated app images + #- name: Rebuild application container + # if: ${{ steps.build.outputs.rebuild }} + # uses: ./.github/actions/deploy-app-container + # with: + # registry: "" + # registry_token: "" + # ref: "" + # base_image: "" + # base_image_tag: "" + # TODO: This job should become part of the matrix as an action, so we don't need to fiddle with matrix outputs hacks #push-app-img: # name: "Rebase & Publish App Image" # permissions: From cc39131d321eab777d0fe4be158e900692870a62 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 09:15:20 +0200 Subject: [PATCH 306/366] ci(ct): reorganise tags for develop branch #10478 Now adding the "upcoming" tag during the develop branch run. Also some reorganizing to ship the tag options using outputs, not env vars. Moving the common Maven option to enable tag overrides to the command instead of the options building. --- .github/workflows/container_maintenance.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index c10215a7ccb..fdef2aac6d4 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -94,11 +94,11 @@ jobs: - name: Determine base image name run: | if [[ "${{ matrix.branch }}" = "${{ env.DEVELOP_BRANCH }}" ]]; then - NAME=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout ) + echo "BASE_IMAGE=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" | tee -a "${GITHUB_ENV}" + echo "BASE_IMAGE_UPCOMING=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )" | tee -a "${GITHUB_ENV}" else - NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout ) + echo "BASE_IMAGE=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )" | tee -a "${GITHUB_ENV}" fi - echo "BASE_IMAGE=${NAME}" | tee -a "${GITHUB_ENV}" # Figure out if a rebuild is necessary because either there is an updated Java image or our installed packages need updates - name: Check for recent Temurin image updates @@ -129,16 +129,18 @@ jobs: uses: gdcc/wip-dataverse-base-image/.github/actions/get-image-revision@10478-version-base-img with: image-ref: ${{ env.BASE_IMAGE }} - tag-options-prefix: "-Dbase.image.tag.suffix='' -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision=" + tag-options-prefix: "-Dbase.image.tag.suffix='' -Ddocker.tags.revision=" - name: Configure update of "latest" tag for development branch + id: develop-tag if: ${{ matrix.branch == env.DEVELOP_BRANCH }} run: | - echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=unstable" | tee -a "${GITHUB_ENV}" + echo "tag-options=-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=${BASE_IMAGE_UPCOMING#*:}" | tee -a "${GITHUB_OUTPUT}" - name: Deploy multi-arch base container image to Docker Hub if: ${{ steps.temurin-check.outputs.is-more-recent == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} id: build run: | - mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${{ steps.revision-tag.outputs.tag-options }} -Ddocker.platforms=${{ env.PLATFORMS }} + mvn -f modules/container-base -Pct deploy -Ddocker.noCache -Ddocker.platforms=${{ env.PLATFORMS }} \ + -Ddocker.imagePropertyConfiguration=override ${{ steps.develop-tag.outputs.tag-options }} ${{ steps.revision-tag.outputs.tag-options }} echo "rebuild=true" | tee -a "${GITHUB_OUTPUT}" # TODO: this is here to not drop the knowledge about matrix output workarounds (for now) From c6b992a1ac11e514b01be81e12cf03039295a6cb Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 10:30:13 +0200 Subject: [PATCH 307/366] chore(parent): remove OSS plugin snapshot repo after upgrade to DMP 0.45 --- modules/dataverse-parent/pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/dataverse-parent/pom.xml b/modules/dataverse-parent/pom.xml index 3df06281547..6bea02569ec 100644 --- a/modules/dataverse-parent/pom.xml +++ b/modules/dataverse-parent/pom.xml @@ -214,14 +214,6 @@ never - - oss.sonatype.org - https://oss.sonatype.org/content/repositories/snapshots - - true - always - - From 8955ef087717b337a9ba7d777505dbd02cce303f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 10:31:22 +0200 Subject: [PATCH 308/366] build(ct): make application image use new base image flexi stack #10478 --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9b4914a1640..d8fe55ba22a 100644 --- a/pom.xml +++ b/pom.xml @@ -999,8 +999,9 @@ unstable false gdcc/base:${base.image.tag} - - rev1 + noble + + ${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version} gdcc/configbaker:${conf.image.tag} ${app.image.tag} From 710cf3cab8b6734d12d5ec2be1134669de5af740 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 10:53:09 +0200 Subject: [PATCH 309/366] style(ct): remove stale comment from base module pom --- modules/container-base/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml index b6667077d98..6417b5b91fa 100644 --- a/modules/container-base/pom.xml +++ b/modules/container-base/pom.xml @@ -12,7 +12,6 @@ io.gdcc container-base - ${packaging.type} Container Base Image This module provides an application server base image to be decorated with the Dataverse app. From b043edff6d1846f223ff89d0f0184abc5d726580 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 11:02:13 +0200 Subject: [PATCH 310/366] chore(ct): add comment about apt sec updates detection via list hack For now, we stick to not alter the image more than necessary. Only packages we installed will be upgraded, as these are not part of the normal Java base images. The Java base images receive regular updates and undergo testing. It might be unwise to just install all the security updates we could get. Leaving the option here for later saves the trouble to dig up the solution again. --- .github/workflows/container_maintenance.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index fdef2aac6d4..3a28f355e94 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -120,7 +120,13 @@ jobs: else echo "Base image $BASE_IMAGE has no updates for our custom installed packages" echo "newer_packages=false" >> "${GITHUB_OUTPUT}" - fi + fi + + # TODO: In a future version of this script, we might want to include checking for other security updates, + # not just updates to the packages we installed. + # grep security /etc/apt/sources.list > /tmp/security.list + # apt-get update -oDir::Etc::Sourcelist=/tmp/security.list + # apt-get dist-upgrade -y -oDir::Etc::Sourcelist=/tmp/security.list -oDir::Etc::SourceParts=/bin/false -s - name: Calculate revision number for immutable tag (on release branches only) if: ${{ matrix.branch != env.DEVELOP_BRANCH }} From 9b12bc234f4fe9e455bfce3e66f3df7120f413cc Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 14:43:25 +0200 Subject: [PATCH 311/366] ci(ct): use new setup-maven action in base image push workflow Simplify setup following DRY principle --- .github/workflows/container_base_push.yml | 25 +++++------------------ 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 532c64bd781..ff5c6117f2b 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -31,27 +31,12 @@ jobs: #if: ${{ github.repository_owner == 'IQSS' }} steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Determine Java version from Parent POM - run: | - echo "JAVA_VERSION=$(grep '' modules/dataverse-parent/pom.xml | cut -f2 -d'>' | cut -f1 -d'<')" >> ${GITHUB_ENV} - - - name: Set up JDK ${{ env.JAVA_VERSION }} - id: setup-java - uses: actions/setup-java@v4 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: 'temurin' - cache: 'maven' - cache-dependency-path: | - modules/container-base/pom.xml - - name: Download common cache on branch cache miss - if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} - uses: actions/cache/restore@v4 + - name: Checkout and Setup Maven + # TODO: change to upstream location in final PR + uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - key: dataverse-maven-cache - path: ~/.m2/repository + git-reference: ${{ github.ref }} + pom-paths: modules/container-base/pom.xml # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and # on events in context of upstream because secrets. PRs run in context of forks by default! From 4f8499f79b09b8dfb619ae4ece0684c97b5f2999 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 14:44:38 +0200 Subject: [PATCH 312/366] ci(ct): replace logic in base image push workflow Using the same actions and steps as done in the maintenance action should work for this workflow in case of a push event, too. --- .github/workflows/container_base_push.yml | 26 +++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index ff5c6117f2b..29493fcbb5c 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -77,18 +77,32 @@ jobs: # "Files": null}]} # EOF - - name: Calculate revision number for immutable tag + # Determine the base image name we are going to use from here on + - name: Determine base image name run: | - BASE_IMAGE="$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" - echo "REVISION_OPTION=-Dbase.image.revision=$( .github/workflows/scripts/get_next_revision.sh "${BASE_IMAGE}" )" | tee -a "${GITHUB_ENV}" + if [[ "${{ github.ref_name }}" = "${{ env.DEVELOPMENT_BRANCH }}" ]]; then + echo "BASE_IMAGE=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" | tee -a "${GITHUB_ENV}" + echo "BASE_IMAGE_UPCOMING=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )" | tee -a "${GITHUB_ENV}" + else + echo "BASE_IMAGE=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )" | tee -a "${GITHUB_ENV}" + fi + - name: Calculate revision number for immutable tag (on release branches only) + if: ${{ github.ref_name != env.DEVELOPMENT_BRANCH }} + id: revision-tag + uses: ./.github/actions/get-image-revision + with: + image-ref: ${{ env.BASE_IMAGE }} + tag-options-prefix: "-Dbase.image.tag.suffix='' -Ddocker.tags.revision=" - name: Configure update of "latest" tag for development branch + id: develop-tag if: ${{ github.ref_name == env.DEVELOPMENT_BRANCH }} run: | - echo "DOCKER_TAGS=-Ddocker.imagePropertyConfiguration=override -Ddocker.tags.develop=latest" | tee -a "${GITHUB_ENV}" - + echo "tag-options=-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=${BASE_IMAGE_UPCOMING#*:}" | tee -a "${GITHUB_OUTPUT}" - name: Deploy multi-arch base container image to Docker Hub id: build - run: mvn -f modules/container-base -Pct deploy -Ddocker.noCache ${DOCKER_TAGS} ${REVISION_OPTION} -Ddocker.platforms=${{ env.PLATFORMS }} + run: | + mvn -f modules/container-base -Pct deploy -Ddocker.noCache -Ddocker.platforms=${{ env.PLATFORMS }} \ + -Ddocker.imagePropertyConfiguration=override ${{ steps.develop-tag.outputs.tag-options }} ${{ steps.revision-tag.outputs.tag-options }} #push-app-img: # name: "Rebase & Publish App Image" From b43af732f84f7d7d9899ec18ac5b7095b9fac907 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 14:45:08 +0200 Subject: [PATCH 313/366] test(ct): temporarily set dev branch in base image push flow to feature branch --- .github/workflows/container_base_push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 29493fcbb5c..25dfac32ba8 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -17,7 +17,8 @@ on: env: PLATFORMS: linux/amd64,linux/arm64 - DEVELOPMENT_BRANCH: develop + # TODO: set back to develop for final PR + DEVELOPMENT_BRANCH: 10478-version-base-img jobs: build: From 415bae3a81ca91b0007ae0b769c07ad31bf13839 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 14:47:49 +0200 Subject: [PATCH 314/366] ci(ct): use setup-maven action in app image push workflow to simplify setup Following DRY principle, reuse the steps defined --- .github/workflows/container_app_push.yml | 45 +++++++++--------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index 3344a8e2d0d..7f8c880a6bc 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -38,23 +38,15 @@ jobs: if: ${{ github.repository_owner == 'IQSS' && inputs.branch == '10478-version-base-img' }} steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up JDK - id: setup-java - uses: actions/setup-java@v3 - with: - java-version: "17" - distribution: temurin - cache: maven - - name: Download common cache on branch cache miss - if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} - uses: actions/cache/restore@v4 + - name: Checkout and Setup Maven + # TODO: change to upstream location in final PR + uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - path: ~/.m2/repository - key: dataverse-maven-cache - + git-reference: ${{ github.ref_name }} + pom-paths: | + pom.xml + modules/container-configbaker/pom.xml + modules/dataverse-parent/pom.xml - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests) run: > @@ -119,20 +111,15 @@ jobs: if: needs.check-secrets.outputs.available == 'true' && ( github.event_name != 'push' || ( github.event_name == 'push' && contains(fromJSON('["develop", "master"]'), github.ref_name))) steps: - - uses: actions/checkout@v4 - - name: Set up JDK - id: setup-java - uses: actions/setup-java@v3 - with: - java-version: "17" - distribution: temurin - cache: maven - - name: Download common cache on branch cache miss - if: ${{ steps.setup-java.outputs.cache-hit != 'true' }} - uses: actions/cache/restore@v4 + - name: Checkout and Setup Maven + # TODO: change to upstream location in final PR + uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - path: ~/.m2/repository - key: dataverse-maven-cache + git-reference: ${{ github.ref_name }} + pom-paths: | + pom.xml + modules/container-configbaker/pom.xml + modules/dataverse-parent/pom.xml # Depending on context, we push to different targets. Login accordingly. - if: github.event_name != 'pull_request' From 5eb6d1a2cabaff69acbb30b90bc7fce0acc0146e Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 14:48:28 +0200 Subject: [PATCH 315/366] test(ct): temporarily enable app image push flow execution in all forks --- .github/workflows/container_app_push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index 7f8c880a6bc..15ef7b892e8 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -35,7 +35,8 @@ jobs: packages: write pull-requests: write # Only run in upstream repo - avoid unnecessary runs in forks - if: ${{ github.repository_owner == 'IQSS' && inputs.branch == '10478-version-base-img' }} + # TODO: re-enable for final PR + #if: ${{ github.repository_owner == 'IQSS' }} steps: - name: Checkout and Setup Maven From 41c9b2915e79211ee7a48a0b32aed7290b07d69f Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 17 Sep 2024 10:12:41 -0400 Subject: [PATCH 316/366] avoid spurious log warning for others e.g. isbn these were going through the default check for URLs and failing (not a url) leading to a warning. The new code should try URL parsing for URLs, try PID and URL parsing for ones with no type specified, and send the rest of the identifiers w/o any additional (optional) attributes. --- .../pidproviders/doi/XmlMetadataTemplate.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index 5ca62932e15..fe05b0d4537 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -1026,8 +1026,22 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th } break; case "URL": + // If a URL is given, split the string to get a schemeUri + try { + URL relatedUrl = new URI(relatedIdentifier).toURL(); + String protocol = relatedUrl.getProtocol(); + String authority = relatedUrl.getAuthority(); + String site = String.format("%s://%s", protocol, authority); + relatedIdentifier = relatedIdentifier.substring(site.length()); + attributes.put("schemeURI", site); + } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { + // Just an identifier but without a pubIdType we won't include it + logger.warning("Invalid Identifier of type URL: " + relatedIdentifier); + relatedIdentifier = null; + } break; - default: + case "none": + //Try to identify PIDs and URLs and send them as related identifiers if (relatedIdentifier != null) { // See if it is a GlobalID we know try { @@ -1048,8 +1062,14 @@ private void writeRelatedIdentifiers(XMLStreamWriter xmlw, DvObject dvObject) th } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) { // Just an identifier but without a pubIdType we won't include it logger.warning("Related Identifier found without type: " + relatedIdentifier); + //Won't be sent since pubIdType is null - could also set relatedIdentifier to null } } + break; + default: + //Some other valid type - we just send the identifier w/o optional attributes + //To Do - validation for other types? + break; } } if (StringUtils.isNotBlank(relatedIdentifier) && StringUtils.isNotBlank(pubIdType)) { From 8dfd5f32f106e17815ddab0c39f781543f430b07 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:20:36 -0400 Subject: [PATCH 317/366] update doc --- doc/sphinx-guides/source/installation/config.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 9bfd2488062..cb3e6dfc187 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -519,6 +519,7 @@ dataverse.pid.*.crossref.depositor dataverse.pid.*.crossref.depositor-email ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +CrossRef is an experimental provider. PID Providers of type ``crossref`` require six additional parameters that define how the provider connects to CrossRef. CrossRef has two APIs that are used in Dataverse: From 71f43992d4587660a298850d58211657bb8ed28f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 14:50:03 +0200 Subject: [PATCH 318/366] ci(ct): use an optional base image ref for app image push flow We need to transfer the determined base image name we might have just built from the calling workflow into this flow. As we provide a default value, this is picked up for pull_requests. --- .github/workflows/container_app_push.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index 15ef7b892e8..68c079b9ee5 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -6,10 +6,11 @@ on: # Instead, push events will trigger from the base image and maven unit tests via workflow_call. workflow_call: inputs: - branch: + base-image-ref: type: string - description: "A tag or branch to checkout for building the image" - required: true + description: "Reference of the base image to build on in full qualified form [/]/:" + required: false + default: "gdcc/base:unstable" pull_request: branches: - develop @@ -21,7 +22,6 @@ on: env: IMAGE_TAG: unstable - BASE_IMAGE_TAG: unstable REGISTRY: "" # Empty means default to Docker Hub PLATFORMS: "linux/amd64,linux/arm64" MASTER_BRANCH_TAG: alpha @@ -53,6 +53,7 @@ jobs: run: > mvn -B -f modules/dataverse-parent -P ct -pl edu.harvard.iq:dataverse -am + -Dbase.image=${{ inputs.base-image-ref }} install # TODO: add smoke / integration testing here (add "-Pct -DskipIntegrationTests=false") @@ -156,11 +157,12 @@ jobs: run: > mvn -B -f modules/dataverse-parent -P ct -pl edu.harvard.iq:dataverse -am + -Dbase.image=${{ inputs.base-image-ref }} install - name: Deploy multi-arch application and configbaker container image run: > mvn - -Dapp.image.tag=${{ env.IMAGE_TAG }} -Dbase.image.tag=${{ env.BASE_IMAGE_TAG }} + -Dapp.image.tag=${{ env.IMAGE_TAG }} -Dbase.image=${{ inputs.base-image-ref }} ${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }} -P ct deploy From 5a0cfa0ab3169d87cd878f40b59e5af33d7cd8ae Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 15:46:15 +0200 Subject: [PATCH 319/366] ci(setup-maven): try to auto-detect git ref It's not so easy to determine the right git ref for different scenarios like PR, etc. Unless explicitly given a ref, try to autodetect the right one to go with. --- .github/actions/setup-maven/action.yml | 4 ++-- .github/workflows/container_app_push.yml | 2 -- .github/workflows/container_base_push.yml | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-maven/action.yml b/.github/actions/setup-maven/action.yml index 6edbba1b1a9..4cf09f34231 100644 --- a/.github/actions/setup-maven/action.yml +++ b/.github/actions/setup-maven/action.yml @@ -4,8 +4,8 @@ description: "Determine Java version and setup Maven, including necessary caches inputs: git-reference: description: 'The git reference (branch/tag) to check out' - required: true - default: 'develop' + required: false + default: '${{ github.ref }}' pom-paths: description: "List of paths to Maven POM(s) for cache dependency setup" required: false diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index 68c079b9ee5..555ea97cf52 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -43,7 +43,6 @@ jobs: # TODO: change to upstream location in final PR uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - git-reference: ${{ github.ref_name }} pom-paths: | pom.xml modules/container-configbaker/pom.xml @@ -117,7 +116,6 @@ jobs: # TODO: change to upstream location in final PR uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - git-reference: ${{ github.ref_name }} pom-paths: | pom.xml modules/container-configbaker/pom.xml diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 25dfac32ba8..1365dd69eaf 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -36,7 +36,6 @@ jobs: # TODO: change to upstream location in final PR uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - git-reference: ${{ github.ref }} pom-paths: modules/container-base/pom.xml # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and From 34db758a32044ab0281e8d627c59c0b3d4553c5f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 17:16:51 +0200 Subject: [PATCH 320/366] chore(ct): add notes in flows about adding a path filter We want to avoid duplicate runs which might trigger race conditions for image shipments. --- .github/workflows/container_app_push.yml | 4 ++++ .github/workflows/maven_unit_test.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index 555ea97cf52..e3dbcd4d2c6 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -48,6 +48,10 @@ jobs: modules/container-configbaker/pom.xml modules/dataverse-parent/pom.xml + # TODO: Add a filter step here, that avoids building the image if this is a PR and there are other files touched than declared above. + # Use https://github.com/dorny/paths-filter to solve this. This will ensure we do not run this twice if this workflow + # will be triggered by the other workflows already (base image or java changes) + - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests) run: > mvn -B -f modules/dataverse-parent diff --git a/.github/workflows/maven_unit_test.yml b/.github/workflows/maven_unit_test.yml index 4ad4798bc64..1c9c6c7d5e3 100644 --- a/.github/workflows/maven_unit_test.yml +++ b/.github/workflows/maven_unit_test.yml @@ -156,6 +156,10 @@ jobs: # NOTE: this may be extended with adding a report to the build output, leave a comment, send to Sonarcloud, ... + # TODO: Add a filter step here, that avoids calling the app image release workflow if there are changes to the base image. + # Use https://github.com/dorny/paths-filter to solve this. Will require and additional job or adding to integration-test job. + # This way we ensure that we're not running the app image flow with a non-matching base image. + push-app-img: name: Publish App Image permissions: From 314fa339a6ea162c2bb4dc069a2c71c01a24df89 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 17:24:17 +0200 Subject: [PATCH 321/366] chore(ct): add note about missing triggers for base push flow This is out of scope for #10827, but should be addressed at a later point to avoid duplicated runs with potential race conditions. Also it enables proper rebuilds for preview images when someone is just trying to create a base image change, but which should obviously be tested full chain. --- .github/workflows/container_base_push.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 1365dd69eaf..d52209c5c30 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -15,6 +15,9 @@ on: - 'modules/dataverse-parent/pom.xml' - '.github/workflows/container_base_push.yml' + # TODO: we are missing a workflow_call option here, so we can trigger this flow from pr comments and maven tests (keep the secrets availability in mind!) + # TODO: we are missing a pull_request option here (filter for stuff that would trigger the maven runs!) so we can trigger preview builds for them when coming from the main repo (keep the secrets availability in mind!) + env: PLATFORMS: linux/amd64,linux/arm64 # TODO: set back to develop for final PR From 09f7264f98fa49e303d3fd068306b60f2a7a54a8 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 17:25:05 +0200 Subject: [PATCH 322/366] fix,ci(ct): don't trigger the base push flow for backports Obviously these are meant for the maintenance workflow, not the push flow! --- .github/workflows/container_base_push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index d52209c5c30..c6283856ac8 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -12,6 +12,7 @@ on: # "Path filters are not evaluated for pushes of tags" https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore paths: - 'modules/container-base/**' + - '!modules/container-base/src/backports/**' - 'modules/dataverse-parent/pom.xml' - '.github/workflows/container_base_push.yml' From 44ec28d61f492804ca491fa6402bf3f5148bff6d Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Sep 2024 17:31:39 +0200 Subject: [PATCH 323/366] ci(ct): trigger app flow from base push flow We detect the tag we have been using in a finalizing step to hand a proper base image ref to the app image workflow to make it work on the images we just pushed to the registry. --- .github/workflows/container_base_push.yml | 39 +++++++++++++++-------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index c6283856ac8..8a9a3212fe9 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -26,7 +26,7 @@ env: jobs: build: - name: Build image + name: Base Image runs-on: ubuntu-latest permissions: contents: read @@ -34,6 +34,8 @@ jobs: # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks #if: ${{ github.repository_owner == 'IQSS' }} + outputs: + base-image-ref: ${{ steps.finalize.outputs.base-image-ref }} steps: - name: Checkout and Setup Maven @@ -102,25 +104,34 @@ jobs: if: ${{ github.ref_name == env.DEVELOPMENT_BRANCH }} run: | echo "tag-options=-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=${BASE_IMAGE_UPCOMING#*:}" | tee -a "${GITHUB_OUTPUT}" + - name: Deploy multi-arch base container image to Docker Hub id: build run: | mvn -f modules/container-base -Pct deploy -Ddocker.noCache -Ddocker.platforms=${{ env.PLATFORMS }} \ -Ddocker.imagePropertyConfiguration=override ${{ steps.develop-tag.outputs.tag-options }} ${{ steps.revision-tag.outputs.tag-options }} - #push-app-img: - # name: "Rebase & Publish App Image" - # permissions: - # contents: read - # packages: write - # pull-requests: write - # secrets: inherit - # needs: - # - discover - # - build - # uses: ./.github/workflows/container_app_push.yml - # with: - # branch: ${{ github.ref_name }} + - name: Determine appropriate base image ref for app image + id: finalize + run: | + if [[ "${{ github.ref_name }}" = "${{ env.DEVELOPMENT_BRANCH }}" ]]; then + echo "base-image-ref=${BASE_IMAGE_UPCOMING}" | tee -a "$GITHUB_OUTPUT" + else + echo "base-image-ref=gdcc/base:${{ steps.revision-tag.outputs.revision-tag }}" | tee -a "$GITHUB_OUTPUT" + fi + + push-app-img: + name: "Rebase & Publish App Image" + permissions: + contents: read + packages: write + pull-requests: write + secrets: inherit + needs: + - build + uses: ./.github/workflows/container_app_push.yml + with: + base-image-ref: ${{ needs.build.outputs.base-image-ref }} # TODO: job to update the docker hub description with supported tags and all From 6a05bef4b8e34132b444f04ecf0bc6484da3ac2d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 17 Sep 2024 13:54:34 -0400 Subject: [PATCH 324/366] changes per review --- doc/sphinx-guides/source/api/changelog.rst | 5 +- .../source/installation/config.rst | 4 + ...dataset-create-new-all-default-fields.json | 2816 ++++++++--------- .../iq/dataverse/DatasetFieldConstant.java | 2 + .../harvard/iq/dataverse/DatasetVersion.java | 65 +- .../iq/dataverse/DatasetVersionUI.java | 30 +- .../dublincore/DublinCoreExportUtil.java | 30 +- .../pidproviders/doi/XmlMetadataTemplate.java | 134 +- 8 files changed, 1549 insertions(+), 1537 deletions(-) diff --git a/doc/sphinx-guides/source/api/changelog.rst b/doc/sphinx-guides/source/api/changelog.rst index b40d32f37d8..c5890fd9996 100644 --- a/doc/sphinx-guides/source/api/changelog.rst +++ b/doc/sphinx-guides/source/api/changelog.rst @@ -6,11 +6,12 @@ This API changelog is experimental and we would love feedback on its usefulness. .. contents:: |toctitle| :local: :depth: 1 + v6.4 ---- -[**/api/datasets/$dataset-id/modifyRegistration**](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider) - changes from GET to POST -[**/api/datasets/modifyRegistrationPIDMetadataAll**](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider) - changes from GET to POST +- **/api/datasets/$dataset-id/modifyRegistration**: Changed from GET to POST +- **/api/datasets/modifyRegistrationPIDMetadataAll**: Changed from GET to POST v6.3 diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index b2d9bd3d342..30a333c1614 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -232,6 +232,10 @@ Dataverse can be configured with one or more PID providers, each of which can mi to manage an authority/shoulder combination, aka a "prefix" (PermaLinks also support custom separator characters as part of the prefix), along with an optional list of individual PIDs (with different authority/shoulders) than can be managed with that account. +Dataverse automatically manages assigning PIDs and making them findable when datasets are published. There are also :ref:`API calls that +allow updating the PID target URLs and metadata of already-published datasets manually if needed ` , e.g. if a Dataverse instance is +moved to a new URL or when the software is updated to generate additional metadata or address schema changes at the PID service. + Testing PID Providers +++++++++++++++++++++ diff --git a/scripts/api/data/dataset-create-new-all-default-fields.json b/scripts/api/data/dataset-create-new-all-default-fields.json index e522ab32b1d..84b152690f9 100644 --- a/scripts/api/data/dataset-create-new-all-default-fields.json +++ b/scripts/api/data/dataset-create-new-all-default-fields.json @@ -1,1410 +1,1410 @@ { - "datasetVersion" : { - "license" : { - "name" : "CC0 1.0", - "uri" : "http://creativecommons.org/publicdomain/zero/1.0" - }, - "metadataBlocks" : { - "citation" : { - "displayName" : "Citation Metadata", - "fields" : [{ - "typeName" : "title", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Replication Data for: Title" - }, { - "typeName" : "subtitle", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Subtitle" - }, { - "typeName" : "alternativeTitle", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "Alternative Title" - ] - }, { - "typeName" : "alternativeURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://AlternativeURL.org" - }, { - "typeName" : "otherId", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "otherIdAgency" : { - "typeName" : "otherIdAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDAgency1" - }, - "otherIdValue" : { - "typeName" : "otherIdValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDIdentifier1" - } - }, { - "otherIdAgency" : { - "typeName" : "otherIdAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDAgency2" - }, - "otherIdValue" : { - "typeName" : "otherIdValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDIdentifier2" - } - } - ] - }, { - "typeName" : "author", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "authorName" : { - "typeName" : "authorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastAuthor1, FirstAuthor1" - }, - "authorAffiliation" : { - "typeName" : "authorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorAffiliation1" - }, - "authorIdentifierScheme" : { - "typeName" : "authorIdentifierScheme", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "ORCID" - }, - "authorIdentifier" : { - "typeName" : "authorIdentifier", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorIdentifier1" - } - }, { - "authorName" : { - "typeName" : "authorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastAuthor2, FirstAuthor2" - }, - "authorAffiliation" : { - "typeName" : "authorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorAffiliation2" - }, - "authorIdentifierScheme" : { - "typeName" : "authorIdentifierScheme", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "ISNI" - }, - "authorIdentifier" : { - "typeName" : "authorIdentifier", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorIdentifier2" - } - } - ] - }, { - "typeName" : "datasetContact", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "datasetContactName" : { - "typeName" : "datasetContactName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContact1, FirstContact1" - }, - "datasetContactAffiliation" : { - "typeName" : "datasetContactAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactAffiliation1" - }, - "datasetContactEmail" : { - "typeName" : "datasetContactEmail", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactEmail1@mailinator.com" - } - }, { - "datasetContactName" : { - "typeName" : "datasetContactName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContact2, FirstContact2" - }, - "datasetContactAffiliation" : { - "typeName" : "datasetContactAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactAffiliation2" - }, - "datasetContactEmail" : { - "typeName" : "datasetContactEmail", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactEmail2@mailinator.com" - } - } - ] - }, { - "typeName" : "dsDescription", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "dsDescriptionValue" : { - "typeName" : "dsDescriptionValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DescriptionText1" - }, - "dsDescriptionDate" : { - "typeName" : "dsDescriptionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1000-01-01" - } - }, { - "dsDescriptionValue" : { - "typeName" : "dsDescriptionValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DescriptionText2" - }, - "dsDescriptionDate" : { - "typeName" : "dsDescriptionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1000-02-02" - } - } - ] - }, { - "typeName" : "subject", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "Agricultural Sciences", - "Business and Management", - "Engineering", - "Law" - ] - }, { - "typeName" : "keyword", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "keywordValue" : { - "typeName" : "keywordValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordTerm1" - }, - "keywordTermURI" : { - "typeName" : "keywordTermURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://keywordTermURI1.org" - }, - "keywordVocabulary" : { - "typeName" : "keywordVocabulary", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordVocabulary1" - }, - "keywordVocabularyURI" : { - "typeName" : "keywordVocabularyURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://KeywordVocabularyURL1.org" - } - }, { - "keywordValue" : { - "typeName" : "keywordValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordTerm2" - }, - "keywordTermURI" : { - "typeName" : "keywordTermURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://keywordTermURI2.org" - }, - "keywordVocabulary" : { - "typeName" : "keywordVocabulary", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordVocabulary2" - }, - "keywordVocabularyURI" : { - "typeName" : "keywordVocabularyURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://KeywordVocabularyURL2.org" - } - } - ] - }, { - "typeName" : "topicClassification", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "topicClassValue" : { - "typeName" : "topicClassValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Term1" - }, - "topicClassVocab" : { - "typeName" : "topicClassVocab", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Vocab1" - }, - "topicClassVocabURI" : { - "typeName" : "topicClassVocabURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "https://TopicClassificationURL1.com" - } - }, { - "topicClassValue" : { - "typeName" : "topicClassValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Term2" - }, - "topicClassVocab" : { - "typeName" : "topicClassVocab", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Vocab2" - }, - "topicClassVocabURI" : { - "typeName" : "topicClassVocabURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "https://TopicClassificationURL2.com" - } - } - ] - }, { - "typeName" : "publication", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "publicationRelationType" : { - "typeName" : "publicationRelationType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "IsSupplementTo" - }, - "publicationCitation" : { - "typeName" : "publicationCitation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationCitation1" - }, - "publicationIDType" : { - "typeName" : "publicationIDType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "ark" - }, - "publicationIDNumber" : { - "typeName" : "publicationIDNumber", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationIDNumber1" - }, - "publicationURL" : { - "typeName" : "publicationURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://RelatedPublicationURL1.org" - } - }, { - "publicationCitation" : { - "typeName" : "publicationCitation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationCitation2" - }, - "publicationIDType" : { - "typeName" : "publicationIDType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "arXiv" - }, - "publicationIDNumber" : { - "typeName" : "publicationIDNumber", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationIDNumber2" - }, - "publicationURL" : { - "typeName" : "publicationURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://RelatedPublicationURL2.org" - } - } - ] - }, { - "typeName" : "notesText", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Notes1" - }, { - "typeName" : "language", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "Abkhaz", - "Afar" - ] - }, { - "typeName" : "producer", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "producerName" : { - "typeName" : "producerName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastProducer1, FirstProducer1" - }, - "producerAffiliation" : { - "typeName" : "producerAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAffiliation1" - }, - "producerAbbreviation" : { - "typeName" : "producerAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAbbreviation1" - }, - "producerURL" : { - "typeName" : "producerURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerURL1.org" - }, - "producerLogoURL" : { - "typeName" : "producerLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerLogoURL1.org" - } - }, { - "producerName" : { - "typeName" : "producerName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastProducer2, FirstProducer2" - }, - "producerAffiliation" : { - "typeName" : "producerAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAffiliation2" - }, - "producerAbbreviation" : { - "typeName" : "producerAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAbbreviation2" - }, - "producerURL" : { - "typeName" : "producerURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerURL2.org" - }, - "producerLogoURL" : { - "typeName" : "producerLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerLogoURL2.org" - } - } - ] - }, { - "typeName" : "productionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1003-01-01" - }, { - "typeName" : "productionPlace", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "ProductionPlace" - ] - }, { - "typeName" : "contributor", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "contributorType" : { - "typeName" : "contributorType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Data Collector" - }, - "contributorName" : { - "typeName" : "contributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContributor1, FirstContributor1" - } - }, { - "contributorType" : { - "typeName" : "contributorType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Data Curator" - }, - "contributorName" : { - "typeName" : "contributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContributor2, FirstContributor2" - } - } - ] - }, { - "typeName" : "grantNumber", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "grantNumberAgency" : { - "typeName" : "grantNumberAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantAgency1" - }, - "grantNumberValue" : { - "typeName" : "grantNumberValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantNumber1" - } - }, { - "grantNumberAgency" : { - "typeName" : "grantNumberAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantAgency2" - }, - "grantNumberValue" : { - "typeName" : "grantNumberValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantNumber2" - } - } - ] - }, { - "typeName" : "distributor", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "distributorName" : { - "typeName" : "distributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDistributor1, FirstDistributor1" - }, - "distributorAffiliation" : { - "typeName" : "distributorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAffiliation1" - }, - "distributorAbbreviation" : { - "typeName" : "distributorAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAbbreviation1" - }, - "distributorURL" : { - "typeName" : "distributorURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorURL1.org" - }, - "distributorLogoURL" : { - "typeName" : "distributorLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorLogoURL1.org" - } - }, { - "distributorName" : { - "typeName" : "distributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDistributor2, FirstDistributor2" - }, - "distributorAffiliation" : { - "typeName" : "distributorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAffiliation2" - }, - "distributorAbbreviation" : { - "typeName" : "distributorAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAbbreviation2" - }, - "distributorURL" : { - "typeName" : "distributorURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorURL2.org" - }, - "distributorLogoURL" : { - "typeName" : "distributorLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorLogoURL2.org" - } - } - ] - }, { - "typeName" : "distributionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1004-01-01" - }, { - "typeName" : "depositor", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDepositor, FirstDepositor" - }, { - "typeName" : "dateOfDeposit", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1002-01-01" - }, { - "typeName" : "timePeriodCovered", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "timePeriodCoveredStart" : { - "typeName" : "timePeriodCoveredStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-01-01" - }, - "timePeriodCoveredEnd" : { - "typeName" : "timePeriodCoveredEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-01-02" - } - }, { - "timePeriodCoveredStart" : { - "typeName" : "timePeriodCoveredStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-02-01" - }, - "timePeriodCoveredEnd" : { - "typeName" : "timePeriodCoveredEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-02-02" - } - } - ] - }, { - "typeName" : "dateOfCollection", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "dateOfCollectionStart" : { - "typeName" : "dateOfCollectionStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-01-01" - }, - "dateOfCollectionEnd" : { - "typeName" : "dateOfCollectionEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-01-01" - } - }, { - "dateOfCollectionStart" : { - "typeName" : "dateOfCollectionStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-02-01" - }, - "dateOfCollectionEnd" : { - "typeName" : "dateOfCollectionEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-02-02" - } - } - ] - }, { - "typeName" : "kindOfData", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "KindOfData1", - "KindOfData2" - ] - }, { - "typeName" : "series", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "seriesName" : { - "typeName" : "seriesName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SeriesName" - }, - "seriesInformation" : { - "typeName" : "seriesInformation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SeriesInformation" - } - } - ] - }, { - "typeName" : "software", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "softwareName" : { - "typeName" : "softwareName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareName1" - }, - "softwareVersion" : { - "typeName" : "softwareVersion", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareVersion1" - } - }, { - "softwareName" : { - "typeName" : "softwareName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareName2" - }, - "softwareVersion" : { - "typeName" : "softwareVersion", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareVersion2" - } - } - ] - }, { - "typeName" : "relatedMaterial", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "RelatedMaterial1", - "RelatedMaterial2" - ] - }, { - "typeName" : "relatedDatasets", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "RelatedDatasets1", - "RelatedDatasets2" - ] - }, { - "typeName" : "otherReferences", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "OtherReferences1", - "OtherReferences2" - ] - }, { - "typeName" : "dataSources", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "DataSources1", - "DataSources2" - ] - }, { - "typeName" : "originOfSources", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OriginOfSources" - }, { - "typeName" : "characteristicOfSources", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CharacteristicOfSourcesNoted" - }, { - "typeName" : "accessToSources", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DocumentationAndAccessToSources" - } - ] - }, - "geospatial" : { - "displayName" : "Geospatial Metadata", - "fields" : [{ - "typeName" : "geographicCoverage", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "country" : { - "typeName" : "country", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Afghanistan" - }, - "state" : { - "typeName" : "state", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageStateProvince1" - }, - "city" : { - "typeName" : "city", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageCity1" - }, - "otherGeographicCoverage" : { - "typeName" : "otherGeographicCoverage", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageOther1" - } - }, { - "country" : { - "typeName" : "country", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Albania" - }, - "state" : { - "typeName" : "state", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageStateProvince2" - }, - "city" : { - "typeName" : "city", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageCity2" - }, - "otherGeographicCoverage" : { - "typeName" : "otherGeographicCoverage", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageOther2" - } - } - ] - }, { - "typeName" : "geographicUnit", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "GeographicUnit1", - "GeographicUnit2" - ] - }, { - "typeName" : "geographicBoundingBox", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "westLongitude" : { - "typeName" : "westLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-72" - }, - "eastLongitude" : { - "typeName" : "eastLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-70" - }, - "northLatitude" : { - "typeName" : "northLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "43" - }, - "southLatitude" : { - "typeName" : "southLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "42" - } - }, { - "westLongitude" : { - "typeName" : "westLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-18" - }, - "eastLongitude" : { - "typeName" : "eastLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-13" - }, - "northLatitude" : { - "typeName" : "northLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "29" - }, - "southLatitude" : { - "typeName" : "southLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "28" - } - } - ] - } - ] - }, - "socialscience" : { - "displayName" : "Social Science and Humanities Metadata", - "fields" : [{ - "typeName" : "unitOfAnalysis", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "UnitOfAnalysis1", - "UnitOfAnalysis2" - ] - }, { - "typeName" : "universe", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "Universe1", - "Universe2" - ] - }, { - "typeName" : "timeMethod", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TimeMethod" - }, { - "typeName" : "dataCollector", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDataCollector1, FirstDataCollector1" - }, { - "typeName" : "collectorTraining", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CollectorTraining" - }, { - "typeName" : "frequencyOfDataCollection", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Frequency" - }, { - "typeName" : "samplingProcedure", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SamplingProcedure" - }, { - "typeName" : "targetSampleSize", - "multiple" : false, - "typeClass" : "compound", - "value" : { - "targetSampleActualSize" : { - "typeName" : "targetSampleActualSize", - "multiple" : false, - "typeClass" : "primitive", - "value" : "100" - }, - "targetSampleSizeFormula" : { - "typeName" : "targetSampleSizeFormula", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TargetSampleSizeFormula" - } - } - }, { - "typeName" : "deviationsFromSampleDesign", - "multiple" : false, - "typeClass" : "primitive", - "value" : "MajorDeviationsForSampleDesign" - }, { - "typeName" : "collectionMode", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "CollectionMode" - ] - }, { - "typeName" : "researchInstrument", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TypeOfResearchInstrument" - }, { - "typeName" : "dataCollectionSituation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CharacteristicsOfDataCollectionSituation" - }, { - "typeName" : "actionsToMinimizeLoss", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ActionsToMinimizeLosses" - }, { - "typeName" : "controlOperations", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ControlOperations" - }, { - "typeName" : "weighting", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Weighting" - }, { - "typeName" : "cleaningOperations", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CleaningOperations" - }, { - "typeName" : "datasetLevelErrorNotes", - "multiple" : false, - "typeClass" : "primitive", - "value" : "StudyLevelErrorNotes" - }, { - "typeName" : "responseRate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ResponseRate" - }, { - "typeName" : "samplingErrorEstimates", - "multiple" : false, - "typeClass" : "primitive", - "value" : "EstimatesOfSamplingError" - }, { - "typeName" : "otherDataAppraisal", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherFormsOfDataAppraisal" - }, { - "typeName" : "socialScienceNotes", - "multiple" : false, - "typeClass" : "compound", - "value" : { - "socialScienceNotesType" : { - "typeName" : "socialScienceNotesType", - "multiple" : false, - "typeClass" : "primitive", - "value" : "NotesType" - }, - "socialScienceNotesSubject" : { - "typeName" : "socialScienceNotesSubject", - "multiple" : false, - "typeClass" : "primitive", - "value" : "NotesSubject" - }, - "socialScienceNotesText" : { - "typeName" : "socialScienceNotesText", - "multiple" : false, - "typeClass" : "primitive", - "value" : "NotesText" - } - } - } - ] - }, - "astrophysics" : { - "displayName" : "Astronomy and Astrophysics Metadata", - "fields" : [{ - "typeName" : "astroType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "Image", - "Mosaic", - "EventList", - "Cube" - ] - }, { - "typeName" : "astroFacility", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "Facility1", - "Facility2" - ] - }, { - "typeName" : "astroInstrument", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "Instrument1", - "Instrument2" - ] - }, { - "typeName" : "astroObject", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "Object1", - "Object2" - ] - }, { - "typeName" : "resolution.Spatial", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SpatialResolution" - }, { - "typeName" : "resolution.Spectral", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SpectralResolution" - }, { - "typeName" : "resolution.Temporal", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TimeResolution" - }, { - "typeName" : "coverage.Spectral.Bandpass", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "Bandpass1", - "Bandpass2" - ] - }, { - "typeName" : "coverage.Spectral.CentralWavelength", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "3001", - "3002" - ] - }, { - "typeName" : "coverage.Spectral.Wavelength", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "coverage.Spectral.MinimumWavelength" : { - "typeName" : "coverage.Spectral.MinimumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4001" - }, - "coverage.Spectral.MaximumWavelength" : { - "typeName" : "coverage.Spectral.MaximumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4002" - } - }, { - "coverage.Spectral.MinimumWavelength" : { - "typeName" : "coverage.Spectral.MinimumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4003" - }, - "coverage.Spectral.MaximumWavelength" : { - "typeName" : "coverage.Spectral.MaximumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4004" - } - } - ] - }, { - "typeName" : "coverage.Temporal", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "coverage.Temporal.StartTime" : { - "typeName" : "coverage.Temporal.StartTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-01-01" - }, - "coverage.Temporal.StopTime" : { - "typeName" : "coverage.Temporal.StopTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-01-02" - } - }, { - "coverage.Temporal.StartTime" : { - "typeName" : "coverage.Temporal.StartTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-02-01" - }, - "coverage.Temporal.StopTime" : { - "typeName" : "coverage.Temporal.StopTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-02-02" - } - } - ] - }, { - "typeName" : "coverage.Spatial", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "SkyCoverage1", - "SkyCoverage2" - ] - }, { - "typeName" : "coverage.Depth", - "multiple" : false, - "typeClass" : "primitive", - "value" : "200" - }, { - "typeName" : "coverage.ObjectDensity", - "multiple" : false, - "typeClass" : "primitive", - "value" : "300" - }, { - "typeName" : "coverage.ObjectCount", - "multiple" : false, - "typeClass" : "primitive", - "value" : "400" - }, { - "typeName" : "coverage.SkyFraction", - "multiple" : false, - "typeClass" : "primitive", - "value" : "500" - }, { - "typeName" : "coverage.Polarization", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Polarization" - }, { - "typeName" : "redshiftType", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RedshiftType" - }, { - "typeName" : "resolution.Redshift", - "multiple" : false, - "typeClass" : "primitive", - "value" : "600" - }, { - "typeName" : "coverage.RedshiftValue", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "coverage.Redshift.MinimumValue" : { - "typeName" : "coverage.Redshift.MinimumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "701" - }, - "coverage.Redshift.MaximumValue" : { - "typeName" : "coverage.Redshift.MaximumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "702" - } - }, { - "coverage.Redshift.MinimumValue" : { - "typeName" : "coverage.Redshift.MinimumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "703" - }, - "coverage.Redshift.MaximumValue" : { - "typeName" : "coverage.Redshift.MaximumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "704" - } - } - ] - } - ] - }, - "biomedical" : { - "displayName" : "Life Sciences Metadata", - "fields" : [{ - "typeName" : "studyDesignType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "Case Control", - "Cross Sectional", - "Cohort Study", - "Not Specified" - ] - }, { - "typeName" : "studyFactorType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "Age", - "Biomarkers", - "Cell Surface Markers", - "Developmental Stage" - ] - }, { - "typeName" : "studyAssayOrganism", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "Arabidopsis thaliana", - "Bos taurus", - "Caenorhabditis elegans", - "Danio rerio (zebrafish)" - ] - }, { - "typeName" : "studyAssayOtherOrganism", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "OtherOrganism1", - "OtherOrganism2" - ] - }, { - "typeName" : "studyAssayMeasurementType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "genome sequencing", - "cell sorting", - "clinical chemistry analysis", - "DNA methylation profiling" - ] - }, { - "typeName" : "studyAssayOtherMeasurmentType", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "OtherMeasurementType1", - "OtherMeasurementType2" - ] - }, { - "typeName" : "studyAssayTechnologyType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "culture based drug susceptibility testing, single concentration", - "culture based drug susceptibility testing, two concentrations", - "culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)", - "flow cytometry" - ] - }, { - "typeName" : "studyAssayPlatform", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ - "210-MS GC Ion Trap (Varian)", - "220-MS GC Ion Trap (Varian)", - "225-MS GC Ion Trap (Varian)", - "300-MS quadrupole GC/MS (Varian)" - ] - }, { - "typeName" : "studyAssayCellType", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "CellType1", - "CellType2" - ] - } - ] - }, - "journal" : { - "displayName" : "Journal Metadata", - "fields" : [{ - "typeName" : "journalVolumeIssue", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "journalVolume" : { - "typeName" : "journalVolume", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalVolume1" - }, - "journalIssue" : { - "typeName" : "journalIssue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalIssue1" - }, - "journalPubDate" : { - "typeName" : "journalPubDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1008-01-01" - } - }, { - "journalVolume" : { - "typeName" : "journalVolume", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalVolume2" - }, - "journalIssue" : { - "typeName" : "journalIssue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalIssue2" - }, - "journalPubDate" : { - "typeName" : "journalPubDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1008-02-01" - } - } - ] - }, { - "typeName" : "journalArticleType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "abstract" - } - ] - } - } - } + "datasetVersion" : { + "license" : { + "name" : "CC0 1.0", + "uri" : "http://creativecommons.org/publicdomain/zero/1.0" + }, + "metadataBlocks" : { + "citation" : { + "displayName" : "Citation Metadata", + "fields" : [{ + "typeName" : "title", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Replication Data for: Title" + }, { + "typeName" : "subtitle", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Subtitle" + }, { + "typeName" : "alternativeTitle", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Alternative Title" + ] + }, { + "typeName" : "alternativeURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://AlternativeURL.org" + }, { + "typeName" : "otherId", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "otherIdAgency" : { + "typeName" : "otherIdAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDAgency1" + }, + "otherIdValue" : { + "typeName" : "otherIdValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDIdentifier1" + } + }, { + "otherIdAgency" : { + "typeName" : "otherIdAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDAgency2" + }, + "otherIdValue" : { + "typeName" : "otherIdValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherIDIdentifier2" + } + } + ] + }, { + "typeName" : "author", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "authorName" : { + "typeName" : "authorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastAuthor1, FirstAuthor1" + }, + "authorAffiliation" : { + "typeName" : "authorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorAffiliation1" + }, + "authorIdentifierScheme" : { + "typeName" : "authorIdentifierScheme", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "ORCID" + }, + "authorIdentifier" : { + "typeName" : "authorIdentifier", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorIdentifier1" + } + }, { + "authorName" : { + "typeName" : "authorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastAuthor2, FirstAuthor2" + }, + "authorAffiliation" : { + "typeName" : "authorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorAffiliation2" + }, + "authorIdentifierScheme" : { + "typeName" : "authorIdentifierScheme", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "ISNI" + }, + "authorIdentifier" : { + "typeName" : "authorIdentifier", + "multiple" : false, + "typeClass" : "primitive", + "value" : "AuthorIdentifier2" + } + } + ] + }, { + "typeName" : "datasetContact", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "datasetContactName" : { + "typeName" : "datasetContactName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContact1, FirstContact1" + }, + "datasetContactAffiliation" : { + "typeName" : "datasetContactAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactAffiliation1" + }, + "datasetContactEmail" : { + "typeName" : "datasetContactEmail", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactEmail1@mailinator.com" + } + }, { + "datasetContactName" : { + "typeName" : "datasetContactName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContact2, FirstContact2" + }, + "datasetContactAffiliation" : { + "typeName" : "datasetContactAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactAffiliation2" + }, + "datasetContactEmail" : { + "typeName" : "datasetContactEmail", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ContactEmail2@mailinator.com" + } + } + ] + }, { + "typeName" : "dsDescription", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "dsDescriptionValue" : { + "typeName" : "dsDescriptionValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DescriptionText1" + }, + "dsDescriptionDate" : { + "typeName" : "dsDescriptionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1000-01-01" + } + }, { + "dsDescriptionValue" : { + "typeName" : "dsDescriptionValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DescriptionText2" + }, + "dsDescriptionDate" : { + "typeName" : "dsDescriptionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1000-02-02" + } + } + ] + }, { + "typeName" : "subject", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Agricultural Sciences", + "Business and Management", + "Engineering", + "Law" + ] + }, { + "typeName" : "keyword", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "keywordValue" : { + "typeName" : "keywordValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordTerm1" + }, + "keywordTermURI" : { + "typeName" : "keywordTermURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://keywordTermURI1.org" + }, + "keywordVocabulary" : { + "typeName" : "keywordVocabulary", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordVocabulary1" + }, + "keywordVocabularyURI" : { + "typeName" : "keywordVocabularyURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://KeywordVocabularyURL1.org" + } + }, { + "keywordValue" : { + "typeName" : "keywordValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordTerm2" + }, + "keywordTermURI" : { + "typeName" : "keywordTermURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://keywordTermURI2.org" + }, + "keywordVocabulary" : { + "typeName" : "keywordVocabulary", + "multiple" : false, + "typeClass" : "primitive", + "value" : "KeywordVocabulary2" + }, + "keywordVocabularyURI" : { + "typeName" : "keywordVocabularyURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://KeywordVocabularyURL2.org" + } + } + ] + }, { + "typeName" : "topicClassification", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "topicClassValue" : { + "typeName" : "topicClassValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Term1" + }, + "topicClassVocab" : { + "typeName" : "topicClassVocab", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Vocab1" + }, + "topicClassVocabURI" : { + "typeName" : "topicClassVocabURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "https://TopicClassificationURL1.com" + } + }, { + "topicClassValue" : { + "typeName" : "topicClassValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Term2" + }, + "topicClassVocab" : { + "typeName" : "topicClassVocab", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Topic Classification Vocab2" + }, + "topicClassVocabURI" : { + "typeName" : "topicClassVocabURI", + "multiple" : false, + "typeClass" : "primitive", + "value" : "https://TopicClassificationURL2.com" + } + } + ] + }, { + "typeName" : "publication", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "publicationRelationType" : { + "typeName" : "publicationRelationType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "IsSupplementTo" + }, + "publicationCitation" : { + "typeName" : "publicationCitation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationCitation1" + }, + "publicationIDType" : { + "typeName" : "publicationIDType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "ark" + }, + "publicationIDNumber" : { + "typeName" : "publicationIDNumber", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationIDNumber1" + }, + "publicationURL" : { + "typeName" : "publicationURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://RelatedPublicationURL1.org" + } + }, { + "publicationCitation" : { + "typeName" : "publicationCitation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationCitation2" + }, + "publicationIDType" : { + "typeName" : "publicationIDType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "arXiv" + }, + "publicationIDNumber" : { + "typeName" : "publicationIDNumber", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RelatedPublicationIDNumber2" + }, + "publicationURL" : { + "typeName" : "publicationURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://RelatedPublicationURL2.org" + } + } + ] + }, { + "typeName" : "notesText", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Notes1" + }, { + "typeName" : "language", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Abkhaz", + "Afar" + ] + }, { + "typeName" : "producer", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "producerName" : { + "typeName" : "producerName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastProducer1, FirstProducer1" + }, + "producerAffiliation" : { + "typeName" : "producerAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAffiliation1" + }, + "producerAbbreviation" : { + "typeName" : "producerAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAbbreviation1" + }, + "producerURL" : { + "typeName" : "producerURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerURL1.org" + }, + "producerLogoURL" : { + "typeName" : "producerLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerLogoURL1.org" + } + }, { + "producerName" : { + "typeName" : "producerName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastProducer2, FirstProducer2" + }, + "producerAffiliation" : { + "typeName" : "producerAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAffiliation2" + }, + "producerAbbreviation" : { + "typeName" : "producerAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ProducerAbbreviation2" + }, + "producerURL" : { + "typeName" : "producerURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerURL2.org" + }, + "producerLogoURL" : { + "typeName" : "producerLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://ProducerLogoURL2.org" + } + } + ] + }, { + "typeName" : "productionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1003-01-01" + }, { + "typeName" : "productionPlace", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "ProductionPlace" + ] + }, { + "typeName" : "contributor", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "contributorType" : { + "typeName" : "contributorType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Data Collector" + }, + "contributorName" : { + "typeName" : "contributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContributor1, FirstContributor1" + } + }, { + "contributorType" : { + "typeName" : "contributorType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Data Curator" + }, + "contributorName" : { + "typeName" : "contributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastContributor2, FirstContributor2" + } + } + ] + }, { + "typeName" : "grantNumber", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "grantNumberAgency" : { + "typeName" : "grantNumberAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantAgency1" + }, + "grantNumberValue" : { + "typeName" : "grantNumberValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantNumber1" + } + }, { + "grantNumberAgency" : { + "typeName" : "grantNumberAgency", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantAgency2" + }, + "grantNumberValue" : { + "typeName" : "grantNumberValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GrantInformationGrantNumber2" + } + } + ] + }, { + "typeName" : "distributor", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "distributorName" : { + "typeName" : "distributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDistributor1, FirstDistributor1" + }, + "distributorAffiliation" : { + "typeName" : "distributorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAffiliation1" + }, + "distributorAbbreviation" : { + "typeName" : "distributorAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAbbreviation1" + }, + "distributorURL" : { + "typeName" : "distributorURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorURL1.org" + }, + "distributorLogoURL" : { + "typeName" : "distributorLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorLogoURL1.org" + } + }, { + "distributorName" : { + "typeName" : "distributorName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDistributor2, FirstDistributor2" + }, + "distributorAffiliation" : { + "typeName" : "distributorAffiliation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAffiliation2" + }, + "distributorAbbreviation" : { + "typeName" : "distributorAbbreviation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DistributorAbbreviation2" + }, + "distributorURL" : { + "typeName" : "distributorURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorURL2.org" + }, + "distributorLogoURL" : { + "typeName" : "distributorLogoURL", + "multiple" : false, + "typeClass" : "primitive", + "value" : "http://DistributorLogoURL2.org" + } + } + ] + }, { + "typeName" : "distributionDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1004-01-01" + }, { + "typeName" : "depositor", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDepositor, FirstDepositor" + }, { + "typeName" : "dateOfDeposit", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1002-01-01" + }, { + "typeName" : "timePeriodCovered", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "timePeriodCoveredStart" : { + "typeName" : "timePeriodCoveredStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-01-01" + }, + "timePeriodCoveredEnd" : { + "typeName" : "timePeriodCoveredEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-01-02" + } + }, { + "timePeriodCoveredStart" : { + "typeName" : "timePeriodCoveredStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-02-01" + }, + "timePeriodCoveredEnd" : { + "typeName" : "timePeriodCoveredEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1005-02-02" + } + } + ] + }, { + "typeName" : "dateOfCollection", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "dateOfCollectionStart" : { + "typeName" : "dateOfCollectionStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-01-01" + }, + "dateOfCollectionEnd" : { + "typeName" : "dateOfCollectionEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-01-01" + } + }, { + "dateOfCollectionStart" : { + "typeName" : "dateOfCollectionStart", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-02-01" + }, + "dateOfCollectionEnd" : { + "typeName" : "dateOfCollectionEnd", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1006-02-02" + } + } + ] + }, { + "typeName" : "kindOfData", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "KindOfData1", + "KindOfData2" + ] + }, { + "typeName" : "series", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "seriesName" : { + "typeName" : "seriesName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SeriesName" + }, + "seriesInformation" : { + "typeName" : "seriesInformation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SeriesInformation" + } + } + ] + }, { + "typeName" : "software", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "softwareName" : { + "typeName" : "softwareName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareName1" + }, + "softwareVersion" : { + "typeName" : "softwareVersion", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareVersion1" + } + }, { + "softwareName" : { + "typeName" : "softwareName", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareName2" + }, + "softwareVersion" : { + "typeName" : "softwareVersion", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SoftwareVersion2" + } + } + ] + }, { + "typeName" : "relatedMaterial", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "RelatedMaterial1", + "RelatedMaterial2" + ] + }, { + "typeName" : "relatedDatasets", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "RelatedDatasets1", + "RelatedDatasets2" + ] + }, { + "typeName" : "otherReferences", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "OtherReferences1", + "OtherReferences2" + ] + }, { + "typeName" : "dataSources", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "DataSources1", + "DataSources2" + ] + }, { + "typeName" : "originOfSources", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OriginOfSources" + }, { + "typeName" : "characteristicOfSources", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CharacteristicOfSourcesNoted" + }, { + "typeName" : "accessToSources", + "multiple" : false, + "typeClass" : "primitive", + "value" : "DocumentationAndAccessToSources" + } + ] + }, + "geospatial" : { + "displayName" : "Geospatial Metadata", + "fields" : [{ + "typeName" : "geographicCoverage", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "country" : { + "typeName" : "country", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Afghanistan" + }, + "state" : { + "typeName" : "state", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageStateProvince1" + }, + "city" : { + "typeName" : "city", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageCity1" + }, + "otherGeographicCoverage" : { + "typeName" : "otherGeographicCoverage", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageOther1" + } + }, { + "country" : { + "typeName" : "country", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "Albania" + }, + "state" : { + "typeName" : "state", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageStateProvince2" + }, + "city" : { + "typeName" : "city", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageCity2" + }, + "otherGeographicCoverage" : { + "typeName" : "otherGeographicCoverage", + "multiple" : false, + "typeClass" : "primitive", + "value" : "GeographicCoverageOther2" + } + } + ] + }, { + "typeName" : "geographicUnit", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "GeographicUnit1", + "GeographicUnit2" + ] + }, { + "typeName" : "geographicBoundingBox", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "westLongitude" : { + "typeName" : "westLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-72" + }, + "eastLongitude" : { + "typeName" : "eastLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-70" + }, + "northLatitude" : { + "typeName" : "northLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "43" + }, + "southLatitude" : { + "typeName" : "southLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "42" + } + }, { + "westLongitude" : { + "typeName" : "westLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-18" + }, + "eastLongitude" : { + "typeName" : "eastLongitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "-13" + }, + "northLatitude" : { + "typeName" : "northLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "29" + }, + "southLatitude" : { + "typeName" : "southLatitude", + "multiple" : false, + "typeClass" : "primitive", + "value" : "28" + } + } + ] + } + ] + }, + "socialscience" : { + "displayName" : "Social Science and Humanities Metadata", + "fields" : [{ + "typeName" : "unitOfAnalysis", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "UnitOfAnalysis1", + "UnitOfAnalysis2" + ] + }, { + "typeName" : "universe", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Universe1", + "Universe2" + ] + }, { + "typeName" : "timeMethod", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TimeMethod" + }, { + "typeName" : "dataCollector", + "multiple" : false, + "typeClass" : "primitive", + "value" : "LastDataCollector1, FirstDataCollector1" + }, { + "typeName" : "collectorTraining", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CollectorTraining" + }, { + "typeName" : "frequencyOfDataCollection", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Frequency" + }, { + "typeName" : "samplingProcedure", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SamplingProcedure" + }, { + "typeName" : "targetSampleSize", + "multiple" : false, + "typeClass" : "compound", + "value" : { + "targetSampleActualSize" : { + "typeName" : "targetSampleActualSize", + "multiple" : false, + "typeClass" : "primitive", + "value" : "100" + }, + "targetSampleSizeFormula" : { + "typeName" : "targetSampleSizeFormula", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TargetSampleSizeFormula" + } + } + }, { + "typeName" : "deviationsFromSampleDesign", + "multiple" : false, + "typeClass" : "primitive", + "value" : "MajorDeviationsForSampleDesign" + }, { + "typeName" : "collectionMode", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "CollectionMode" + ] + }, { + "typeName" : "researchInstrument", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TypeOfResearchInstrument" + }, { + "typeName" : "dataCollectionSituation", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CharacteristicsOfDataCollectionSituation" + }, { + "typeName" : "actionsToMinimizeLoss", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ActionsToMinimizeLosses" + }, { + "typeName" : "controlOperations", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ControlOperations" + }, { + "typeName" : "weighting", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Weighting" + }, { + "typeName" : "cleaningOperations", + "multiple" : false, + "typeClass" : "primitive", + "value" : "CleaningOperations" + }, { + "typeName" : "datasetLevelErrorNotes", + "multiple" : false, + "typeClass" : "primitive", + "value" : "StudyLevelErrorNotes" + }, { + "typeName" : "responseRate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "ResponseRate" + }, { + "typeName" : "samplingErrorEstimates", + "multiple" : false, + "typeClass" : "primitive", + "value" : "EstimatesOfSamplingError" + }, { + "typeName" : "otherDataAppraisal", + "multiple" : false, + "typeClass" : "primitive", + "value" : "OtherFormsOfDataAppraisal" + }, { + "typeName" : "socialScienceNotes", + "multiple" : false, + "typeClass" : "compound", + "value" : { + "socialScienceNotesType" : { + "typeName" : "socialScienceNotesType", + "multiple" : false, + "typeClass" : "primitive", + "value" : "NotesType" + }, + "socialScienceNotesSubject" : { + "typeName" : "socialScienceNotesSubject", + "multiple" : false, + "typeClass" : "primitive", + "value" : "NotesSubject" + }, + "socialScienceNotesText" : { + "typeName" : "socialScienceNotesText", + "multiple" : false, + "typeClass" : "primitive", + "value" : "NotesText" + } + } + } + ] + }, + "astrophysics" : { + "displayName" : "Astronomy and Astrophysics Metadata", + "fields" : [{ + "typeName" : "astroType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Image", + "Mosaic", + "EventList", + "Cube" + ] + }, { + "typeName" : "astroFacility", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Facility1", + "Facility2" + ] + }, { + "typeName" : "astroInstrument", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Instrument1", + "Instrument2" + ] + }, { + "typeName" : "astroObject", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Object1", + "Object2" + ] + }, { + "typeName" : "resolution.Spatial", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SpatialResolution" + }, { + "typeName" : "resolution.Spectral", + "multiple" : false, + "typeClass" : "primitive", + "value" : "SpectralResolution" + }, { + "typeName" : "resolution.Temporal", + "multiple" : false, + "typeClass" : "primitive", + "value" : "TimeResolution" + }, { + "typeName" : "coverage.Spectral.Bandpass", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "Bandpass1", + "Bandpass2" + ] + }, { + "typeName" : "coverage.Spectral.CentralWavelength", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "3001", + "3002" + ] + }, { + "typeName" : "coverage.Spectral.Wavelength", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "coverage.Spectral.MinimumWavelength" : { + "typeName" : "coverage.Spectral.MinimumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4001" + }, + "coverage.Spectral.MaximumWavelength" : { + "typeName" : "coverage.Spectral.MaximumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4002" + } + }, { + "coverage.Spectral.MinimumWavelength" : { + "typeName" : "coverage.Spectral.MinimumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4003" + }, + "coverage.Spectral.MaximumWavelength" : { + "typeName" : "coverage.Spectral.MaximumWavelength", + "multiple" : false, + "typeClass" : "primitive", + "value" : "4004" + } + } + ] + }, { + "typeName" : "coverage.Temporal", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "coverage.Temporal.StartTime" : { + "typeName" : "coverage.Temporal.StartTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-01-01" + }, + "coverage.Temporal.StopTime" : { + "typeName" : "coverage.Temporal.StopTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-01-02" + } + }, { + "coverage.Temporal.StartTime" : { + "typeName" : "coverage.Temporal.StartTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-02-01" + }, + "coverage.Temporal.StopTime" : { + "typeName" : "coverage.Temporal.StopTime", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1007-02-02" + } + } + ] + }, { + "typeName" : "coverage.Spatial", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "SkyCoverage1", + "SkyCoverage2" + ] + }, { + "typeName" : "coverage.Depth", + "multiple" : false, + "typeClass" : "primitive", + "value" : "200" + }, { + "typeName" : "coverage.ObjectDensity", + "multiple" : false, + "typeClass" : "primitive", + "value" : "300" + }, { + "typeName" : "coverage.ObjectCount", + "multiple" : false, + "typeClass" : "primitive", + "value" : "400" + }, { + "typeName" : "coverage.SkyFraction", + "multiple" : false, + "typeClass" : "primitive", + "value" : "500" + }, { + "typeName" : "coverage.Polarization", + "multiple" : false, + "typeClass" : "primitive", + "value" : "Polarization" + }, { + "typeName" : "redshiftType", + "multiple" : false, + "typeClass" : "primitive", + "value" : "RedshiftType" + }, { + "typeName" : "resolution.Redshift", + "multiple" : false, + "typeClass" : "primitive", + "value" : "600" + }, { + "typeName" : "coverage.RedshiftValue", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "coverage.Redshift.MinimumValue" : { + "typeName" : "coverage.Redshift.MinimumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "701" + }, + "coverage.Redshift.MaximumValue" : { + "typeName" : "coverage.Redshift.MaximumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "702" + } + }, { + "coverage.Redshift.MinimumValue" : { + "typeName" : "coverage.Redshift.MinimumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "703" + }, + "coverage.Redshift.MaximumValue" : { + "typeName" : "coverage.Redshift.MaximumValue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "704" + } + } + ] + } + ] + }, + "biomedical" : { + "displayName" : "Life Sciences Metadata", + "fields" : [{ + "typeName" : "studyDesignType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Case Control", + "Cross Sectional", + "Cohort Study", + "Not Specified" + ] + }, { + "typeName" : "studyFactorType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Age", + "Biomarkers", + "Cell Surface Markers", + "Developmental Stage" + ] + }, { + "typeName" : "studyAssayOrganism", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "Arabidopsis thaliana", + "Bos taurus", + "Caenorhabditis elegans", + "Danio rerio (zebrafish)" + ] + }, { + "typeName" : "studyAssayOtherOrganism", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "OtherOrganism1", + "OtherOrganism2" + ] + }, { + "typeName" : "studyAssayMeasurementType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "genome sequencing", + "cell sorting", + "clinical chemistry analysis", + "DNA methylation profiling" + ] + }, { + "typeName" : "studyAssayOtherMeasurmentType", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "OtherMeasurementType1", + "OtherMeasurementType2" + ] + }, { + "typeName" : "studyAssayTechnologyType", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "culture based drug susceptibility testing, single concentration", + "culture based drug susceptibility testing, two concentrations", + "culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)", + "flow cytometry" + ] + }, { + "typeName" : "studyAssayPlatform", + "multiple" : true, + "typeClass" : "controlledVocabulary", + "value" : [ + "210-MS GC Ion Trap (Varian)", + "220-MS GC Ion Trap (Varian)", + "225-MS GC Ion Trap (Varian)", + "300-MS quadrupole GC/MS (Varian)" + ] + }, { + "typeName" : "studyAssayCellType", + "multiple" : true, + "typeClass" : "primitive", + "value" : [ + "CellType1", + "CellType2" + ] + } + ] + }, + "journal" : { + "displayName" : "Journal Metadata", + "fields" : [{ + "typeName" : "journalVolumeIssue", + "multiple" : true, + "typeClass" : "compound", + "value" : [{ + "journalVolume" : { + "typeName" : "journalVolume", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalVolume1" + }, + "journalIssue" : { + "typeName" : "journalIssue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalIssue1" + }, + "journalPubDate" : { + "typeName" : "journalPubDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1008-01-01" + } + }, { + "journalVolume" : { + "typeName" : "journalVolume", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalVolume2" + }, + "journalIssue" : { + "typeName" : "journalIssue", + "multiple" : false, + "typeClass" : "primitive", + "value" : "JournalIssue2" + }, + "journalPubDate" : { + "typeName" : "journalPubDate", + "multiple" : false, + "typeClass" : "primitive", + "value" : "1008-02-01" + } + } + ] + }, { + "typeName" : "journalArticleType", + "multiple" : false, + "typeClass" : "controlledVocabulary", + "value" : "abstract" + } + ] + } + } + } } \ No newline at end of file diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java index 53ab6c7bef7..abb812d1ba3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java @@ -490,6 +490,8 @@ public String getRestrictions() { return restrictions; } + @Deprecated + //Appears to not be used public String getContact() { return contact; } diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java index eb6fdd4e923..0433c425fd2 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java @@ -1357,36 +1357,41 @@ public List getRelatedPublications() { DatasetRelPublication relatedPublication = new DatasetRelPublication(); for (DatasetField subField : publication.getChildDatasetFields()) { switch (subField.getDatasetFieldType().getName()) { - case DatasetFieldConstant.publicationCitation: - relatedPublication.setText(subField.getDisplayValue()); - break; - case DatasetFieldConstant.publicationURL: - // We have to avoid using subField.getDisplayValue() here - because the DisplayFormatType - // for this url metadata field is likely set up so that the display value is automatically - // turned into a clickable HTML HREF block, which we don't want to end in our Schema.org - // JSON-LD output. So we want to use the raw value of the field instead, with minimal HTML - // sanitation, just in case (this would be done on all URLs in getDisplayValue()). - String url = subField.getValue(); - if (StringUtils.isBlank(url) || DatasetField.NA_VALUE.equals(url)) { - relatedPublication.setUrl(""); - } else { - relatedPublication.setUrl(MarkupChecker.sanitizeBasicHTML(url)); - } - break; - case DatasetFieldConstant.publicationIDType: - // QDR idType has a trailing : now (Aug 2021) - // Get sanitized value without any display modifications - subField.getDatasetFieldType().setDisplayFormat("#VALUE"); - relatedPublication.setIdType(subField.getDisplayValue()); - break; - case DatasetFieldConstant.publicationIDNumber: - // Get sanitized value without any display modifications - subField.getDatasetFieldType().setDisplayFormat("#VALUE"); - relatedPublication.setIdNumber(subField.getDisplayValue()); - break; - case DatasetFieldConstant.publicationRelationType: - relatedPublication.setRelationType(subField.getDisplayValue()); - break; + case DatasetFieldConstant.publicationCitation: + relatedPublication.setText(subField.getDisplayValue()); + break; + case DatasetFieldConstant.publicationURL: + // We have to avoid using subField.getDisplayValue() here - because the + // DisplayFormatType + // for this url metadata field is likely set up so that the display value is + // automatically + // turned into a clickable HTML HREF block, which we don't want to end in our + // Schema.org + // JSON-LD output. So we want to use the raw value of the field instead, with + // minimal HTML + // sanitation, just in case (this would be done on all URLs in + // getDisplayValue()). + String url = subField.getValue(); + if (StringUtils.isBlank(url) || DatasetField.NA_VALUE.equals(url)) { + relatedPublication.setUrl(""); + } else { + relatedPublication.setUrl(MarkupChecker.sanitizeBasicHTML(url)); + } + break; + case DatasetFieldConstant.publicationIDType: + // QDR idType has a trailing : now (Aug 2021) + // Get value without any display modifications + subField.getDatasetFieldType().setDisplayFormat("#VALUE"); + relatedPublication.setIdType(subField.getDisplayValue()); + break; + case DatasetFieldConstant.publicationIDNumber: + // Get sanitized value without any display modifications + subField.getDatasetFieldType().setDisplayFormat("#VALUE"); + relatedPublication.setIdNumber(subField.getDisplayValue()); + break; + case DatasetFieldConstant.publicationRelationType: + relatedPublication.setRelationType(subField.getDisplayValue()); + break; } } relatedPublications.add(relatedPublication); diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java index 0a1afe86901..f1ddf2304b7 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionUI.java @@ -118,21 +118,21 @@ public DatasetVersionUI initDatasetVersionUI(DatasetVersion datasetVersion, boo for (DatasetField subField : relPubVal.getChildDatasetFields()) { String value = subField.getValue(); switch (subField.getDatasetFieldType().getName()) { - case DatasetFieldConstant.publicationCitation: - datasetRelPublication.setText(subField.getValue()); - break; - case DatasetFieldConstant.publicationIDNumber: - datasetRelPublication.setIdNumber(subField.getValue()); - break; - case DatasetFieldConstant.publicationIDType: - datasetRelPublication.setIdType(subField.getValue()); - break; - case DatasetFieldConstant.publicationURL: - datasetRelPublication.setUrl(subField.getValue()); - break; - case DatasetFieldConstant.publicationRelationType: - datasetRelPublication.setRelationType(subField.getValue()); - break; + case DatasetFieldConstant.publicationCitation: + datasetRelPublication.setText(subField.getValue()); + break; + case DatasetFieldConstant.publicationIDNumber: + datasetRelPublication.setIdNumber(subField.getValue()); + break; + case DatasetFieldConstant.publicationIDType: + datasetRelPublication.setIdType(subField.getValue()); + break; + case DatasetFieldConstant.publicationURL: + datasetRelPublication.setUrl(subField.getValue()); + break; + case DatasetFieldConstant.publicationRelationType: + datasetRelPublication.setRelationType(subField.getValue()); + break; } } this.getDatasetRelPublications().add(datasetRelPublication); diff --git a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java index e74a2f26af6..a2ef9120cd7 100644 --- a/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/export/dublincore/DublinCoreExportUtil.java @@ -307,21 +307,21 @@ private static void writeRelPublElement(XMLStreamWriter xmlw, DatasetVersionDTO for (Iterator iterator = foo.iterator(); iterator.hasNext();) { FieldDTO next = iterator.next(); switch (next.getTypeName()) { - case DatasetFieldConstant.publicationCitation: - citation = next.getSinglePrimitive(); - break; - case DatasetFieldConstant.publicationIDType: - IDType = next.getSinglePrimitive(); - break; - case DatasetFieldConstant.publicationIDNumber: - IDNo = next.getSinglePrimitive(); - break; - case DatasetFieldConstant.publicationURL: - url = next.getSinglePrimitive(); - break; - case DatasetFieldConstant.publicationRelationType: - relationType = next.getSinglePrimitive(); - break; + case DatasetFieldConstant.publicationCitation: + citation = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationIDType: + IDType = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationIDNumber: + IDNo = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationURL: + url = next.getSinglePrimitive(); + break; + case DatasetFieldConstant.publicationRelationType: + relationType = next.getSinglePrimitive(); + break; } } if(StringUtils.isBlank(relationType)) { diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java index fe05b0d4537..a74a9f34bc9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java @@ -546,15 +546,15 @@ private void writeContributors(XMLStreamWriter xmlw, DvObject dvObject) throws X for (DatasetField subField : contributorFieldValue.getChildDatasetFields()) { switch (subField.getDatasetFieldType().getName()) { - case DatasetFieldConstant.contributorName: - contributor = subField.getValue(); - break; - case DatasetFieldConstant.contributorType: - contributorType = subField.getValue(); - if(contributorType!=null) { - contributorType = contributorType.replace(" ", ""); - } - break; + case DatasetFieldConstant.contributorName: + contributor = subField.getValue(); + break; + case DatasetFieldConstant.contributorType: + contributorType = subField.getValue(); + if (contributorType != null) { + contributorType = contributorType.replace(" ", ""); + } + break; } } // QDR - doesn't have Funder in the contributor type list. @@ -1299,71 +1299,71 @@ private void writeDescriptions(XMLStreamWriter xmlw, DvObject dvObject, boolean for (DatasetField dsf : dsfs) { switch (dsf.getDatasetFieldType().getName()) { - case DatasetFieldConstant.software: - attributes.clear(); - attributes.put("descriptionType", "TechnicalInfo"); - List dsfcvs = dsf.getDatasetFieldCompoundValues(); - for (DatasetFieldCompoundValue dsfcv : dsfcvs) { - - String softwareName = null; - String softwareVersion = null; - List childDsfs = dsfcv.getChildDatasetFields(); - for (DatasetField childDsf : childDsfs) { - if (DatasetFieldConstant.softwareName.equals(childDsf.getDatasetFieldType().getName())) { - softwareName = childDsf.getValue(); - } else if (DatasetFieldConstant.softwareVersion.equals(childDsf.getDatasetFieldType().getName())) { - softwareVersion = childDsf.getValue(); + case DatasetFieldConstant.software: + attributes.clear(); + attributes.put("descriptionType", "TechnicalInfo"); + List dsfcvs = dsf.getDatasetFieldCompoundValues(); + for (DatasetFieldCompoundValue dsfcv : dsfcvs) { + + String softwareName = null; + String softwareVersion = null; + List childDsfs = dsfcv.getChildDatasetFields(); + for (DatasetField childDsf : childDsfs) { + if (DatasetFieldConstant.softwareName.equals(childDsf.getDatasetFieldType().getName())) { + softwareName = childDsf.getValue(); + } else if (DatasetFieldConstant.softwareVersion.equals(childDsf.getDatasetFieldType().getName())) { + softwareVersion = childDsf.getValue(); + } } - } - if (StringUtils.isNotBlank(softwareName)) { - if (StringUtils.isNotBlank(softwareVersion)) { + if (StringUtils.isNotBlank(softwareName)) { + if (StringUtils.isNotBlank(softwareVersion)) { + } + softwareName = softwareName + ", " + softwareVersion; + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, softwareName); } - softwareName = softwareName + ", " + softwareVersion; - descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, softwareName); } - } - break; - case DatasetFieldConstant.originOfSources: - case DatasetFieldConstant.characteristicOfSources: - case DatasetFieldConstant.accessToSources: - attributes.clear(); - attributes.put("descriptionType", "Methods"); - String method = dsf.getValue(); - if (StringUtils.isNotBlank(method)) { - descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, method); - - } - break; - case DatasetFieldConstant.series: - attributes.clear(); - attributes.put("descriptionType", "SeriesInformation"); - dsfcvs = dsf.getDatasetFieldCompoundValues(); - for (DatasetFieldCompoundValue dsfcv : dsfcvs) { - List childDsfs = dsfcv.getChildDatasetFields(); - for (DatasetField childDsf : childDsfs) { + break; + case DatasetFieldConstant.originOfSources: + case DatasetFieldConstant.characteristicOfSources: + case DatasetFieldConstant.accessToSources: + attributes.clear(); + attributes.put("descriptionType", "Methods"); + String method = dsf.getValue(); + if (StringUtils.isNotBlank(method)) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, method); - if (DatasetFieldConstant.seriesName.equals(childDsf.getDatasetFieldType().getName())) { - String seriesInformation = childDsf.getValue(); - if (StringUtils.isNotBlank(seriesInformation)) { - descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, seriesInformation); + } + break; + case DatasetFieldConstant.series: + attributes.clear(); + attributes.put("descriptionType", "SeriesInformation"); + dsfcvs = dsf.getDatasetFieldCompoundValues(); + for (DatasetFieldCompoundValue dsfcv : dsfcvs) { + List childDsfs = dsfcv.getChildDatasetFields(); + for (DatasetField childDsf : childDsfs) { + + if (DatasetFieldConstant.seriesName.equals(childDsf.getDatasetFieldType().getName())) { + String seriesInformation = childDsf.getValue(); + if (StringUtils.isNotBlank(seriesInformation)) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, seriesInformation); + } + break; } - break; } } - } - break; - case DatasetFieldConstant.notesText: - attributes.clear(); - attributes.put("descriptionType", "Other"); - String notesText = dsf.getValue(); - if (StringUtils.isNotBlank(notesText)) { - descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); - XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, notesText); - } - break; + break; + case DatasetFieldConstant.notesText: + attributes.clear(); + attributes.put("descriptionType", "Other"); + String notesText = dsf.getValue(); + if (StringUtils.isNotBlank(notesText)) { + descriptionsWritten = XmlWriterUtil.writeOpenTagIfNeeded(xmlw, "descriptions", descriptionsWritten); + XmlWriterUtil.writeFullElementWithAttributes(xmlw, "description", attributes, notesText); + } + break; } } From 174fcf911e3bb44321e59aaae317ed2eb86aed33 Mon Sep 17 00:00:00 2001 From: qqmyers Date: Tue, 17 Sep 2024 13:55:35 -0400 Subject: [PATCH 325/366] Apply suggestions from code review Co-authored-by: Philip Durbin --- .../10632-DataCiteXMLandRelationType.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/release-notes/10632-DataCiteXMLandRelationType.md b/doc/release-notes/10632-DataCiteXMLandRelationType.md index 10e9a830714..a3699646314 100644 --- a/doc/release-notes/10632-DataCiteXMLandRelationType.md +++ b/doc/release-notes/10632-DataCiteXMLandRelationType.md @@ -1,21 +1,21 @@ -### Enhanced DataCite Metadata +### Enhanced DataCite Metadata, Relation Type A new field has been added to the citation metadatablock to allow entry of the "Relation Type" between a "Related Publication" and a dataset. The Relation Type is currently limited to the most common 6 values recommended by DataCite: isCitedBy, Cites, IsSupplementTo, IsSupplementedBy, IsReferencedBy, and References. -Additional metadata, including metadata about Related Publications is now being sent to DataCite when DOIs are registered and published and is available in the DataCite XML export. For existing datasets where no "Relation Type" has been specified, "IsSupplementTo" is assumed. The additions are in rough alignment with the OpenAire xml export, but there are some minor differences in addition to the Relation Type addition, including an update to the DataCite 4.5 schema. +Additional metadata, including metadata about Related Publications is now being sent to DataCite when DOIs are registered and published and is available in the DataCite XML export. For existing datasets where no "Relation Type" has been specified, "IsSupplementTo" is assumed. The additions are in rough alignment with the OpenAIRE XML export, but there are some minor differences in addition to the Relation Type addition, including an update to the DataCite 4.5 schema. -For details see https://github.com/IQSS/dataverse/pull/10632 and https://github.com/IQSS/dataverse/pull/10615 and the design document referenced there. +For details see https://github.com/IQSS/dataverse/pull/10632 and https://github.com/IQSS/dataverse/pull/10615 and the [design document](https://docs.google.com/document/d/1JzDo9UOIy9dVvaHvtIbOI8tFU6bWdfDfuQvWWpC0tkA/edit?usp=sharing) referenced there. Multiple backward incompatible changes and bug fixes have been made to API calls (3 of the four of which were not documented) related to updating PID target urls and metadata at the provider service: -[Update Target URL for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider) -[Update Target URL for all Published Datasets at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-all-published-datasets-at-the-pid-provider) -[Update Metadata for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-a-published-dataset-at-the-pid-provider) -[Update Metadata for all Published Datasets at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider) +- [Update Target URL for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider) +- [Update Target URL for all Published Datasets at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-all-published-datasets-at-the-pid-provider) +- [Update Metadata for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-a-published-dataset-at-the-pid-provider) +- [Update Metadata for all Published Datasets at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-metadata-for-all-published-datasets-at-the-pid-provider) Upgrade instructions -------------------- -The solr schema has to be updated via the normal mechanism to add the new "relationType" field. +The Solr schema has to be updated via the normal mechanism to add the new "relationType" field. The citation metadatablock has to be reinstalled using the standard instructions. @@ -23,9 +23,9 @@ With these two changes, the "Relation Type" fields will be available and creatio To update existing datasets (and files using DataCite DOIs): -Exports can be updated by running curl http://localhost:8080/api/admin/metadata/reExportAll +Exports can be updated by running `curl http://localhost:8080/api/admin/metadata/reExportAll` -Entries at DataCite for published datasets can be updated by a superuser using an api call (newly documented) +Entries at DataCite for published datasets can be updated by a superuser using an API call (newly documented): `curl -X POST -H 'X-Dataverse-key:' http://localhost:8080/api/datasets/modifyRegistrationPIDMetadataAll` From 4ae0599fb212ee66883435362e7918d3f727ba43 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 17 Sep 2024 14:05:42 -0400 Subject: [PATCH 326/366] cleaner formatting --- ...dataset-create-new-all-default-fields.json | 2523 +++++++++-------- 1 file changed, 1323 insertions(+), 1200 deletions(-) diff --git a/scripts/api/data/dataset-create-new-all-default-fields.json b/scripts/api/data/dataset-create-new-all-default-fields.json index 84b152690f9..151c4732ad7 100644 --- a/scripts/api/data/dataset-create-new-all-default-fields.json +++ b/scripts/api/data/dataset-create-new-all-default-fields.json @@ -1,1410 +1,1533 @@ { - "datasetVersion" : { - "license" : { - "name" : "CC0 1.0", - "uri" : "http://creativecommons.org/publicdomain/zero/1.0" + "datasetVersion": { + "license": { + "name": "CC0 1.0", + "uri": "http://creativecommons.org/publicdomain/zero/1.0" }, - "metadataBlocks" : { - "citation" : { - "displayName" : "Citation Metadata", - "fields" : [{ - "typeName" : "title", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Replication Data for: Title" - }, { - "typeName" : "subtitle", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Subtitle" - }, { - "typeName" : "alternativeTitle", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "Alternative Title" - ] - }, { - "typeName" : "alternativeURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://AlternativeURL.org" - }, { - "typeName" : "otherId", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "otherIdAgency" : { - "typeName" : "otherIdAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDAgency1" - }, - "otherIdValue" : { - "typeName" : "otherIdValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDIdentifier1" + "metadataBlocks": { + "citation": { + "displayName": "Citation Metadata", + "fields": [ + { + "typeName": "title", + "multiple": false, + "typeClass": "primitive", + "value": "Replication Data for: Title" + }, + { + "typeName": "subtitle", + "multiple": false, + "typeClass": "primitive", + "value": "Subtitle" + }, + { + "typeName": "alternativeTitle", + "multiple": true, + "typeClass": "primitive", + "value": ["Alternative Title"] + }, + { + "typeName": "alternativeURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://AlternativeURL.org" + }, + { + "typeName": "otherId", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "otherIdAgency": { + "typeName": "otherIdAgency", + "multiple": false, + "typeClass": "primitive", + "value": "OtherIDAgency1" + }, + "otherIdValue": { + "typeName": "otherIdValue", + "multiple": false, + "typeClass": "primitive", + "value": "OtherIDIdentifier1" } - }, { - "otherIdAgency" : { - "typeName" : "otherIdAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDAgency2" - }, - "otherIdValue" : { - "typeName" : "otherIdValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherIDIdentifier2" + }, + { + "otherIdAgency": { + "typeName": "otherIdAgency", + "multiple": false, + "typeClass": "primitive", + "value": "OtherIDAgency2" + }, + "otherIdValue": { + "typeName": "otherIdValue", + "multiple": false, + "typeClass": "primitive", + "value": "OtherIDIdentifier2" } } ] - }, { - "typeName" : "author", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "authorName" : { - "typeName" : "authorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastAuthor1, FirstAuthor1" - }, - "authorAffiliation" : { - "typeName" : "authorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorAffiliation1" - }, - "authorIdentifierScheme" : { - "typeName" : "authorIdentifierScheme", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "ORCID" - }, - "authorIdentifier" : { - "typeName" : "authorIdentifier", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorIdentifier1" + }, + { + "typeName": "author", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "authorName": { + "typeName": "authorName", + "multiple": false, + "typeClass": "primitive", + "value": "LastAuthor1, FirstAuthor1" + }, + "authorAffiliation": { + "typeName": "authorAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "AuthorAffiliation1" + }, + "authorIdentifierScheme": { + "typeName": "authorIdentifierScheme", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "ORCID" + }, + "authorIdentifier": { + "typeName": "authorIdentifier", + "multiple": false, + "typeClass": "primitive", + "value": "AuthorIdentifier1" } - }, { - "authorName" : { - "typeName" : "authorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastAuthor2, FirstAuthor2" - }, - "authorAffiliation" : { - "typeName" : "authorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorAffiliation2" - }, - "authorIdentifierScheme" : { - "typeName" : "authorIdentifierScheme", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "ISNI" - }, - "authorIdentifier" : { - "typeName" : "authorIdentifier", - "multiple" : false, - "typeClass" : "primitive", - "value" : "AuthorIdentifier2" + }, + { + "authorName": { + "typeName": "authorName", + "multiple": false, + "typeClass": "primitive", + "value": "LastAuthor2, FirstAuthor2" + }, + "authorAffiliation": { + "typeName": "authorAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "AuthorAffiliation2" + }, + "authorIdentifierScheme": { + "typeName": "authorIdentifierScheme", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "ISNI" + }, + "authorIdentifier": { + "typeName": "authorIdentifier", + "multiple": false, + "typeClass": "primitive", + "value": "AuthorIdentifier2" } } ] - }, { - "typeName" : "datasetContact", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "datasetContactName" : { - "typeName" : "datasetContactName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContact1, FirstContact1" - }, - "datasetContactAffiliation" : { - "typeName" : "datasetContactAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactAffiliation1" - }, - "datasetContactEmail" : { - "typeName" : "datasetContactEmail", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactEmail1@mailinator.com" + }, + { + "typeName": "datasetContact", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "datasetContactName": { + "typeName": "datasetContactName", + "multiple": false, + "typeClass": "primitive", + "value": "LastContact1, FirstContact1" + }, + "datasetContactAffiliation": { + "typeName": "datasetContactAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "ContactAffiliation1" + }, + "datasetContactEmail": { + "typeName": "datasetContactEmail", + "multiple": false, + "typeClass": "primitive", + "value": "ContactEmail1@mailinator.com" } - }, { - "datasetContactName" : { - "typeName" : "datasetContactName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContact2, FirstContact2" - }, - "datasetContactAffiliation" : { - "typeName" : "datasetContactAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactAffiliation2" - }, - "datasetContactEmail" : { - "typeName" : "datasetContactEmail", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ContactEmail2@mailinator.com" + }, + { + "datasetContactName": { + "typeName": "datasetContactName", + "multiple": false, + "typeClass": "primitive", + "value": "LastContact2, FirstContact2" + }, + "datasetContactAffiliation": { + "typeName": "datasetContactAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "ContactAffiliation2" + }, + "datasetContactEmail": { + "typeName": "datasetContactEmail", + "multiple": false, + "typeClass": "primitive", + "value": "ContactEmail2@mailinator.com" } } ] - }, { - "typeName" : "dsDescription", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "dsDescriptionValue" : { - "typeName" : "dsDescriptionValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DescriptionText1" - }, - "dsDescriptionDate" : { - "typeName" : "dsDescriptionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1000-01-01" + }, + { + "typeName": "dsDescription", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "dsDescriptionValue": { + "typeName": "dsDescriptionValue", + "multiple": false, + "typeClass": "primitive", + "value": "DescriptionText1" + }, + "dsDescriptionDate": { + "typeName": "dsDescriptionDate", + "multiple": false, + "typeClass": "primitive", + "value": "1000-01-01" } - }, { - "dsDescriptionValue" : { - "typeName" : "dsDescriptionValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DescriptionText2" - }, - "dsDescriptionDate" : { - "typeName" : "dsDescriptionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1000-02-02" + }, + { + "dsDescriptionValue": { + "typeName": "dsDescriptionValue", + "multiple": false, + "typeClass": "primitive", + "value": "DescriptionText2" + }, + "dsDescriptionDate": { + "typeName": "dsDescriptionDate", + "multiple": false, + "typeClass": "primitive", + "value": "1000-02-02" } } ] - }, { - "typeName" : "subject", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + }, + { + "typeName": "subject", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "Agricultural Sciences", "Business and Management", "Engineering", "Law" ] - }, { - "typeName" : "keyword", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "keywordValue" : { - "typeName" : "keywordValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordTerm1" - }, - "keywordTermURI" : { - "typeName" : "keywordTermURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://keywordTermURI1.org" - }, - "keywordVocabulary" : { - "typeName" : "keywordVocabulary", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordVocabulary1" - }, - "keywordVocabularyURI" : { - "typeName" : "keywordVocabularyURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://KeywordVocabularyURL1.org" + }, + { + "typeName": "keyword", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "keywordValue": { + "typeName": "keywordValue", + "multiple": false, + "typeClass": "primitive", + "value": "KeywordTerm1" + }, + "keywordTermURI": { + "typeName": "keywordTermURI", + "multiple": false, + "typeClass": "primitive", + "value": "http://keywordTermURI1.org" + }, + "keywordVocabulary": { + "typeName": "keywordVocabulary", + "multiple": false, + "typeClass": "primitive", + "value": "KeywordVocabulary1" + }, + "keywordVocabularyURI": { + "typeName": "keywordVocabularyURI", + "multiple": false, + "typeClass": "primitive", + "value": "http://KeywordVocabularyURL1.org" } - }, { - "keywordValue" : { - "typeName" : "keywordValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordTerm2" - }, - "keywordTermURI" : { - "typeName" : "keywordTermURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://keywordTermURI2.org" - }, - "keywordVocabulary" : { - "typeName" : "keywordVocabulary", - "multiple" : false, - "typeClass" : "primitive", - "value" : "KeywordVocabulary2" - }, - "keywordVocabularyURI" : { - "typeName" : "keywordVocabularyURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://KeywordVocabularyURL2.org" + }, + { + "keywordValue": { + "typeName": "keywordValue", + "multiple": false, + "typeClass": "primitive", + "value": "KeywordTerm2" + }, + "keywordTermURI": { + "typeName": "keywordTermURI", + "multiple": false, + "typeClass": "primitive", + "value": "http://keywordTermURI2.org" + }, + "keywordVocabulary": { + "typeName": "keywordVocabulary", + "multiple": false, + "typeClass": "primitive", + "value": "KeywordVocabulary2" + }, + "keywordVocabularyURI": { + "typeName": "keywordVocabularyURI", + "multiple": false, + "typeClass": "primitive", + "value": "http://KeywordVocabularyURL2.org" } } ] - }, { - "typeName" : "topicClassification", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "topicClassValue" : { - "typeName" : "topicClassValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Term1" - }, - "topicClassVocab" : { - "typeName" : "topicClassVocab", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Vocab1" - }, - "topicClassVocabURI" : { - "typeName" : "topicClassVocabURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "https://TopicClassificationURL1.com" + }, + { + "typeName": "topicClassification", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "topicClassValue": { + "typeName": "topicClassValue", + "multiple": false, + "typeClass": "primitive", + "value": "Topic Classification Term1" + }, + "topicClassVocab": { + "typeName": "topicClassVocab", + "multiple": false, + "typeClass": "primitive", + "value": "Topic Classification Vocab1" + }, + "topicClassVocabURI": { + "typeName": "topicClassVocabURI", + "multiple": false, + "typeClass": "primitive", + "value": "https://TopicClassificationURL1.com" } - }, { - "topicClassValue" : { - "typeName" : "topicClassValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Term2" - }, - "topicClassVocab" : { - "typeName" : "topicClassVocab", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Topic Classification Vocab2" - }, - "topicClassVocabURI" : { - "typeName" : "topicClassVocabURI", - "multiple" : false, - "typeClass" : "primitive", - "value" : "https://TopicClassificationURL2.com" + }, + { + "topicClassValue": { + "typeName": "topicClassValue", + "multiple": false, + "typeClass": "primitive", + "value": "Topic Classification Term2" + }, + "topicClassVocab": { + "typeName": "topicClassVocab", + "multiple": false, + "typeClass": "primitive", + "value": "Topic Classification Vocab2" + }, + "topicClassVocabURI": { + "typeName": "topicClassVocabURI", + "multiple": false, + "typeClass": "primitive", + "value": "https://TopicClassificationURL2.com" } } ] - }, { - "typeName" : "publication", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ + }, + { + "typeName": "publication", + "multiple": true, + "typeClass": "compound", + "value": [ + { "publicationRelationType" : { "typeName" : "publicationRelationType", "multiple" : false, "typeClass" : "controlledVocabulary", "value" : "IsSupplementTo" }, - "publicationCitation" : { - "typeName" : "publicationCitation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationCitation1" - }, - "publicationIDType" : { - "typeName" : "publicationIDType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "ark" - }, - "publicationIDNumber" : { - "typeName" : "publicationIDNumber", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationIDNumber1" - }, - "publicationURL" : { - "typeName" : "publicationURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://RelatedPublicationURL1.org" + "publicationCitation": { + "typeName": "publicationCitation", + "multiple": false, + "typeClass": "primitive", + "value": "RelatedPublicationCitation1" + }, + "publicationIDType": { + "typeName": "publicationIDType", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "ark" + }, + "publicationIDNumber": { + "typeName": "publicationIDNumber", + "multiple": false, + "typeClass": "primitive", + "value": "RelatedPublicationIDNumber1" + }, + "publicationURL": { + "typeName": "publicationURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://RelatedPublicationURL1.org" } - }, { - "publicationCitation" : { - "typeName" : "publicationCitation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationCitation2" - }, - "publicationIDType" : { - "typeName" : "publicationIDType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "arXiv" - }, - "publicationIDNumber" : { - "typeName" : "publicationIDNumber", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RelatedPublicationIDNumber2" - }, - "publicationURL" : { - "typeName" : "publicationURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://RelatedPublicationURL2.org" + }, + { + "publicationCitation": { + "typeName": "publicationCitation", + "multiple": false, + "typeClass": "primitive", + "value": "RelatedPublicationCitation2" + }, + "publicationIDType": { + "typeName": "publicationIDType", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "arXiv" + }, + "publicationIDNumber": { + "typeName": "publicationIDNumber", + "multiple": false, + "typeClass": "primitive", + "value": "RelatedPublicationIDNumber2" + }, + "publicationURL": { + "typeName": "publicationURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://RelatedPublicationURL2.org" } } ] - }, { - "typeName" : "notesText", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Notes1" - }, { - "typeName" : "language", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + }, + { + "typeName": "notesText", + "multiple": false, + "typeClass": "primitive", + "value": "Notes1" + }, + { + "typeName": "language", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "Abkhaz", "Afar" ] - }, { - "typeName" : "producer", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "producerName" : { - "typeName" : "producerName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastProducer1, FirstProducer1" - }, - "producerAffiliation" : { - "typeName" : "producerAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAffiliation1" - }, - "producerAbbreviation" : { - "typeName" : "producerAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAbbreviation1" - }, - "producerURL" : { - "typeName" : "producerURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerURL1.org" - }, - "producerLogoURL" : { - "typeName" : "producerLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerLogoURL1.org" + }, + { + "typeName": "producer", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "producerName": { + "typeName": "producerName", + "multiple": false, + "typeClass": "primitive", + "value": "LastProducer1, FirstProducer1" + }, + "producerAffiliation": { + "typeName": "producerAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "ProducerAffiliation1" + }, + "producerAbbreviation": { + "typeName": "producerAbbreviation", + "multiple": false, + "typeClass": "primitive", + "value": "ProducerAbbreviation1" + }, + "producerURL": { + "typeName": "producerURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://ProducerURL1.org" + }, + "producerLogoURL": { + "typeName": "producerLogoURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://ProducerLogoURL1.org" } - }, { - "producerName" : { - "typeName" : "producerName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastProducer2, FirstProducer2" - }, - "producerAffiliation" : { - "typeName" : "producerAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAffiliation2" - }, - "producerAbbreviation" : { - "typeName" : "producerAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ProducerAbbreviation2" - }, - "producerURL" : { - "typeName" : "producerURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerURL2.org" - }, - "producerLogoURL" : { - "typeName" : "producerLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://ProducerLogoURL2.org" + }, + { + "producerName": { + "typeName": "producerName", + "multiple": false, + "typeClass": "primitive", + "value": "LastProducer2, FirstProducer2" + }, + "producerAffiliation": { + "typeName": "producerAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "ProducerAffiliation2" + }, + "producerAbbreviation": { + "typeName": "producerAbbreviation", + "multiple": false, + "typeClass": "primitive", + "value": "ProducerAbbreviation2" + }, + "producerURL": { + "typeName": "producerURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://ProducerURL2.org" + }, + "producerLogoURL": { + "typeName": "producerLogoURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://ProducerLogoURL2.org" } } ] - }, { - "typeName" : "productionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1003-01-01" - }, { - "typeName" : "productionPlace", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "ProductionPlace" - ] - }, { - "typeName" : "contributor", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "contributorType" : { - "typeName" : "contributorType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Data Collector" - }, - "contributorName" : { - "typeName" : "contributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContributor1, FirstContributor1" + }, + { + "typeName": "productionDate", + "multiple": false, + "typeClass": "primitive", + "value": "1003-01-01" + }, + { + "typeName": "productionPlace", + "multiple": true, + "typeClass": "primitive", + "value": ["ProductionPlace"] + }, + { + "typeName": "contributor", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "contributorType": { + "typeName": "contributorType", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "Data Collector" + }, + "contributorName": { + "typeName": "contributorName", + "multiple": false, + "typeClass": "primitive", + "value": "LastContributor1, FirstContributor1" } - }, { - "contributorType" : { - "typeName" : "contributorType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Data Curator" - }, - "contributorName" : { - "typeName" : "contributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastContributor2, FirstContributor2" + }, + { + "contributorType": { + "typeName": "contributorType", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "Data Curator" + }, + "contributorName": { + "typeName": "contributorName", + "multiple": false, + "typeClass": "primitive", + "value": "LastContributor2, FirstContributor2" } } ] - }, { - "typeName" : "grantNumber", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "grantNumberAgency" : { - "typeName" : "grantNumberAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantAgency1" - }, - "grantNumberValue" : { - "typeName" : "grantNumberValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantNumber1" + }, + { + "typeName": "grantNumber", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "grantNumberAgency": { + "typeName": "grantNumberAgency", + "multiple": false, + "typeClass": "primitive", + "value": "GrantInformationGrantAgency1" + }, + "grantNumberValue": { + "typeName": "grantNumberValue", + "multiple": false, + "typeClass": "primitive", + "value": "GrantInformationGrantNumber1" } - }, { - "grantNumberAgency" : { - "typeName" : "grantNumberAgency", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantAgency2" - }, - "grantNumberValue" : { - "typeName" : "grantNumberValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GrantInformationGrantNumber2" + }, + { + "grantNumberAgency": { + "typeName": "grantNumberAgency", + "multiple": false, + "typeClass": "primitive", + "value": "GrantInformationGrantAgency2" + }, + "grantNumberValue": { + "typeName": "grantNumberValue", + "multiple": false, + "typeClass": "primitive", + "value": "GrantInformationGrantNumber2" } } ] - }, { - "typeName" : "distributor", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "distributorName" : { - "typeName" : "distributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDistributor1, FirstDistributor1" - }, - "distributorAffiliation" : { - "typeName" : "distributorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAffiliation1" - }, - "distributorAbbreviation" : { - "typeName" : "distributorAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAbbreviation1" - }, - "distributorURL" : { - "typeName" : "distributorURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorURL1.org" - }, - "distributorLogoURL" : { - "typeName" : "distributorLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorLogoURL1.org" + }, + { + "typeName": "distributor", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "distributorName": { + "typeName": "distributorName", + "multiple": false, + "typeClass": "primitive", + "value": "LastDistributor1, FirstDistributor1" + }, + "distributorAffiliation": { + "typeName": "distributorAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "DistributorAffiliation1" + }, + "distributorAbbreviation": { + "typeName": "distributorAbbreviation", + "multiple": false, + "typeClass": "primitive", + "value": "DistributorAbbreviation1" + }, + "distributorURL": { + "typeName": "distributorURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://DistributorURL1.org" + }, + "distributorLogoURL": { + "typeName": "distributorLogoURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://DistributorLogoURL1.org" } - }, { - "distributorName" : { - "typeName" : "distributorName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDistributor2, FirstDistributor2" - }, - "distributorAffiliation" : { - "typeName" : "distributorAffiliation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAffiliation2" - }, - "distributorAbbreviation" : { - "typeName" : "distributorAbbreviation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DistributorAbbreviation2" - }, - "distributorURL" : { - "typeName" : "distributorURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorURL2.org" - }, - "distributorLogoURL" : { - "typeName" : "distributorLogoURL", - "multiple" : false, - "typeClass" : "primitive", - "value" : "http://DistributorLogoURL2.org" + }, + { + "distributorName": { + "typeName": "distributorName", + "multiple": false, + "typeClass": "primitive", + "value": "LastDistributor2, FirstDistributor2" + }, + "distributorAffiliation": { + "typeName": "distributorAffiliation", + "multiple": false, + "typeClass": "primitive", + "value": "DistributorAffiliation2" + }, + "distributorAbbreviation": { + "typeName": "distributorAbbreviation", + "multiple": false, + "typeClass": "primitive", + "value": "DistributorAbbreviation2" + }, + "distributorURL": { + "typeName": "distributorURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://DistributorURL2.org" + }, + "distributorLogoURL": { + "typeName": "distributorLogoURL", + "multiple": false, + "typeClass": "primitive", + "value": "http://DistributorLogoURL2.org" } } ] - }, { - "typeName" : "distributionDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1004-01-01" - }, { - "typeName" : "depositor", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDepositor, FirstDepositor" - }, { - "typeName" : "dateOfDeposit", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1002-01-01" - }, { - "typeName" : "timePeriodCovered", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "timePeriodCoveredStart" : { - "typeName" : "timePeriodCoveredStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-01-01" - }, - "timePeriodCoveredEnd" : { - "typeName" : "timePeriodCoveredEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-01-02" + }, + { + "typeName": "distributionDate", + "multiple": false, + "typeClass": "primitive", + "value": "1004-01-01" + }, + { + "typeName": "depositor", + "multiple": false, + "typeClass": "primitive", + "value": "LastDepositor, FirstDepositor" + }, + { + "typeName": "dateOfDeposit", + "multiple": false, + "typeClass": "primitive", + "value": "1002-01-01" + }, + { + "typeName": "timePeriodCovered", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "timePeriodCoveredStart": { + "typeName": "timePeriodCoveredStart", + "multiple": false, + "typeClass": "primitive", + "value": "1005-01-01" + }, + "timePeriodCoveredEnd": { + "typeName": "timePeriodCoveredEnd", + "multiple": false, + "typeClass": "primitive", + "value": "1005-01-02" } - }, { - "timePeriodCoveredStart" : { - "typeName" : "timePeriodCoveredStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-02-01" - }, - "timePeriodCoveredEnd" : { - "typeName" : "timePeriodCoveredEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1005-02-02" + }, + { + "timePeriodCoveredStart": { + "typeName": "timePeriodCoveredStart", + "multiple": false, + "typeClass": "primitive", + "value": "1005-02-01" + }, + "timePeriodCoveredEnd": { + "typeName": "timePeriodCoveredEnd", + "multiple": false, + "typeClass": "primitive", + "value": "1005-02-02" } } ] - }, { - "typeName" : "dateOfCollection", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "dateOfCollectionStart" : { - "typeName" : "dateOfCollectionStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-01-01" - }, - "dateOfCollectionEnd" : { - "typeName" : "dateOfCollectionEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-01-01" + }, + { + "typeName": "dateOfCollection", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "dateOfCollectionStart": { + "typeName": "dateOfCollectionStart", + "multiple": false, + "typeClass": "primitive", + "value": "1006-01-01" + }, + "dateOfCollectionEnd": { + "typeName": "dateOfCollectionEnd", + "multiple": false, + "typeClass": "primitive", + "value": "1006-01-01" } - }, { - "dateOfCollectionStart" : { - "typeName" : "dateOfCollectionStart", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-02-01" - }, - "dateOfCollectionEnd" : { - "typeName" : "dateOfCollectionEnd", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1006-02-02" + }, + { + "dateOfCollectionStart": { + "typeName": "dateOfCollectionStart", + "multiple": false, + "typeClass": "primitive", + "value": "1006-02-01" + }, + "dateOfCollectionEnd": { + "typeName": "dateOfCollectionEnd", + "multiple": false, + "typeClass": "primitive", + "value": "1006-02-02" } } ] - }, { - "typeName" : "kindOfData", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "kindOfData", + "multiple": true, + "typeClass": "primitive", + "value": [ "KindOfData1", "KindOfData2" ] - }, { - "typeName" : "series", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "seriesName" : { - "typeName" : "seriesName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SeriesName" - }, - "seriesInformation" : { - "typeName" : "seriesInformation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SeriesInformation" - } + }, + { + "typeName": "series", + "multiple": true, + "typeClass": "compound", + "value": [{ + "seriesName": { + "typeName": "seriesName", + "multiple": false, + "typeClass": "primitive", + "value": "SeriesName" + }, + "seriesInformation": { + "typeName": "seriesInformation", + "multiple": false, + "typeClass": "primitive", + "value": "SeriesInformation" } - ] - }, { - "typeName" : "software", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "softwareName" : { - "typeName" : "softwareName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareName1" - }, - "softwareVersion" : { - "typeName" : "softwareVersion", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareVersion1" + }] + }, + { + "typeName": "software", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "softwareName": { + "typeName": "softwareName", + "multiple": false, + "typeClass": "primitive", + "value": "SoftwareName1" + }, + "softwareVersion": { + "typeName": "softwareVersion", + "multiple": false, + "typeClass": "primitive", + "value": "SoftwareVersion1" } - }, { - "softwareName" : { - "typeName" : "softwareName", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareName2" - }, - "softwareVersion" : { - "typeName" : "softwareVersion", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SoftwareVersion2" + }, + { + "softwareName": { + "typeName": "softwareName", + "multiple": false, + "typeClass": "primitive", + "value": "SoftwareName2" + }, + "softwareVersion": { + "typeName": "softwareVersion", + "multiple": false, + "typeClass": "primitive", + "value": "SoftwareVersion2" } } ] - }, { - "typeName" : "relatedMaterial", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "relatedMaterial", + "multiple": true, + "typeClass": "primitive", + "value": [ "RelatedMaterial1", "RelatedMaterial2" ] - }, { - "typeName" : "relatedDatasets", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "relatedDatasets", + "multiple": true, + "typeClass": "primitive", + "value": [ "RelatedDatasets1", "RelatedDatasets2" ] - }, { - "typeName" : "otherReferences", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "otherReferences", + "multiple": true, + "typeClass": "primitive", + "value": [ "OtherReferences1", "OtherReferences2" ] - }, { - "typeName" : "dataSources", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "dataSources", + "multiple": true, + "typeClass": "primitive", + "value": [ "DataSources1", "DataSources2" ] - }, { - "typeName" : "originOfSources", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OriginOfSources" - }, { - "typeName" : "characteristicOfSources", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CharacteristicOfSourcesNoted" - }, { - "typeName" : "accessToSources", - "multiple" : false, - "typeClass" : "primitive", - "value" : "DocumentationAndAccessToSources" + }, + { + "typeName": "originOfSources", + "multiple": false, + "typeClass": "primitive", + "value": "OriginOfSources" + }, + { + "typeName": "characteristicOfSources", + "multiple": false, + "typeClass": "primitive", + "value": "CharacteristicOfSourcesNoted" + }, + { + "typeName": "accessToSources", + "multiple": false, + "typeClass": "primitive", + "value": "DocumentationAndAccessToSources" } ] }, - "geospatial" : { - "displayName" : "Geospatial Metadata", - "fields" : [{ - "typeName" : "geographicCoverage", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "country" : { - "typeName" : "country", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Afghanistan" - }, - "state" : { - "typeName" : "state", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageStateProvince1" - }, - "city" : { - "typeName" : "city", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageCity1" - }, - "otherGeographicCoverage" : { - "typeName" : "otherGeographicCoverage", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageOther1" + "geospatial": { + "displayName": "Geospatial Metadata", + "fields": [ + { + "typeName": "geographicCoverage", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "country": { + "typeName": "country", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "Afghanistan" + }, + "state": { + "typeName": "state", + "multiple": false, + "typeClass": "primitive", + "value": "GeographicCoverageStateProvince1" + }, + "city": { + "typeName": "city", + "multiple": false, + "typeClass": "primitive", + "value": "GeographicCoverageCity1" + }, + "otherGeographicCoverage": { + "typeName": "otherGeographicCoverage", + "multiple": false, + "typeClass": "primitive", + "value": "GeographicCoverageOther1" } - }, { - "country" : { - "typeName" : "country", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "Albania" - }, - "state" : { - "typeName" : "state", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageStateProvince2" - }, - "city" : { - "typeName" : "city", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageCity2" - }, - "otherGeographicCoverage" : { - "typeName" : "otherGeographicCoverage", - "multiple" : false, - "typeClass" : "primitive", - "value" : "GeographicCoverageOther2" + }, + { + "country": { + "typeName": "country", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "Albania" + }, + "state": { + "typeName": "state", + "multiple": false, + "typeClass": "primitive", + "value": "GeographicCoverageStateProvince2" + }, + "city": { + "typeName": "city", + "multiple": false, + "typeClass": "primitive", + "value": "GeographicCoverageCity2" + }, + "otherGeographicCoverage": { + "typeName": "otherGeographicCoverage", + "multiple": false, + "typeClass": "primitive", + "value": "GeographicCoverageOther2" } } ] - }, { - "typeName" : "geographicUnit", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "geographicUnit", + "multiple": true, + "typeClass": "primitive", + "value": [ "GeographicUnit1", "GeographicUnit2" ] - }, { - "typeName" : "geographicBoundingBox", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "westLongitude" : { - "typeName" : "westLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-72" - }, - "eastLongitude" : { - "typeName" : "eastLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-70" - }, - "northLatitude" : { - "typeName" : "northLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "43" - }, - "southLatitude" : { - "typeName" : "southLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "42" + }, + { + "typeName": "geographicBoundingBox", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "westLongitude": { + "typeName": "westLongitude", + "multiple": false, + "typeClass": "primitive", + "value": "-72" + }, + "eastLongitude": { + "typeName": "eastLongitude", + "multiple": false, + "typeClass": "primitive", + "value": "-70" + }, + "northLatitude": { + "typeName": "northLatitude", + "multiple": false, + "typeClass": "primitive", + "value": "43" + }, + "southLatitude": { + "typeName": "southLatitude", + "multiple": false, + "typeClass": "primitive", + "value": "42" } - }, { - "westLongitude" : { - "typeName" : "westLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-18" - }, - "eastLongitude" : { - "typeName" : "eastLongitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "-13" - }, - "northLatitude" : { - "typeName" : "northLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "29" - }, - "southLatitude" : { - "typeName" : "southLatitude", - "multiple" : false, - "typeClass" : "primitive", - "value" : "28" + }, + { + "westLongitude": { + "typeName": "westLongitude", + "multiple": false, + "typeClass": "primitive", + "value": "-18" + }, + "eastLongitude": { + "typeName": "eastLongitude", + "multiple": false, + "typeClass": "primitive", + "value": "-13" + }, + "northLatitude": { + "typeName": "northLatitude", + "multiple": false, + "typeClass": "primitive", + "value": "29" + }, + "southLatitude": { + "typeName": "southLatitude", + "multiple": false, + "typeClass": "primitive", + "value": "28" } } ] } ] }, - "socialscience" : { - "displayName" : "Social Science and Humanities Metadata", - "fields" : [{ - "typeName" : "unitOfAnalysis", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + "socialscience": { + "displayName": "Social Science and Humanities Metadata", + "fields": [ + { + "typeName": "unitOfAnalysis", + "multiple": true, + "typeClass": "primitive", + "value": [ "UnitOfAnalysis1", "UnitOfAnalysis2" ] - }, { - "typeName" : "universe", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "universe", + "multiple": true, + "typeClass": "primitive", + "value": [ "Universe1", "Universe2" ] - }, { - "typeName" : "timeMethod", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TimeMethod" - }, { - "typeName" : "dataCollector", - "multiple" : false, - "typeClass" : "primitive", - "value" : "LastDataCollector1, FirstDataCollector1" - }, { - "typeName" : "collectorTraining", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CollectorTraining" - }, { - "typeName" : "frequencyOfDataCollection", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Frequency" - }, { - "typeName" : "samplingProcedure", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SamplingProcedure" - }, { - "typeName" : "targetSampleSize", - "multiple" : false, - "typeClass" : "compound", - "value" : { - "targetSampleActualSize" : { - "typeName" : "targetSampleActualSize", - "multiple" : false, - "typeClass" : "primitive", - "value" : "100" + }, + { + "typeName": "timeMethod", + "multiple": false, + "typeClass": "primitive", + "value": "TimeMethod" + }, + { + "typeName": "dataCollector", + "multiple": false, + "typeClass": "primitive", + "value": "LastDataCollector1, FirstDataCollector1" + }, + { + "typeName": "collectorTraining", + "multiple": false, + "typeClass": "primitive", + "value": "CollectorTraining" + }, + { + "typeName": "frequencyOfDataCollection", + "multiple": false, + "typeClass": "primitive", + "value": "Frequency" + }, + { + "typeName": "samplingProcedure", + "multiple": false, + "typeClass": "primitive", + "value": "SamplingProcedure" + }, + { + "typeName": "targetSampleSize", + "multiple": false, + "typeClass": "compound", + "value": { + "targetSampleActualSize": { + "typeName": "targetSampleActualSize", + "multiple": false, + "typeClass": "primitive", + "value": "100" }, - "targetSampleSizeFormula" : { - "typeName" : "targetSampleSizeFormula", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TargetSampleSizeFormula" + "targetSampleSizeFormula": { + "typeName": "targetSampleSizeFormula", + "multiple": false, + "typeClass": "primitive", + "value": "TargetSampleSizeFormula" } } - }, { - "typeName" : "deviationsFromSampleDesign", - "multiple" : false, - "typeClass" : "primitive", - "value" : "MajorDeviationsForSampleDesign" - }, { - "typeName" : "collectionMode", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ - "CollectionMode" - ] - }, { - "typeName" : "researchInstrument", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TypeOfResearchInstrument" - }, { - "typeName" : "dataCollectionSituation", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CharacteristicsOfDataCollectionSituation" - }, { - "typeName" : "actionsToMinimizeLoss", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ActionsToMinimizeLosses" - }, { - "typeName" : "controlOperations", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ControlOperations" - }, { - "typeName" : "weighting", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Weighting" - }, { - "typeName" : "cleaningOperations", - "multiple" : false, - "typeClass" : "primitive", - "value" : "CleaningOperations" - }, { - "typeName" : "datasetLevelErrorNotes", - "multiple" : false, - "typeClass" : "primitive", - "value" : "StudyLevelErrorNotes" - }, { - "typeName" : "responseRate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "ResponseRate" - }, { - "typeName" : "samplingErrorEstimates", - "multiple" : false, - "typeClass" : "primitive", - "value" : "EstimatesOfSamplingError" - }, { - "typeName" : "otherDataAppraisal", - "multiple" : false, - "typeClass" : "primitive", - "value" : "OtherFormsOfDataAppraisal" - }, { - "typeName" : "socialScienceNotes", - "multiple" : false, - "typeClass" : "compound", - "value" : { - "socialScienceNotesType" : { - "typeName" : "socialScienceNotesType", - "multiple" : false, - "typeClass" : "primitive", - "value" : "NotesType" + }, + { + "typeName": "deviationsFromSampleDesign", + "multiple": false, + "typeClass": "primitive", + "value": "MajorDeviationsForSampleDesign" + }, + { + "typeName": "collectionMode", + "multiple": true, + "typeClass": "primitive", + "value": ["CollectionMode"] + }, + { + "typeName": "researchInstrument", + "multiple": false, + "typeClass": "primitive", + "value": "TypeOfResearchInstrument" + }, + { + "typeName": "dataCollectionSituation", + "multiple": false, + "typeClass": "primitive", + "value": "CharacteristicsOfDataCollectionSituation" + }, + { + "typeName": "actionsToMinimizeLoss", + "multiple": false, + "typeClass": "primitive", + "value": "ActionsToMinimizeLosses" + }, + { + "typeName": "controlOperations", + "multiple": false, + "typeClass": "primitive", + "value": "ControlOperations" + }, + { + "typeName": "weighting", + "multiple": false, + "typeClass": "primitive", + "value": "Weighting" + }, + { + "typeName": "cleaningOperations", + "multiple": false, + "typeClass": "primitive", + "value": "CleaningOperations" + }, + { + "typeName": "datasetLevelErrorNotes", + "multiple": false, + "typeClass": "primitive", + "value": "StudyLevelErrorNotes" + }, + { + "typeName": "responseRate", + "multiple": false, + "typeClass": "primitive", + "value": "ResponseRate" + }, + { + "typeName": "samplingErrorEstimates", + "multiple": false, + "typeClass": "primitive", + "value": "EstimatesOfSamplingError" + }, + { + "typeName": "otherDataAppraisal", + "multiple": false, + "typeClass": "primitive", + "value": "OtherFormsOfDataAppraisal" + }, + { + "typeName": "socialScienceNotes", + "multiple": false, + "typeClass": "compound", + "value": { + "socialScienceNotesType": { + "typeName": "socialScienceNotesType", + "multiple": false, + "typeClass": "primitive", + "value": "NotesType" }, - "socialScienceNotesSubject" : { - "typeName" : "socialScienceNotesSubject", - "multiple" : false, - "typeClass" : "primitive", - "value" : "NotesSubject" + "socialScienceNotesSubject": { + "typeName": "socialScienceNotesSubject", + "multiple": false, + "typeClass": "primitive", + "value": "NotesSubject" }, - "socialScienceNotesText" : { - "typeName" : "socialScienceNotesText", - "multiple" : false, - "typeClass" : "primitive", - "value" : "NotesText" + "socialScienceNotesText": { + "typeName": "socialScienceNotesText", + "multiple": false, + "typeClass": "primitive", + "value": "NotesText" } } } ] }, - "astrophysics" : { - "displayName" : "Astronomy and Astrophysics Metadata", - "fields" : [{ - "typeName" : "astroType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + "astrophysics": { + "displayName": "Astronomy and Astrophysics Metadata", + "fields": [ + { + "typeName": "astroType", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "Image", "Mosaic", "EventList", "Cube" ] - }, { - "typeName" : "astroFacility", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "astroFacility", + "multiple": true, + "typeClass": "primitive", + "value": [ "Facility1", "Facility2" ] - }, { - "typeName" : "astroInstrument", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "astroInstrument", + "multiple": true, + "typeClass": "primitive", + "value": [ "Instrument1", "Instrument2" ] - }, { - "typeName" : "astroObject", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "astroObject", + "multiple": true, + "typeClass": "primitive", + "value": [ "Object1", "Object2" ] - }, { - "typeName" : "resolution.Spatial", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SpatialResolution" - }, { - "typeName" : "resolution.Spectral", - "multiple" : false, - "typeClass" : "primitive", - "value" : "SpectralResolution" - }, { - "typeName" : "resolution.Temporal", - "multiple" : false, - "typeClass" : "primitive", - "value" : "TimeResolution" - }, { - "typeName" : "coverage.Spectral.Bandpass", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "resolution.Spatial", + "multiple": false, + "typeClass": "primitive", + "value": "SpatialResolution" + }, + { + "typeName": "resolution.Spectral", + "multiple": false, + "typeClass": "primitive", + "value": "SpectralResolution" + }, + { + "typeName": "resolution.Temporal", + "multiple": false, + "typeClass": "primitive", + "value": "TimeResolution" + }, + { + "typeName": "coverage.Spectral.Bandpass", + "multiple": true, + "typeClass": "primitive", + "value": [ "Bandpass1", "Bandpass2" ] - }, { - "typeName" : "coverage.Spectral.CentralWavelength", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "coverage.Spectral.CentralWavelength", + "multiple": true, + "typeClass": "primitive", + "value": [ "3001", "3002" ] - }, { - "typeName" : "coverage.Spectral.Wavelength", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "coverage.Spectral.MinimumWavelength" : { - "typeName" : "coverage.Spectral.MinimumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4001" - }, - "coverage.Spectral.MaximumWavelength" : { - "typeName" : "coverage.Spectral.MaximumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4002" + }, + { + "typeName": "coverage.Spectral.Wavelength", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "coverage.Spectral.MinimumWavelength": { + "typeName": "coverage.Spectral.MinimumWavelength", + "multiple": false, + "typeClass": "primitive", + "value": "4001" + }, + "coverage.Spectral.MaximumWavelength": { + "typeName": "coverage.Spectral.MaximumWavelength", + "multiple": false, + "typeClass": "primitive", + "value": "4002" } - }, { - "coverage.Spectral.MinimumWavelength" : { - "typeName" : "coverage.Spectral.MinimumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4003" - }, - "coverage.Spectral.MaximumWavelength" : { - "typeName" : "coverage.Spectral.MaximumWavelength", - "multiple" : false, - "typeClass" : "primitive", - "value" : "4004" + }, + { + "coverage.Spectral.MinimumWavelength": { + "typeName": "coverage.Spectral.MinimumWavelength", + "multiple": false, + "typeClass": "primitive", + "value": "4003" + }, + "coverage.Spectral.MaximumWavelength": { + "typeName": "coverage.Spectral.MaximumWavelength", + "multiple": false, + "typeClass": "primitive", + "value": "4004" } } ] - }, { - "typeName" : "coverage.Temporal", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "coverage.Temporal.StartTime" : { - "typeName" : "coverage.Temporal.StartTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-01-01" - }, - "coverage.Temporal.StopTime" : { - "typeName" : "coverage.Temporal.StopTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-01-02" + }, + { + "typeName": "coverage.Temporal", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "coverage.Temporal.StartTime": { + "typeName": "coverage.Temporal.StartTime", + "multiple": false, + "typeClass": "primitive", + "value": "1007-01-01" + }, + "coverage.Temporal.StopTime": { + "typeName": "coverage.Temporal.StopTime", + "multiple": false, + "typeClass": "primitive", + "value": "1007-01-02" } - }, { - "coverage.Temporal.StartTime" : { - "typeName" : "coverage.Temporal.StartTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-02-01" - }, - "coverage.Temporal.StopTime" : { - "typeName" : "coverage.Temporal.StopTime", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1007-02-02" + }, + { + "coverage.Temporal.StartTime": { + "typeName": "coverage.Temporal.StartTime", + "multiple": false, + "typeClass": "primitive", + "value": "1007-02-01" + }, + "coverage.Temporal.StopTime": { + "typeName": "coverage.Temporal.StopTime", + "multiple": false, + "typeClass": "primitive", + "value": "1007-02-02" } } ] - }, { - "typeName" : "coverage.Spatial", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "coverage.Spatial", + "multiple": true, + "typeClass": "primitive", + "value": [ "SkyCoverage1", "SkyCoverage2" ] - }, { - "typeName" : "coverage.Depth", - "multiple" : false, - "typeClass" : "primitive", - "value" : "200" - }, { - "typeName" : "coverage.ObjectDensity", - "multiple" : false, - "typeClass" : "primitive", - "value" : "300" - }, { - "typeName" : "coverage.ObjectCount", - "multiple" : false, - "typeClass" : "primitive", - "value" : "400" - }, { - "typeName" : "coverage.SkyFraction", - "multiple" : false, - "typeClass" : "primitive", - "value" : "500" - }, { - "typeName" : "coverage.Polarization", - "multiple" : false, - "typeClass" : "primitive", - "value" : "Polarization" - }, { - "typeName" : "redshiftType", - "multiple" : false, - "typeClass" : "primitive", - "value" : "RedshiftType" - }, { - "typeName" : "resolution.Redshift", - "multiple" : false, - "typeClass" : "primitive", - "value" : "600" - }, { - "typeName" : "coverage.RedshiftValue", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "coverage.Redshift.MinimumValue" : { - "typeName" : "coverage.Redshift.MinimumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "701" - }, - "coverage.Redshift.MaximumValue" : { - "typeName" : "coverage.Redshift.MaximumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "702" + }, + { + "typeName": "coverage.Depth", + "multiple": false, + "typeClass": "primitive", + "value": "200" + }, + { + "typeName": "coverage.ObjectDensity", + "multiple": false, + "typeClass": "primitive", + "value": "300" + }, + { + "typeName": "coverage.ObjectCount", + "multiple": false, + "typeClass": "primitive", + "value": "400" + }, + { + "typeName": "coverage.SkyFraction", + "multiple": false, + "typeClass": "primitive", + "value": "500" + }, + { + "typeName": "coverage.Polarization", + "multiple": false, + "typeClass": "primitive", + "value": "Polarization" + }, + { + "typeName": "redshiftType", + "multiple": false, + "typeClass": "primitive", + "value": "RedshiftType" + }, + { + "typeName": "resolution.Redshift", + "multiple": false, + "typeClass": "primitive", + "value": "600" + }, + { + "typeName": "coverage.RedshiftValue", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "coverage.Redshift.MinimumValue": { + "typeName": "coverage.Redshift.MinimumValue", + "multiple": false, + "typeClass": "primitive", + "value": "701" + }, + "coverage.Redshift.MaximumValue": { + "typeName": "coverage.Redshift.MaximumValue", + "multiple": false, + "typeClass": "primitive", + "value": "702" } - }, { - "coverage.Redshift.MinimumValue" : { - "typeName" : "coverage.Redshift.MinimumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "703" - }, - "coverage.Redshift.MaximumValue" : { - "typeName" : "coverage.Redshift.MaximumValue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "704" + }, + { + "coverage.Redshift.MinimumValue": { + "typeName": "coverage.Redshift.MinimumValue", + "multiple": false, + "typeClass": "primitive", + "value": "703" + }, + "coverage.Redshift.MaximumValue": { + "typeName": "coverage.Redshift.MaximumValue", + "multiple": false, + "typeClass": "primitive", + "value": "704" } } ] } ] }, - "biomedical" : { - "displayName" : "Life Sciences Metadata", - "fields" : [{ - "typeName" : "studyDesignType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + "biomedical": { + "displayName": "Life Sciences Metadata", + "fields": [ + { + "typeName": "studyDesignType", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "Case Control", "Cross Sectional", "Cohort Study", "Not Specified" ] - }, { - "typeName" : "studyFactorType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + }, + { + "typeName": "studyFactorType", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "Age", "Biomarkers", "Cell Surface Markers", "Developmental Stage" ] - }, { - "typeName" : "studyAssayOrganism", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + }, + { + "typeName": "studyAssayOrganism", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "Arabidopsis thaliana", "Bos taurus", "Caenorhabditis elegans", "Danio rerio (zebrafish)" ] - }, { - "typeName" : "studyAssayOtherOrganism", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "studyAssayOtherOrganism", + "multiple": true, + "typeClass": "primitive", + "value": [ "OtherOrganism1", "OtherOrganism2" ] - }, { - "typeName" : "studyAssayMeasurementType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + }, + { + "typeName": "studyAssayMeasurementType", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "genome sequencing", "cell sorting", "clinical chemistry analysis", "DNA methylation profiling" ] - }, { - "typeName" : "studyAssayOtherMeasurmentType", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "studyAssayOtherMeasurmentType", + "multiple": true, + "typeClass": "primitive", + "value": [ "OtherMeasurementType1", "OtherMeasurementType2" ] - }, { - "typeName" : "studyAssayTechnologyType", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + }, + { + "typeName": "studyAssayTechnologyType", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "culture based drug susceptibility testing, single concentration", "culture based drug susceptibility testing, two concentrations", "culture based drug susceptibility testing, three or more concentrations (minimium inhibitory concentration measurement)", "flow cytometry" ] - }, { - "typeName" : "studyAssayPlatform", - "multiple" : true, - "typeClass" : "controlledVocabulary", - "value" : [ + }, + { + "typeName": "studyAssayPlatform", + "multiple": true, + "typeClass": "controlledVocabulary", + "value": [ "210-MS GC Ion Trap (Varian)", "220-MS GC Ion Trap (Varian)", "225-MS GC Ion Trap (Varian)", "300-MS quadrupole GC/MS (Varian)" ] - }, { - "typeName" : "studyAssayCellType", - "multiple" : true, - "typeClass" : "primitive", - "value" : [ + }, + { + "typeName": "studyAssayCellType", + "multiple": true, + "typeClass": "primitive", + "value": [ "CellType1", "CellType2" ] } ] }, - "journal" : { - "displayName" : "Journal Metadata", - "fields" : [{ - "typeName" : "journalVolumeIssue", - "multiple" : true, - "typeClass" : "compound", - "value" : [{ - "journalVolume" : { - "typeName" : "journalVolume", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalVolume1" - }, - "journalIssue" : { - "typeName" : "journalIssue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalIssue1" - }, - "journalPubDate" : { - "typeName" : "journalPubDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1008-01-01" + "journal": { + "displayName": "Journal Metadata", + "fields": [ + { + "typeName": "journalVolumeIssue", + "multiple": true, + "typeClass": "compound", + "value": [ + { + "journalVolume": { + "typeName": "journalVolume", + "multiple": false, + "typeClass": "primitive", + "value": "JournalVolume1" + }, + "journalIssue": { + "typeName": "journalIssue", + "multiple": false, + "typeClass": "primitive", + "value": "JournalIssue1" + }, + "journalPubDate": { + "typeName": "journalPubDate", + "multiple": false, + "typeClass": "primitive", + "value": "1008-01-01" } - }, { - "journalVolume" : { - "typeName" : "journalVolume", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalVolume2" - }, - "journalIssue" : { - "typeName" : "journalIssue", - "multiple" : false, - "typeClass" : "primitive", - "value" : "JournalIssue2" - }, - "journalPubDate" : { - "typeName" : "journalPubDate", - "multiple" : false, - "typeClass" : "primitive", - "value" : "1008-02-01" + }, + { + "journalVolume": { + "typeName": "journalVolume", + "multiple": false, + "typeClass": "primitive", + "value": "JournalVolume2" + }, + "journalIssue": { + "typeName": "journalIssue", + "multiple": false, + "typeClass": "primitive", + "value": "JournalIssue2" + }, + "journalPubDate": { + "typeName": "journalPubDate", + "multiple": false, + "typeClass": "primitive", + "value": "1008-02-01" } } ] - }, { - "typeName" : "journalArticleType", - "multiple" : false, - "typeClass" : "controlledVocabulary", - "value" : "abstract" + }, + { + "typeName": "journalArticleType", + "multiple": false, + "typeClass": "controlledVocabulary", + "value": "abstract" } ] } } } -} \ No newline at end of file +} From 8141a78c4c446bd0a738ef4616b27f1184959db4 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Tue, 17 Sep 2024 14:36:59 -0400 Subject: [PATCH 327/366] minor doc tweak #10632 --- doc/sphinx-guides/source/installation/config.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 7e42c79fa6c..cd56a41c56d 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -232,8 +232,8 @@ Dataverse can be configured with one or more PID providers, each of which can mi to manage an authority/shoulder combination, aka a "prefix" (PermaLinks also support custom separator characters as part of the prefix), along with an optional list of individual PIDs (with different authority/shoulders) than can be managed with that account. -Dataverse automatically manages assigning PIDs and making them findable when datasets are published. There are also :ref:`API calls that -allow updating the PID target URLs and metadata of already-published datasets manually if needed ` , e.g. if a Dataverse instance is +Dataverse automatically manages assigning PIDs and making them findable when datasets are published. There are also :ref:`API calls that +allow updating the PID target URLs and metadata of already-published datasets manually if needed `, e.g. if a Dataverse instance is moved to a new URL or when the software is updated to generate additional metadata or address schema changes at the PID service. Testing PID Providers @@ -250,11 +250,11 @@ configure the credentials as described below. Alternately, you may wish to configure other providers for testing: - - EZID is available to University of California scholars and researchers. Testing can be done using the authority 10.5072 and shoulder FK2 with the "apitest" account (contact EZID for credentials) or an institutional account. Configuration in Dataverse is then analogous to using DataCite. +- EZID is available to University of California scholars and researchers. Testing can be done using the authority 10.5072 and shoulder FK2 with the "apitest" account (contact EZID for credentials) or an institutional account. Configuration in Dataverse is then analogous to using DataCite. - - The PermaLink provider, like the FAKE DOI provider, does not involve an external account. - Unlike the Fake DOI provider, the PermaLink provider creates PIDs that begin with "perma:", making it clearer that they are not DOIs, - and that do resolve to the local dataset/file page in Dataverse, making them useful for some production use cases. See :ref:`permalinks` and (for the FAKE DOI provider) the :doc:`/developers/dev-environment` section of the Developer Guide. +- The PermaLink provider, like the FAKE DOI provider, does not involve an external account. + Unlike the Fake DOI provider, the PermaLink provider creates PIDs that begin with "perma:", making it clearer that they are not DOIs, + and that do resolve to the local dataset/file page in Dataverse, making them useful for some production use cases. See :ref:`permalinks` and (for the FAKE DOI provider) the :doc:`/developers/dev-environment` section of the Developer Guide. Provider-specific configuration is described below. From 695709c200c3fa01f5c291486f8d8ad296ca52b0 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Tue, 17 Sep 2024 15:51:52 -0400 Subject: [PATCH 328/366] standardize image url --- .../iq/dataverse/DataverseServiceBean.java | 10 ++++- .../iq/dataverse/ThumbnailServiceWrapper.java | 20 ++++++++- .../dataverse/search/SearchServiceBean.java | 4 +- .../harvard/iq/dataverse/api/SearchIT.java | 43 +++++++++++++++++++ 4 files changed, 73 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java index 31fd775ffdf..65082011eba 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java @@ -361,7 +361,15 @@ public String getDataverseLogoThumbnailAsBase64ById(Long dvId) { } return null; } - + + public String getDataverseLogoThumbnailAsUrl(Long dvId) { + File dataverseLogoFile = getLogoById(dvId); + if (dataverseLogoFile != null) { + return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/dvCardImage/" + dvId; + } + return null; + } + private File getLogo(Dataverse dataverse) { if (dataverse.getId() == null) { return null; diff --git a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java index c1127079da4..91d25ba2d38 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java +++ b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java @@ -48,6 +48,18 @@ public class ThumbnailServiceWrapper implements java.io.Serializable { private Map dvobjectViewMap = new HashMap<>(); private Map hasThumbMap = new HashMap<>(); + public String getFileCardImageAsUrl(SolrSearchResult result) { + if (result.isHarvested()) { + return null; + } + + if (result.getEntity() == null) { + return null; + } + + return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + result.getEntity().getId() + "?imageThumb=true"; + } + // it's the responsibility of the user - to make sure the search result // passed to this method is of the Datafile type! public String getFileCardImageAsBase64Url(SolrSearchResult result) { @@ -208,7 +220,13 @@ public String getDatasetCardImageAsUrl(Dataset dataset, Long versionId, boolean public String getDataverseCardImageAsBase64Url(SolrSearchResult result) { return dataverseService.getDataverseLogoThumbnailAsBase64ById(result.getEntityId()); } - + + // it's the responsibility of the user - to make sure the search result + // passed to this method is of the Dataverse type! + public String getDataverseCardImageAsUrl(SolrSearchResult result) { + return dataverseService.getDataverseLogoThumbnailAsUrl(result.getEntityId()); + } + public void resetObjectMaps() { dvobjectThumbnailsMap = new HashMap<>(); dvobjectViewMap = new HashMap<>(); diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java index 28676caeac5..ee93c49ad34 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java @@ -593,7 +593,7 @@ public SolrQueryResponse search( solrSearchResult.setDataverseAffiliation(dataverseAffiliation); solrSearchResult.setDataverseParentAlias(dataverseParentAlias); solrSearchResult.setDataverseParentName(dataverseParentName); - solrSearchResult.setImageUrl(thumbnailServiceWrapper.getDataverseCardImageAsBase64Url(solrSearchResult)); + solrSearchResult.setImageUrl(thumbnailServiceWrapper.getDataverseCardImageAsUrl(solrSearchResult)); /** * @todo Expose this API URL after "dvs" is changed to * "dataverses". Also, is an API token required for published @@ -652,7 +652,7 @@ public SolrQueryResponse search( } solrSearchResult.setHtmlUrl(baseUrl + "/dataset.xhtml?persistentId=" + parentGlobalId); solrSearchResult.setDownloadUrl(baseUrl + "/api/access/datafile/" + entityid); - solrSearchResult.setImageUrl(thumbnailServiceWrapper.getFileCardImageAsBase64Url(solrSearchResult)); + solrSearchResult.setImageUrl(thumbnailServiceWrapper.getFileCardImageAsUrl(solrSearchResult)); /** * @todo We are not yet setting the API URL for files because * not all files have metadata. Only subsettable files (those diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java index c743c12c7de..4b422002cf2 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java @@ -1283,4 +1283,47 @@ public void tearDownDataverse() { public static void cleanup() { } + @Test + public void testSearchFiles() { + Response createUser = UtilIT.createRandomUser(); + createUser.prettyPrint(); + String username = UtilIT.getUsernameFromResponse(createUser); + String apiToken = UtilIT.getApiTokenFromResponse(createUser); + + Response createDataverseResponse = UtilIT.createRandomDataverse(apiToken); + createDataverseResponse.prettyPrint(); + String dataverseAlias = UtilIT.getAliasFromResponse(createDataverseResponse); + + Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken); + createDatasetResponse.prettyPrint(); + Integer datasetId = UtilIT.getDatasetIdFromResponse(createDatasetResponse); + System.out.println("id: " + datasetId); + String datasetPid = JsonPath.from(createDatasetResponse.getBody().asString()).getString("data.persistentId"); + System.out.println("datasetPid: " + datasetPid); + + String pathToFile = "src/main/webapp/resources/images/dataverseproject.png"; + Response uploadImage = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken); + uploadImage.prettyPrint(); + uploadImage.then().assertThat() + .statusCode(200); + + Response publishDataverse = UtilIT.publishDataverseViaSword(dataverseAlias, apiToken); + publishDataverse.prettyPrint(); + publishDataverse.then().assertThat() + .statusCode(OK.getStatusCode()); + Response publishDataset = UtilIT.publishDatasetViaNativeApi(datasetId, "major", apiToken); + publishDataset.prettyPrint(); + publishDataset.then().assertThat() + .statusCode(OK.getStatusCode()); + + Response searchResp = UtilIT.search("dataverseproject", apiToken); + searchResp.prettyPrint(); + searchResp.then().assertThat() + .statusCode(OK.getStatusCode()) + .body("data.items[0].type", CoreMatchers.is("file")) + .body("data.items[0].file_content_type", CoreMatchers.is("image/png")) + .body("data.items[0].url", CoreMatchers.containsString("/api/access/datafile/")) + .body("data.items[0].image_url", CoreMatchers.containsString("/api/access/datafile/")) + .body("data.items[0].image_url", CoreMatchers.containsString("imageThumb=true")); + } } From c6dd220a8fbcc450ae8cbe9fda84e5e203f7154d Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 17 Sep 2024 16:59:59 -0400 Subject: [PATCH 329/366] No longer needed with use of CDI.current() in XMLMetadataTemplate --- .../iq/dataverse/pidproviders/PidProviderFactoryBean.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java index d7a19355a78..b01fb5e7eba 100644 --- a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidProviderFactoryBean.java @@ -60,9 +60,6 @@ public class PidProviderFactoryBean { protected DvObjectServiceBean dvObjectService; @Inject SystemConfig systemConfig; - //QDR - adding to support use of ExternalVocabularyValues in DataCite provider/ DataCite XML generation - @EJB - DatasetFieldServiceBean datasetFieldServiceBean; private ServiceLoader loader; private Map pidProviderFactoryMap = new HashMap<>(); From b1e5020d5c44a2c1dd3c8f581482f4db17e1dcd1 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 17 Sep 2024 17:03:43 -0400 Subject: [PATCH 330/366] no longer used and CrossRef ended up using it's own. --- .../doi/datacite_metadata_template.xml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml diff --git a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml b/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml deleted file mode 100644 index 9c311808c87..00000000000 --- a/src/main/resources/edu/harvard/iq/dataverse/pidproviders/doi/datacite_metadata_template.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - ${identifier} - ${creators} - - ${title} - - ${publisher} - ${publisherYear} - - ${relatedIdentifiers} - - ${description} - - {$contributors} - From 87bd3087aa16f77c5ea0f9c73db48d72d9b5e30b Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Tue, 17 Sep 2024 17:21:54 -0400 Subject: [PATCH 331/366] add more info about the scope of changes. --- doc/release-notes/10632-DataCiteXMLandRelationType.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/release-notes/10632-DataCiteXMLandRelationType.md b/doc/release-notes/10632-DataCiteXMLandRelationType.md index a3699646314..42c1cfb6eda 100644 --- a/doc/release-notes/10632-DataCiteXMLandRelationType.md +++ b/doc/release-notes/10632-DataCiteXMLandRelationType.md @@ -1,10 +1,10 @@ ### Enhanced DataCite Metadata, Relation Type -A new field has been added to the citation metadatablock to allow entry of the "Relation Type" between a "Related Publication" and a dataset. The Relation Type is currently limited to the most common 6 values recommended by DataCite: isCitedBy, Cites, IsSupplementTo, IsSupplementedBy, IsReferencedBy, and References. +A new field has been added to the citation metadatablock to allow entry of the "Relation Type" between a "Related Publication" and a dataset. The Relation Type is currently limited to the most common 6 values recommended by DataCite: isCitedBy, Cites, IsSupplementTo, IsSupplementedBy, IsReferencedBy, and References. For existing datasets where no "Relation Type" has been specified, "IsSupplementTo" is assumed. -Additional metadata, including metadata about Related Publications is now being sent to DataCite when DOIs are registered and published and is available in the DataCite XML export. For existing datasets where no "Relation Type" has been specified, "IsSupplementTo" is assumed. The additions are in rough alignment with the OpenAIRE XML export, but there are some minor differences in addition to the Relation Type addition, including an update to the DataCite 4.5 schema. +Dataverse now supports the DataCite v4.5 schema. Additional metadata, including metadata about Related Publications, and files in the dataset are now being sent to DataCite and improvements to how PIDs (ORCID, ROR, DOIs, etc.), license/terms, geospatial, and other metadata is represented have been made. The enhanced metadata will automatically be sent when datasets are created and published and is available in the DataCite XML export after publication. -For details see https://github.com/IQSS/dataverse/pull/10632 and https://github.com/IQSS/dataverse/pull/10615 and the [design document](https://docs.google.com/document/d/1JzDo9UOIy9dVvaHvtIbOI8tFU6bWdfDfuQvWWpC0tkA/edit?usp=sharing) referenced there. +The additions are in rough alignment with the OpenAIRE XML export, but there are some minor differences in addition to the Relation Type addition, including an update to the DataCite 4.5 schema. For details see https://github.com/IQSS/dataverse/pull/10632 and https://github.com/IQSS/dataverse/pull/10615 and the [design document](https://docs.google.com/document/d/1JzDo9UOIy9dVvaHvtIbOI8tFU6bWdfDfuQvWWpC0tkA/edit?usp=sharing) referenced there. Multiple backward incompatible changes and bug fixes have been made to API calls (3 of the four of which were not documented) related to updating PID target urls and metadata at the provider service: - [Update Target URL for a Published Dataset at the PID provider](https://guides.dataverse.org/en/latest/admin/dataverses-datasets.html#update-target-url-for-a-published-dataset-at-the-pid-provider) From c80a3dffad78474a19972e5cab8e81d13e78a454 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:47:41 -0400 Subject: [PATCH 332/366] doc changes --- ...831-standardize-image-url-of-search-api.md | 28 +++++++++++++++++++ doc/sphinx-guides/source/api/changelog.rst | 5 ++++ 2 files changed, 33 insertions(+) create mode 100644 doc/release-notes/10831-standardize-image-url-of-search-api.md diff --git a/doc/release-notes/10831-standardize-image-url-of-search-api.md b/doc/release-notes/10831-standardize-image-url-of-search-api.md new file mode 100644 index 00000000000..3d9216a7c09 --- /dev/null +++ b/doc/release-notes/10831-standardize-image-url-of-search-api.md @@ -0,0 +1,28 @@ +Search API (/api/search) response will now include new image_url format for the Datafile and Dataverse logo. +Note to release not writer: this supersedes the release note 10810-search-api-payload-extensions.md + +For Dataverse: + +- "image_url" (optional) + +```javascript +"items": [ + { + "name": "Darwin's Finches", + ... + "image_url":"/api/access/dvCardImage/{identifier}" +(etc, etc) +``` + +For DataFile: + +- "image_url" (optional) + +```javascript +"items": [ + { + "name": "test.txt", + ... + "image_url":"/api/access/datafile/{identifier}?imageThumb=true" +(etc, etc) +``` diff --git a/doc/sphinx-guides/source/api/changelog.rst b/doc/sphinx-guides/source/api/changelog.rst index a7af3e84b28..8d11ac0c123 100644 --- a/doc/sphinx-guides/source/api/changelog.rst +++ b/doc/sphinx-guides/source/api/changelog.rst @@ -7,6 +7,11 @@ This API changelog is experimental and we would love feedback on its usefulness. :local: :depth: 1 +v6.4 +---- + +- ** /api/search?q=**: Json values for image_url in DataFiles and Collections have changed from Base64URL ("data:image/png;base64,...) to "/api/access/datafile/{identifier}?imageThumb=true" and "/api/access/dvCardImage/{identifier}" respectively. This was done to match the image_url of Dataset. + v6.3 ---- From b923814e5d1458824a357f6d0984fcbda29cef68 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 18 Sep 2024 09:48:27 -0400 Subject: [PATCH 333/366] doc changes --- doc/release-notes/10831-standardize-image-url-of-search-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/10831-standardize-image-url-of-search-api.md b/doc/release-notes/10831-standardize-image-url-of-search-api.md index 3d9216a7c09..1910091455c 100644 --- a/doc/release-notes/10831-standardize-image-url-of-search-api.md +++ b/doc/release-notes/10831-standardize-image-url-of-search-api.md @@ -1,5 +1,5 @@ Search API (/api/search) response will now include new image_url format for the Datafile and Dataverse logo. -Note to release not writer: this supersedes the release note 10810-search-api-payload-extensions.md +Note to release note writer: this supersedes the release note 10810-search-api-payload-extensions.md For Dataverse: From 26be5c1813f7d9aae501c6872b1eb8b950abe447 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 18 Sep 2024 17:04:47 +0200 Subject: [PATCH 334/366] ci(ct): reshape maintenance workflow into external matrix script Unfortunately, matrix jobs logs and outputs cannot be aggregated in Github Actions. The only way to work around the limitations of GHA is by using a custom build script that create a similar matrix like experience. This commit introduces these scripts, probably also making some custom actions we added obsolete. --- .github/workflows/container_maintenance.yml | 125 ++-------------- .github/workflows/scripts/maintenance-job.sh | 141 +++++++++++++++++++ .github/workflows/scripts/utils.sh | 107 ++++++++++++++ 3 files changed, 260 insertions(+), 113 deletions(-) create mode 100755 .github/workflows/scripts/maintenance-job.sh create mode 100644 .github/workflows/scripts/utils.sh diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 3a28f355e94..65cbcc81d48 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -18,42 +18,14 @@ on: env: PLATFORMS: linux/amd64,linux/arm64 NUM_PAST_RELEASES: 3 - # TODO: change to "develop" in final PR - DEVELOP_BRANCH: 10478-version-base-img jobs: - discover: - name: Discover Release Matrix - runs-on: ubuntu-latest - permissions: - contents: read - packages: read - # TODO: re-enable for final PR - # Only run in upstream repo - avoid unnecessary runs in forks and only for scheduled - #if: ${{ github.repository_owner == 'IQSS' }} - outputs: - branches: ${{ steps.matrix.outputs.branches }} - current_release: ${{ steps.matrix.outputs.current_release }} - steps: - - name: Build branch matrix options - id: matrix - run: | - echo "branches=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | \ - jq '[ .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, "${{ env.DEVELOP_BRANCH }}" ]')" | tr -d "\n" | tr -s " " | \ - tee -a "$GITHUB_OUTPUT" - echo "current_release=$(curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq '.[0].tag_name' )" | tee -a "$GITHUB_OUTPUT" - build: name: Build image runs-on: ubuntu-latest permissions: contents: read packages: read - needs: discover - strategy: - fail-fast: false - matrix: - branch: ${{ fromJson(needs.discover.outputs.branches) }} # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks #if: ${{ github.repository_owner == 'IQSS' }} @@ -64,7 +36,6 @@ jobs: # Necessary as the checked out release branch might not contain the action as files uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img with: - git-reference: ${{ matrix.branch }} pom-paths: modules/container-base/pom.xml # Note: Accessing, pushing tags etc. to DockerHub will only succeed in upstream and @@ -79,93 +50,21 @@ jobs: with: platforms: ${{ env.PLATFORMS }} - # Try to retrieve backport patches for this git ref (but don't fail if there aren't any) - # and try to apply them if present - - name: Get and apply backported patches - # There might be no patches - ignore errors - continue-on-error: true - run: | - mkdir -p "${GITHUB_WORKSPACE}/patches" - curl -sSL "https://github.com/${GITHUB_REPOSITORY}/archive/${DEVELOP_BRANCH}.tar.gz" | \ - tar -zxf - -C "${GITHUB_WORKSPACE}/patches" --wildcards "*/modules/container-base/src/backports/${{ matrix.branch }}" --strip-components=6 - find "${GITHUB_WORKSPACE}/patches" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -s -i - - # Determine the base image name we are going to use from here on - - name: Determine base image name - run: | - if [[ "${{ matrix.branch }}" = "${{ env.DEVELOP_BRANCH }}" ]]; then - echo "BASE_IMAGE=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )" | tee -a "${GITHUB_ENV}" - echo "BASE_IMAGE_UPCOMING=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )" | tee -a "${GITHUB_ENV}" - else - echo "BASE_IMAGE=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )" | tee -a "${GITHUB_ENV}" - fi - - # Figure out if a rebuild is necessary because either there is an updated Java image or our installed packages need updates - - name: Check for recent Temurin image updates - id: temurin-check - # TODO: change to upstream location in final PR - uses: gdcc/wip-dataverse-base-image/.github/actions/check-newer-parent-image@10478-version-base-img - with: - parent: "$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout )" - derived: "${{ env.BASE_IMAGE }}" - # TODO: if we introduce more flavors as a matrix, we need to adapt the install command to check for updates - - name: Check for package updates in base image - id: package-check - if: ${{ steps.temurin-check.outputs.is-more-recent == 'false' }} + # Discover the releases we want to maintain + - name: Discover maintained releases + id: discover run: | - PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" - if [[ ! $( docker run --rm -u 0 "${BASE_IMAGE}" sh -c "apt update >&2 && apt install -s ${PKGS}" | grep "0 upgraded" ) ]]; then - echo "Base image $BASE_IMAGE needs updates for our custom installed packages" - echo "newer_packages=true" >> "${GITHUB_OUTPUT}" - else - echo "Base image $BASE_IMAGE has no updates for our custom installed packages" - echo "newer_packages=false" >> "${GITHUB_OUTPUT}" - fi + DEVELOPMENT_BRANCH=$( curl -f -sS https://api.github.com/repos/${{ github.repository }} | jq -r '.default_branch' ) + echo "DEVELOPMENT_BRANCH=$DEVELOPMENT_BRANCH" | tee -a "$GITHUB_ENV" + echo "branches=$( curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq -r " .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, \"${DEVELOPMENT_BRANCH}\" " | tr "\n" " " )" | tee -a "${GITHUB_OUTPUT}" + - # TODO: In a future version of this script, we might want to include checking for other security updates, - # not just updates to the packages we installed. - # grep security /etc/apt/sources.list > /tmp/security.list - # apt-get update -oDir::Etc::Sourcelist=/tmp/security.list - # apt-get dist-upgrade -y -oDir::Etc::Sourcelist=/tmp/security.list -oDir::Etc::SourceParts=/bin/false -s - - - name: Calculate revision number for immutable tag (on release branches only) - if: ${{ matrix.branch != env.DEVELOP_BRANCH }} - id: revision-tag - # TODO: change to upstream location in final PR - uses: gdcc/wip-dataverse-base-image/.github/actions/get-image-revision@10478-version-base-img - with: - image-ref: ${{ env.BASE_IMAGE }} - tag-options-prefix: "-Dbase.image.tag.suffix='' -Ddocker.tags.revision=" - - name: Configure update of "latest" tag for development branch - id: develop-tag - if: ${{ matrix.branch == env.DEVELOP_BRANCH }} + # Execute matrix build for the discovered branches + - name: Execute build matrix script + id: execute run: | - echo "tag-options=-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=${BASE_IMAGE_UPCOMING#*:}" | tee -a "${GITHUB_OUTPUT}" - - name: Deploy multi-arch base container image to Docker Hub - if: ${{ steps.temurin-check.outputs.is-more-recent == 'true' || steps.package-check.outputs.newer_packages == 'true' || inputs.force_build }} - id: build - run: | - mvn -f modules/container-base -Pct deploy -Ddocker.noCache -Ddocker.platforms=${{ env.PLATFORMS }} \ - -Ddocker.imagePropertyConfiguration=override ${{ steps.develop-tag.outputs.tag-options }} ${{ steps.revision-tag.outputs.tag-options }} - echo "rebuild=true" | tee -a "${GITHUB_OUTPUT}" - - # TODO: this is here to not drop the knowledge about matrix output workarounds (for now) - # - if: always() - # name: Save status (workaround for matrix outputs) - # run: | - # # steps.build.outcome is the status BEFORE continue-on-error - # echo "STATUS_$( echo "${{ matrix.branch }}" | tr ".:;,-/ " "_" )=${{ steps.build.outcome }}" | tee -a "${GITHUB_ENV}" - - # TODO: As part of issue #10618 we will need to create this action, shipping updated app images - #- name: Rebuild application container - # if: ${{ steps.build.outputs.rebuild }} - # uses: ./.github/actions/deploy-app-container - # with: - # registry: "" - # registry_token: "" - # ref: "" - # base_image: "" - # base_image_tag: "" + echo "force_build=${{ inputs.force_build }}" + .github/workflows/scripts/maintenance-job.sh ${{ steps.discover.outputs.branches }} # TODO: This job should become part of the matrix as an action, so we don't need to fiddle with matrix outputs hacks #push-app-img: diff --git a/.github/workflows/scripts/maintenance-job.sh b/.github/workflows/scripts/maintenance-job.sh new file mode 100755 index 00000000000..bf1a9748bf7 --- /dev/null +++ b/.github/workflows/scripts/maintenance-job.sh @@ -0,0 +1,141 @@ +#!/bin/bash + +# A matrix-like job to maintain a number of releases as well as the latest snap of Dataverse. + +# PREREQUISITES: +# - You have Java, Maven, QEMU and Docker all setup and ready to go +# - You obviously checked out the develop branch, otherwise you'd not be executing this script +# - You added all the branch names you want to run maintenance for as arguments +# Optional, but recommended: +# - You added a DEVELOPMENT_BRANCH env var to your runner/job env with the name of the development branch +# - You added a FORCE_BUILD=0|1 env var to indicate if the base image build should be forced +# - You added a PLATFORMS env var with all the target platforms you want to build for + +# NOTE: +# This script is a culmination of Github Action steps into a single script. +# The reason to put all of this in here is due to the complexity of the Github Action and the limitation of the +# matrix support in Github actions, where outputs cannot be aggregated or otherwise used further. + +set -euo pipefail + +# Get all the inputs +# If not within a runner, just print to stdout (duplicating the output in case of tee usage, but that's ok for testing) +GITHUB_OUTPUT=${GITHUB_OUTPUT:-"/proc/self/fd/1"} +GITHUB_ENV=${GITHUB_ENV:-"/proc/self/fd/1"} +GITHUB_WORKSPACE=${GITHUB_WORKSPACE:-"$(pwd)"} +GITHUB_SERVER_URL=${GITHUB_SERVER_URL:-"https://github.com"} +GITHUB_REPOSITORY=${GITHUB_REPOSITORY:-"IQSS/dataverse"} + +MAINTENANCE_WORKSPACE="${GITHUB_WORKSPACE}/maintenance-job" + +DEVELOPMENT_BRANCH="${DEVELOPMENT_BRANCH:-"develop"}" +FORCE_BUILD="${FORCE_BUILD:-"0"}" +PLATFORMS="${PLATFORMS:-"linux/amd64,linux/arm64"}" + +# Setup and validation +if [[ -z "$*" ]]; then + >&2 echo "You must give a list of branch names as arguments" + exit 1; +fi + +source "$( dirname "$0" )/utils.sh" + +# Delete old stuff if present +rm -rf "$MAINTENANCE_WORKSPACE" +mkdir -p "$MAINTENANCE_WORKSPACE" + +# Cache the image tags we maintain in this array (same order as branches array!) +# This list will be used to build the support matrix within the Docker Hub image description +SUPPORTED_ROLLING_TAGS=() + +for BRANCH in "$@"; do + echo "::group::Running maintenance for $BRANCH" + + # 0. Determine if this is a development branch and the most current release + IS_DEV=0 + if [[ "$BRANCH" = "$DEVELOPMENT_BRANCH" ]]; then + IS_DEV=1 + fi + IS_CURRENT_RELEASE=0 + if [[ "$BRANCH" = $( curl -f -sS "https://api.github.com/repos/$GITHUB_REPOSITORY/releases" | jq -r '.[0].tag_name' ) ]]; then + IS_CURRENT_RELEASE=1 + fi + + # 1. Let's get the maintained sources + git clone -c advice.detachedHead=false --depth 1 --branch "$BRANCH" "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" "$MAINTENANCE_WORKSPACE/$BRANCH" + # Switch context + cd "$MAINTENANCE_WORKSPACE/$BRANCH" + + # 2. Now let's apply the patches (we have them checked out in $GITHUB_WORKSPACE, not necessarily in this local checkout) + if [[ -d ${GITHUB_WORKSPACE}/modules/container-base/src/backports/$BRANCH ]]; then + find "${GITHUB_WORKSPACE}/modules/container-base/src/backports/$BRANCH" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -s -i + fi + + # 3. Determine the base image ref (/:) + BASE_IMAGE_REF="" + # For the dev branch we want to full flexi stack tag, to detect stack upgrades requiring new build + if (( IS_DEV )); then + BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout ) + else + BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout ) + fi + + # 4. Check for Temurin image updates + JAVA_IMAGE_REF=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout ) + NEWER_JAVA_IMAGE=0 + if check_newer_parent "$JAVA_IMAGE_REF" "$BASE_IMAGE_REF"; then + NEWER_JAVA_IMAGE=1 + fi + + # 5. Check for package updates in base image + PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" + NEWER_PKGS=0 + # Don't bother with package checks if the java image is newer already + if ! (( NEWER_JAVA_IMAGE )); then + if check_newer_pkgs "$BASE_IMAGE_REF" "$PKGS"; then + NEWER_PKGS=1 + fi + fi + + # 6. Get current immutable revision tag if not on the dev branch + REV=$( current_revision "$BASE_IMAGE_REF" ) + CURRENT_REV_TAG="${BASE_IMAGE_REF#*:}-r$REV" + NEXT_REV_TAG="${BASE_IMAGE_REF#*:}-r$(( REV + 1 ))" + + # 7. Let's put together what tags we want added to this build run + TAG_OPTIONS="" + if ! (( IS_DEV )); then + TAG_OPTIONS="-Dbase.image=$BASE_IMAGE_REF -Ddocker.tags.revision=$NEXT_REV_TAG" + + # In case of the current release, add the "latest" tag as well. Also add to list of rolling tags. + if (( IS_CURRENT_RELEASE )); then + TAG_OPTIONS="$TAG_OPTIONS -Ddocker.tags.latest=latest" + SUPPORTED_ROLLING_TAGS+=("[\"latest\", \"${BASE_IMAGE_REF#*:}\"]") + else + SUPPORTED_ROLLING_TAGS+=("[\"${BASE_IMAGE_REF#*:}\"]") + fi + else + UPCOMING_TAG=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image.tag -Dbase.image.tag.suffix="" -q -DforceStdout ) + TAG_OPTIONS="-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=$UPCOMING_TAG" + + SUPPORTED_ROLLING_TAGS+=("[\"unstable\", \"$UPCOMING_TAG\", \"${BASE_IMAGE_REF#*:}\"]") + fi + echo "Determined these additional Maven tag options: $TAG_OPTIONS" + + # 7. Let's build the base image if necessary + NEWER_BASE_IMAGE=0 + if (( NEWER_JAVA_IMAGE + NEWER_PKGS + FORCE_BUILD > 0 )); then + mvn -Pct -f modules/container-base deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \ + -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS + NEWER_BASE_IMAGE=1 + else + echo "No rebuild necessary, we're done here." + fi + + if (( NEWER_BASE_IMAGE )); then + echo "Built a new base image, should continue with application images now..." + # TODO: rebuild the app images here + fi + + echo "::endgroup::" +done diff --git a/.github/workflows/scripts/utils.sh b/.github/workflows/scripts/utils.sh new file mode 100644 index 00000000000..b63787105ee --- /dev/null +++ b/.github/workflows/scripts/utils.sh @@ -0,0 +1,107 @@ +#!/bin/bash + +set -euo pipefail + +function check_newer_parent() { + PARENT_IMAGE="$1" + # Get namespace, default to "library" if not found + PARENT_IMAGE_NS="${PARENT_IMAGE%/*}" + if [[ "$PARENT_IMAGE_NS" = "${PARENT_IMAGE}" ]]; then + PARENT_IMAGE_NS="library" + fi + PARENT_IMAGE_REPO="${PARENT_IMAGE%:*}" + PARENT_IMAGE_TAG="${PARENT_IMAGE#*:}" + + PARENT_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${PARENT_IMAGE_NS}/repositories/${PARENT_IMAGE_REPO}/tags/${PARENT_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$PARENT_IMAGE_LAST_UPDATE" = "null" ]]; then + echo "::error title='Invalid PARENT Image'::Could not find ${PARENT_IMAGE} in the registry" + exit 1 + fi + + DERIVED_IMAGE="$2" + # Get namespace, default to "library" if not found + DERIVED_IMAGE_NS="${DERIVED_IMAGE%/*}" + if [[ "${DERIVED_IMAGE_NS}" = "${DERIVED_IMAGE}" ]]; then + DERIVED_IMAGE_NS="library" + fi + DERIVED_IMAGE_REPO="$( echo "${DERIVED_IMAGE%:*}" | cut -f2 -d/ )" + DERIVED_IMAGE_TAG="${DERIVED_IMAGE#*:}" + + DERIVED_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${DERIVED_IMAGE_NS}/repositories/${DERIVED_IMAGE_REPO}/tags/${DERIVED_IMAGE_TAG}" | jq -r .last_updated )" + if [[ "$DERIVED_IMAGE_LAST_UPDATE" = "null" || "$DERIVED_IMAGE_LAST_UPDATE" < "$PARENT_IMAGE_LAST_UPDATE" ]]; then + echo "Parent image $PARENT_IMAGE has a newer release ($PARENT_IMAGE_LAST_UPDATE), which is more recent than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" + return 0 + else + echo "Parent image $PARENT_IMAGE ($PARENT_IMAGE_LAST_UPDATE) is older than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" + return 1 + fi +} + +function check_newer_pkgs() { + IMAGE="$1" + PKGS="$2" + + docker run --rm -u 0 "${IMAGE}" sh -c "apt update >/dev/null 2>&1 && apt install -s ${PKGS}" | tee /proc/self/fd/2 | grep -q "0 upgraded" + + if [[ ! $? ]]; then + echo "Base image $IMAGE needs updates for our custom installed packages" + return 0 + else + echo "Base image $IMAGE has no updates for our custom installed packages" + return 1 + fi + + # TODO: In a future version of this script, we might want to include checking for other security updates, + # not just updates to the packages we installed. + # grep security /etc/apt/sources.list > /tmp/security.list + # apt-get update -oDir::Etc::Sourcelist=/tmp/security.list + # apt-get dist-upgrade -y -oDir::Etc::Sourcelist=/tmp/security.list -oDir::Etc::SourceParts=/bin/false -s + +} + +function current_revision() { + IMAGE="$1" + IMAGE_NS_REPO="${IMAGE%:*}" + IMAGE_TAG="${IMAGE#*:}" + + if [[ "$IMAGE_TAG" = "$IMAGE_NS_REPO" ]]; then + >&2 echo "You must provide an image reference in the format [/]:" + exit 1 + fi + + case "$IMAGE_NS_REPO" in + */*) :;; # namespace/repository syntax, leave as is + *) IMAGE_NS_REPO="library/$IMAGE_NS_REPO";; # bare repository name (docker official image); must convert to namespace/repository syntax + esac + + # Without such a token we may run into rate limits + # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits. + # token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$IMAGE_NS_REPO:pull" ) + + ALL_TAGS="$( + i=0 + while [ $? == 0 ]; do + i=$((i+1)) + # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits. + # RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) + RESULT=$( curl -s "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) + if [[ $( echo "$RESULT" | jq '.message' ) != "null" ]]; then + # If we run into an error on the first attempt, that means we have a problem. + if [[ "$i" == "1" ]]; then + >&2 echo "Error when retrieving tag data: $( echo "$RESULT" | jq '.message' )" + exit 2 + # Otherwise it will just mean we reached the last page already + else + break + fi + else + echo "$RESULT" | jq -r '."results"[]["name"]' + # DEBUG: + #echo "$RESULT" | >&2 jq -r '."results"[]["name"]' + fi + done + )" + + # Note: if a former tag could not be found, it just might not exist already. Start new series with rev 0 + echo "$ALL_TAGS" | grep "${IMAGE_TAG}-r" | sed -e "s#${IMAGE_TAG}-r##" | sort -h | tail -n1 || echo "-1" +} From ff0498bc2aca5fbef5b53f4786d9eea1d6f4ba35 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 18 Sep 2024 17:30:18 +0200 Subject: [PATCH 335/366] ci(ct): remove obsolete actions for revisions and parent image changes detection --- .../check-newer-parent-image/action.yml | 53 ------------ .github/actions/get-image-revision/action.yml | 81 ------------------- 2 files changed, 134 deletions(-) delete mode 100644 .github/actions/check-newer-parent-image/action.yml delete mode 100644 .github/actions/get-image-revision/action.yml diff --git a/.github/actions/check-newer-parent-image/action.yml b/.github/actions/check-newer-parent-image/action.yml deleted file mode 100644 index 6f8ce950cec..00000000000 --- a/.github/actions/check-newer-parent-image/action.yml +++ /dev/null @@ -1,53 +0,0 @@ ---- -name: "Check Newer Parent Image" -description: "Determine if a base image is more recent than the derived." -inputs: - parent: - description: 'The name and (rolling) tag of the parent image to check - or - a shell command to get it' - required: true - derived: - description: 'The name and (rolling) tag of the derived image - or - a shell command to get it' - required: true -outputs: - is-more-recent: - description: "True if base image has a more recent update, false if not." - value: "${{ steps.determine.outputs.is_more_recent }}" - -runs: - using: composite - steps: - - shell: bash - id: determine - run: | - PARENT_IMAGE="${{ inputs.parent }}" - # Get namespace, default to "library" if not found - PARENT_IMAGE_NS="${PARENT_IMAGE%/*}" - if [[ "$PARENT_IMAGE_NS" = "${PARENT_IMAGE}" ]]; then - PARENT_IMAGE_NS="library" - fi - PARENT_IMAGE_REPO="${PARENT_IMAGE%:*}" - PARENT_IMAGE_TAG="${PARENT_IMAGE#*:}" - - PARENT_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${PARENT_IMAGE_NS}/repositories/${PARENT_IMAGE_REPO}/tags/${PARENT_IMAGE_TAG}" | jq -r .last_updated )" - if [[ "$PARENT_IMAGE_LAST_UPDATE" = "null" ]]; then - echo "::error title='Invalid PARENT Image'::Could not find ${PARENT_IMAGE} in the registry" - exit 1 - fi - - DERIVED_IMAGE="${{ inputs.derived }}" - # Get namespace, default to "library" if not found - DERIVED_IMAGE_NS="${DERIVED_IMAGE%/*}" - if [[ "${DERIVED_IMAGE_NS}" = "${DERIVED_IMAGE}" ]]; then - DERIVED_IMAGE_NS="library" - fi - DERIVED_IMAGE_REPO="$( echo "${DERIVED_IMAGE%:*}" | cut -f2 -d/ )" - DERIVED_IMAGE_TAG="${DERIVED_IMAGE#*:}" - - DERIVED_IMAGE_LAST_UPDATE="$( curl -sS "https://hub.docker.com/v2/namespaces/${DERIVED_IMAGE_NS}/repositories/${DERIVED_IMAGE_REPO}/tags/${DERIVED_IMAGE_TAG}" | jq -r .last_updated )" - if [[ "$DERIVED_IMAGE_LAST_UPDATE" = "null" || "$DERIVED_IMAGE_LAST_UPDATE" < "$PARENT_IMAGE_LAST_UPDATE" ]]; then - echo "Parent image $PARENT_IMAGE has a newer release ($PARENT_IMAGE_LAST_UPDATE), which is more recent than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" - echo "is_more_recent=true" >> $GITHUB_OUTPUT - else - echo "Parent image $PARENT_IMAGE ($PARENT_IMAGE_LAST_UPDATE) is older than $DERIVED_IMAGE ($DERIVED_IMAGE_LAST_UPDATE)" - echo "is_more_recent=false" >> $GITHUB_OUTPUT - fi diff --git a/.github/actions/get-image-revision/action.yml b/.github/actions/get-image-revision/action.yml deleted file mode 100644 index 6eaf89abba2..00000000000 --- a/.github/actions/get-image-revision/action.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: "Get Incremented Revision Tag" -description: "For a pre-existing rolling tag lookup the latest immutable revision tag, increment and return" -inputs: - image-ref: - description: "The full image reference including namespace, repo and tag" - required: true - revision-separator: - description: "The separator string to use between tag and revision number. Defaults to '-r'" - required: false - default: "-r" - tag-options-prefix: - description: "A string that the revision tag will be appended to and sent to output tag-options" - required: false - default: "" -outputs: - revision-tag: - description: "The updated immutable tag, ready to use" - value: ${{ steps.extract.outputs.revision_tag }} - tag-options: - description: "A string with some command line options (may be empty)" - value: ${{ steps.extract.outputs.tag_options }} -runs: - using: composite - steps: - - shell: bash - id: extract - run: | - IMAGE="${{ inputs.image-ref }}" - IMAGE_NS_REPO="${IMAGE%:*}" - IMAGE_TAG="${IMAGE#*:}" - - if [[ "$IMAGE_TAG" = "$IMAGE_NS_REPO" ]]; then - >&2 echo "You must provide an image reference in the format [/]:" - exit 1 - fi - - case "$IMAGE_NS_REPO" in - */*) :;; # namespace/repository syntax, leave as is - *) IMAGE_NS_REPO="library/$IMAGE_NS_REPO";; # bare repository name (docker official image); must convert to namespace/repository syntax - esac - - # Without such a token we may run into rate limits - # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits. - token=$( curl -s "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$IMAGE_NS_REPO:pull" ) - - ALL_TAGS="$( - i=0 - while [ $? == 0 ]; do - i=$((i+1)) - # OB 2024-09-16: for some reason using this token stopped working. Let's go without and see if we really fall into rate limits. - # RESULT=$( curl -s -H "Authorization: Bearer $token" "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) - RESULT=$( curl -s "https://registry.hub.docker.com/v2/repositories/$IMAGE_NS_REPO/tags/?page=$i&page_size=100" ) - if [[ $( echo "$RESULT" | jq '.message' ) != "null" ]]; then - # If we run into an error on the first attempt, that means we have a problem. - if [[ "$i" == "1" ]]; then - >&2 echo "Error when retrieving tag data: $( echo "$RESULT" | jq '.message' )" - exit 2 - # Otherwise it will just mean we reached the last page already - else - break - fi - else - echo "$RESULT" | jq -r '."results"[]["name"]' - # DEBUG: - #echo "$RESULT" | >&2 jq -r '."results"[]["name"]' - fi - done - )" - - # Note: if a former tag could not be found, it just might not exist already. Start new series with rev 0 - CURRENT=$( echo "$ALL_TAGS" | grep "${IMAGE_TAG}${{ inputs.revision-separator }}" | sed -e "s#${IMAGE_TAG}${{ inputs.revision-separator }}##" | sort -h | tail -n1 ) - if [[ "$CURRENT" ]]; then - REVISION_TAG="${IMAGE_TAG}${{ inputs.revision-separator }}$((CURRENT+1))" - else - REVISION_TAG="${IMAGE_TAG}${{ inputs.revision-separator }}0" - fi - echo "revision_tag=${REVISION_TAG}" | tee -a "$GITHUB_OUTPUT" - - if [[ -n "${{ inputs.tag-options-prefix }}" ]]; then - echo "tag_options=${{ inputs.tag-options-prefix }}${REVISION_TAG}" | tee -a "$GITHUB_OUTPUT" - fi \ No newline at end of file From 2794d3a874012319769f463ca26dcca2b8f1cd49 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 18 Sep 2024 17:44:33 +0200 Subject: [PATCH 336/366] ci(ct): re-enable forced build for maintenance workflow --- .github/workflows/container_maintenance.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 65cbcc81d48..47bbd005764 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -54,16 +54,15 @@ jobs: - name: Discover maintained releases id: discover run: | + echo "FORCE_BUILD=$( [[ "${{ inputs.force_build }}" = "true" ]] && echo 1 || echo 0 )" | tee -a "$GITHUB_ENV" DEVELOPMENT_BRANCH=$( curl -f -sS https://api.github.com/repos/${{ github.repository }} | jq -r '.default_branch' ) echo "DEVELOPMENT_BRANCH=$DEVELOPMENT_BRANCH" | tee -a "$GITHUB_ENV" echo "branches=$( curl -f -sS https://api.github.com/repos/IQSS/dataverse/releases | jq -r " .[0:${{ env.NUM_PAST_RELEASES }}] | .[].tag_name, \"${DEVELOPMENT_BRANCH}\" " | tr "\n" " " )" | tee -a "${GITHUB_OUTPUT}" - # Execute matrix build for the discovered branches - name: Execute build matrix script id: execute run: | - echo "force_build=${{ inputs.force_build }}" .github/workflows/scripts/maintenance-job.sh ${{ steps.discover.outputs.branches }} # TODO: This job should become part of the matrix as an action, so we don't need to fiddle with matrix outputs hacks From 18c921107dc57478081132be9718a66cf123164f Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:11:59 -0400 Subject: [PATCH 337/366] doc changes --- doc/sphinx-guides/source/api/search.rst | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/sphinx-guides/source/api/search.rst b/doc/sphinx-guides/source/api/search.rst index 359313ce1b5..7ca9a5abca6 100755 --- a/doc/sphinx-guides/source/api/search.rst +++ b/doc/sphinx-guides/source/api/search.rst @@ -61,7 +61,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"Trees", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/trees", - "image_url":"data:image/png;base64,iVBORw0...", + "image_url":"https://demo.dataverse.org/api/access/dvCardImage/1", "identifier":"trees", "description":"A tree dataverse with some birds", "published_at":"2016-05-10T12:53:38Z", @@ -76,7 +76,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"Chestnut Trees", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/chestnuttrees", - "image_url":"data:image/png;base64,iVBORw0...", + "image_url":"https://demo.dataverse.org/api/access/dvCardImage/2", "identifier":"chestnuttrees", "description":"A dataverse with chestnut trees and an oriole", "published_at":"2016-05-10T12:52:38Z", @@ -91,7 +91,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"trees.png", "type":"file", "url":"https://demo.dataverse.org/api/access/datafile/12", - "image_url":"data:image/png;base64,iVBORw0...", + "image_url":"https://demo.dataverse.org/api/access/datafile/12?imageThumb=true", "file_id":"12", "description":"", "published_at":"2016-05-10T12:53:39Z", @@ -113,7 +113,7 @@ https://demo.dataverse.org/api/search?q=trees "name":"Birds", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/birds", - "image_url":"data:image/png;base64,iVBORw0...", + "image_url":"https://demo.dataverse.org/api/access/dvCardImage/3", "identifier":"birds", "description":"A bird Dataverse collection with some trees", "published_at":"2016-05-10T12:57:27Z", @@ -173,8 +173,6 @@ https://demo.dataverse.org/api/search?q=trees } } -Note that the image_url field, if exists, will be returned as a regular URL for Datasets, while for Files and Dataverses, it will be returned as a Base64 URL. We plan to standardize this behavior so that the field always returns a regular URL. (See: https://github.com/IQSS/dataverse/issues/10831) - .. _advancedsearch-example: Advanced Search Examples @@ -202,7 +200,7 @@ In this example, ``show_relevance=true`` matches per field are shown. Available "name":"Finches", "type":"dataverse", "url":"https://demo.dataverse.org/dataverse/finches", - "image_url":"data:image/png;base64,iVBORw0...", + "image_url":"https://demo.dataverse.org/api/access/dvCardImage/2", "identifier":"finches", "description":"A Dataverse collection with finches", "published_at":"2016-05-10T12:57:38Z", From 47a2233b76ead9b57f9b96d11ae6c4f6d93dfe36 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:55:52 -0400 Subject: [PATCH 338/366] doc changes --- doc/sphinx-guides/source/api/changelog.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/sphinx-guides/source/api/changelog.rst b/doc/sphinx-guides/source/api/changelog.rst index 8d11ac0c123..a7af3e84b28 100644 --- a/doc/sphinx-guides/source/api/changelog.rst +++ b/doc/sphinx-guides/source/api/changelog.rst @@ -7,11 +7,6 @@ This API changelog is experimental and we would love feedback on its usefulness. :local: :depth: 1 -v6.4 ----- - -- ** /api/search?q=**: Json values for image_url in DataFiles and Collections have changed from Base64URL ("data:image/png;base64,...) to "/api/access/datafile/{identifier}?imageThumb=true" and "/api/access/dvCardImage/{identifier}" respectively. This was done to match the image_url of Dataset. - v6.3 ---- From 585bc8cc603c94ae8a45f6da46994aa2e4d9d85b Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 00:42:56 +0200 Subject: [PATCH 339/366] ci(ct): add outputs to maintenance matrix job Can be picked up by other jobs, e.g. to create textblocks for docs or a job matrix. --- .github/workflows/container_maintenance.yml | 3 ++ .github/workflows/scripts/maintenance-job.sh | 30 +++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 47bbd005764..d6ec6486a59 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -29,6 +29,9 @@ jobs: # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks #if: ${{ github.repository_owner == 'IQSS' }} + outputs: + supported_tag_matrix: ${{ steps.execute.outputs.supported_tag_matrix }} + rebuilt_base_images: ${{ steps.execute.outputs.rebuilt_base_images }} steps: - name: Checkout and Setup Maven diff --git a/.github/workflows/scripts/maintenance-job.sh b/.github/workflows/scripts/maintenance-job.sh index bf1a9748bf7..df562aac573 100755 --- a/.github/workflows/scripts/maintenance-job.sh +++ b/.github/workflows/scripts/maintenance-job.sh @@ -44,9 +44,12 @@ source "$( dirname "$0" )/utils.sh" rm -rf "$MAINTENANCE_WORKSPACE" mkdir -p "$MAINTENANCE_WORKSPACE" -# Cache the image tags we maintain in this array (same order as branches array!) +# Store the image tags we maintain in this array (same order as branches array!) # This list will be used to build the support matrix within the Docker Hub image description SUPPORTED_ROLLING_TAGS=() +# Store the tags of base images we are actually rebuilding to base new app images upon +# Takes the from "branch-name=base-image-ref" +REBUILT_BASE_IMAGES=() for BRANCH in "$@"; do echo "::group::Running maintenance for $BRANCH" @@ -128,6 +131,13 @@ for BRANCH in "$@"; do mvn -Pct -f modules/container-base deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \ -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS NEWER_BASE_IMAGE=1 + + # Save the information about the immutable or rolling tag we just built + if ! (( IS_DEV )); then + REBUILT_BASE_IMAGES+=("$BRANCH=${BASE_IMAGE_REF%:*}:$NEXT_REV_TAG") + else + REBUILT_BASE_IMAGES+=("$BRANCH=$BASE_IMAGE_REF") + fi else echo "No rebuild necessary, we're done here." fi @@ -139,3 +149,21 @@ for BRANCH in "$@"; do echo "::endgroup::" done + +# Built the output which base images have actually been rebuilt as JSON +REBUILT_IMAGES="[" +for IMAGE in "${REBUILT_BASE_IMAGES[@]}"; do + REBUILT_IMAGES+=" \"$IMAGE\" " +done +REBUILT_IMAGES+="]" +echo "rebuilt_base_images=${REBUILT_IMAGES// /, }" | tee -a "${GITHUB_OUTPUT}" + +# Built the supported rolling tags matrix as JSON +SUPPORTED_TAGS="{" +for (( i=0; i < ${#SUPPORTED_ROLLING_TAGS[@]} ; i++ )); do + j=$((i+1)) + SUPPORTED_TAGS+="\"${!j}\": ${SUPPORTED_ROLLING_TAGS[$i]}" + (( i < ${#SUPPORTED_ROLLING_TAGS[@]}-1 )) && SUPPORTED_TAGS+=", " +done +SUPPORTED_TAGS+="}" +echo "supported_tag_matrix=$SUPPORTED_TAGS" | tee -a "$GITHUB_OUTPUT" From 6adc5c46aa2210d04c28fe24d2e27cd55178509a Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 00:43:41 +0200 Subject: [PATCH 340/366] ci(ct): remove draft of building app images in maintenance matrix job --- .github/workflows/scripts/maintenance-job.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/scripts/maintenance-job.sh b/.github/workflows/scripts/maintenance-job.sh index df562aac573..e78bd4979fa 100755 --- a/.github/workflows/scripts/maintenance-job.sh +++ b/.github/workflows/scripts/maintenance-job.sh @@ -125,12 +125,10 @@ for BRANCH in "$@"; do fi echo "Determined these additional Maven tag options: $TAG_OPTIONS" - # 7. Let's build the base image if necessary - NEWER_BASE_IMAGE=0 + # 8. Let's build the base image if necessary if (( NEWER_JAVA_IMAGE + NEWER_PKGS + FORCE_BUILD > 0 )); then mvn -Pct -f modules/container-base deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \ -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS - NEWER_BASE_IMAGE=1 # Save the information about the immutable or rolling tag we just built if ! (( IS_DEV )); then @@ -142,11 +140,6 @@ for BRANCH in "$@"; do echo "No rebuild necessary, we're done here." fi - if (( NEWER_BASE_IMAGE )); then - echo "Built a new base image, should continue with application images now..." - # TODO: rebuild the app images here - fi - echo "::endgroup::" done From feeb1265060a9d60945b37b4f90c26c182078ec3 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 16:57:51 +0200 Subject: [PATCH 341/366] style,ci(ct): reword the maintenance build workflow name --- .github/workflows/container_maintenance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index d6ec6486a59..88718b435f7 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -21,7 +21,7 @@ env: jobs: build: - name: Build image + name: Base Image Matrix Build runs-on: ubuntu-latest permissions: contents: read From 130102032ce9edd3f873f10987166b38ed1db3b4 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 16:58:58 +0200 Subject: [PATCH 342/366] ci(ct): make the maintenance workflow push the hub description for the base image #10478 --- .github/workflows/container_base_push.yml | 13 +------ .github/workflows/container_maintenance.yml | 41 ++++++++++++++++----- modules/container-base/README.md | 19 ++++++---- 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 8a9a3212fe9..24b1102d3a7 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -13,6 +13,7 @@ on: paths: - 'modules/container-base/**' - '!modules/container-base/src/backports/**' + - '!modules/container-base/README.md' - 'modules/dataverse-parent/pom.xml' - '.github/workflows/container_base_push.yml' @@ -132,15 +133,3 @@ jobs: uses: ./.github/workflows/container_app_push.yml with: base-image-ref: ${{ needs.build.outputs.base-image-ref }} - - - # TODO: job to update the docker hub description with supported tags and all - #- if: ${{ github.event_name == 'push' && github.ref_name == env.DEVELOPMENT_BRANCH }} - # name: Push description to DockerHub - # uses: peter-evans/dockerhub-description@v3 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} - # repository: gdcc/base - # short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" - # readme-filepath: ./modules/container-base/README.md diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 88718b435f7..2b1deaded5f 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -87,12 +87,35 @@ jobs: # with: # branch: ${{ matrix.branch }} - # TODO: job to update the docker hub description with supported tags and all - # - name: Push description to DockerHub - # uses: peter-evans/dockerhub-description@v3 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} - # repository: gdcc/base - # short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" - # readme-filepath: ./modules/container-base/README.md + hub-description: + name: Push description to DockerHub + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + needs: build + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Render README + id: render + run: | + TAGS_JSON='${{ needs.build.outputs.supported_tag_matrix }}' + echo "$TAGS_JSON" | jq -r 'keys | sort | reverse | .[]' | + while IFS= read -r branch; do + echo \ + "- \`$( echo "$TAGS_JSON" | jq --arg v "$branch" -r '.[$v] | join("`, `")' )\`" \ + "([Dockerfile](https://github.com/IQSS/dataverse/blob/${branch}/modules/container-base/src/main/docker/Dockerfile)," \ + "[Patches](https://github.com/IQSS/dataverse/blob/develop/modules/container-base/src/backports/${branch}))" \ + | tee -a "${GITHUB_WORKSPACE}/tags.md" + done + sed -i -e "/<\!-- TAG BLOCK HERE -->/r ${GITHUB_WORKSPACE}/tags.md" "./modules/container-base/README.md" + + - name: Push description to DockerHub + uses: peter-evans/dockerhub-description@v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + repository: gdcc/base + short-description: "Dataverse Base Container image providing Payara application server and optimized configuration" + readme-filepath: ./modules/container-base/README.md \ No newline at end of file diff --git a/modules/container-base/README.md b/modules/container-base/README.md index dc4d185bbb5..925a053cf0b 100644 --- a/modules/container-base/README.md +++ b/modules/container-base/README.md @@ -31,17 +31,22 @@ to ask for help and guidance. ## Supported Image Tags This image is sourced within the main upstream code [repository of the Dataverse software](https://github.com/IQSS/dataverse). -Development and maintenance of the [image's code](https://github.com/IQSS/dataverse/tree/develop/modules/container-base) -happens there (again, by the community). Community-supported image tags are based on the two most important branches: +Development and maintenance of the [image's code](https://github.com/IQSS/dataverse/tree/develop/modules/container-base) happens there (again, by the community). +Community-supported image tags are based on the two most important branches: -- The `unstable` tag corresponds to the `develop` branch, where pull requests are merged. - ([`Dockerfile`](https://github.com/IQSS/dataverse/tree/develop/modules/container-base/src/main/docker/Dockerfile)) -- The `alpha` tag corresponds to the `master` branch, where releases are cut from. - ([`Dockerfile`](https://github.com/IQSS/dataverse/tree/master/modules/container-base/src/main/docker/Dockerfile)) +Our tagging is inspired by [Bitnami](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html>). +For more detailed information about our tagging policy, please read about our [base image tags](https://guides.dataverse.org/en/latest/container/base-image.html#supported-image-tags) in the Dataverse Containers Guide. + +For ease of use, here is a list of images that are currently maintained. + + + +All of them are rolling tags, except those ending with `-r`, which are immutable tags. +The `unstable` tags are the current development branch snapshot. Within the main repository, you may find the base image files at `/modules/container-base`. This Maven module uses the [Maven Docker Plugin](https://dmp.fabric8.io) to build and ship the image. -You may use, extend, or alter this image to your liking and/or host in some different registry if you want to. +You may use, extend, or alter this image to your liking and/or host in some different registry if you want to under the terms of the Apache 2.0 license. **Supported architectures:** This image is created as a "multi-arch image", supporting the most common architectures Dataverse usually runs on: AMD64 (Windows/Linux/...) and ARM64 (Apple M1/M2). From fbec22df4745e57b9a18a00dd9fe93ada036fbee Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 17:51:32 +0200 Subject: [PATCH 343/366] style(ct): fix simple typo in base image README --- modules/container-base/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/container-base/README.md b/modules/container-base/README.md index 925a053cf0b..da2a54064a4 100644 --- a/modules/container-base/README.md +++ b/modules/container-base/README.md @@ -34,7 +34,7 @@ This image is sourced within the main upstream code [repository of the Dataverse Development and maintenance of the [image's code](https://github.com/IQSS/dataverse/tree/develop/modules/container-base) happens there (again, by the community). Community-supported image tags are based on the two most important branches: -Our tagging is inspired by [Bitnami](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html>). +Our tagging is inspired by [Bitnami](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html). For more detailed information about our tagging policy, please read about our [base image tags](https://guides.dataverse.org/en/latest/container/base-image.html#supported-image-tags) in the Dataverse Containers Guide. For ease of use, here is a list of images that are currently maintained. From 6b7a9d618aae2fff50742a56c3f760dec3354ddf Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 17:52:49 +0200 Subject: [PATCH 344/366] fix(ct): remove bug from package upgrade detection in maintenance workflow We did not correctly compare the status code of the grep command, breaking the update detection --- .github/workflows/scripts/utils.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scripts/utils.sh b/.github/workflows/scripts/utils.sh index b63787105ee..987b58d8bb5 100644 --- a/.github/workflows/scripts/utils.sh +++ b/.github/workflows/scripts/utils.sh @@ -42,13 +42,14 @@ function check_newer_pkgs() { PKGS="$2" docker run --rm -u 0 "${IMAGE}" sh -c "apt update >/dev/null 2>&1 && apt install -s ${PKGS}" | tee /proc/self/fd/2 | grep -q "0 upgraded" + STATUS=$? - if [[ ! $? ]]; then - echo "Base image $IMAGE needs updates for our custom installed packages" - return 0 - else + if [[ $STATUS -eq 0 ]]; then echo "Base image $IMAGE has no updates for our custom installed packages" return 1 + else + echo "Base image $IMAGE needs updates for our custom installed packages" + return 0 fi # TODO: In a future version of this script, we might want to include checking for other security updates, From b569fdff945ca30979b3546c11fdb183804c2975 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 19 Sep 2024 12:34:39 -0400 Subject: [PATCH 345/366] update query per review comments to handle all cases --- src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java index 9ec93095cef..98ac8ff387f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFileServiceBean.java @@ -1407,7 +1407,7 @@ public UploadSessionQuotaLimit getUploadSessionQuotaLimit(DvObjectContainer pare } public boolean isInReleasedVersion(Long id) { - Query query = em.createQuery("SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetVersion.id=(SELECT max(dv.id) FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState=edu.harvard.iq.dataverse.DatasetVersion.VersionState.RELEASED) AND dvo.id=fm.dataFile.id AND fm.dataFile.id=:fid"); + Query query = em.createQuery("SELECT fm.id FROM FileMetadata fm, DvObject dvo WHERE fm.datasetVersion.id=(SELECT dv.id FROM DatasetVersion dv WHERE dv.dataset.id=dvo.owner.id and dv.versionState=edu.harvard.iq.dataverse.DatasetVersion.VersionState.RELEASED ORDER BY dv.versionNumber DESC, dv.minorVersionNumber DESC LIMIT 1) AND dvo.id=fm.dataFile.id AND fm.dataFile.id=:fid"); query.setParameter("fid", id); try { From 85731000382f5bda0394275b73f93b4ecd06d45f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 18:22:43 +0200 Subject: [PATCH 346/366] docs,style(ct): small rewording about immutable tags for base image --- modules/container-base/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/container-base/README.md b/modules/container-base/README.md index da2a54064a4..0598d709eac 100644 --- a/modules/container-base/README.md +++ b/modules/container-base/README.md @@ -41,8 +41,9 @@ For ease of use, here is a list of images that are currently maintained. -All of them are rolling tags, except those ending with `-r`, which are immutable tags. +All of them are rolling tags, except those ending with `-r`, which are the most recent immutable tags. The `unstable` tags are the current development branch snapshot. +We strongly recommend using only immutable tags for production use cases. Within the main repository, you may find the base image files at `/modules/container-base`. This Maven module uses the [Maven Docker Plugin](https://dmp.fabric8.io) to build and ship the image. From 9c91798f168e3d77e6347249ea9e053e3bce631a Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 18:23:55 +0200 Subject: [PATCH 347/366] feat,ci(ct): add immutable tags to list of base image tags in maintenance job As discussed during community meeting on 2024-09-19. --- .github/workflows/scripts/maintenance-job.sh | 25 +++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/scripts/maintenance-job.sh b/.github/workflows/scripts/maintenance-job.sh index e78bd4979fa..59e880e7a05 100755 --- a/.github/workflows/scripts/maintenance-job.sh +++ b/.github/workflows/scripts/maintenance-job.sh @@ -109,27 +109,25 @@ for BRANCH in "$@"; do TAG_OPTIONS="" if ! (( IS_DEV )); then TAG_OPTIONS="-Dbase.image=$BASE_IMAGE_REF -Ddocker.tags.revision=$NEXT_REV_TAG" - - # In case of the current release, add the "latest" tag as well. Also add to list of rolling tags. + # In case of the current release, add the "latest" tag as well. if (( IS_CURRENT_RELEASE )); then TAG_OPTIONS="$TAG_OPTIONS -Ddocker.tags.latest=latest" - SUPPORTED_ROLLING_TAGS+=("[\"latest\", \"${BASE_IMAGE_REF#*:}\"]") - else - SUPPORTED_ROLLING_TAGS+=("[\"${BASE_IMAGE_REF#*:}\"]") fi else UPCOMING_TAG=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image.tag -Dbase.image.tag.suffix="" -q -DforceStdout ) TAG_OPTIONS="-Ddocker.tags.develop=unstable -Ddocker.tags.upcoming=$UPCOMING_TAG" + # For the dev branch we only have rolling tags and can add them now already SUPPORTED_ROLLING_TAGS+=("[\"unstable\", \"$UPCOMING_TAG\", \"${BASE_IMAGE_REF#*:}\"]") fi echo "Determined these additional Maven tag options: $TAG_OPTIONS" # 8. Let's build the base image if necessary + NEWER_IMAGE=0 if (( NEWER_JAVA_IMAGE + NEWER_PKGS + FORCE_BUILD > 0 )); then mvn -Pct -f modules/container-base deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \ -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS - + NEWER_IMAGE=1 # Save the information about the immutable or rolling tag we just built if ! (( IS_DEV )); then REBUILT_BASE_IMAGES+=("$BRANCH=${BASE_IMAGE_REF%:*}:$NEXT_REV_TAG") @@ -140,6 +138,21 @@ for BRANCH in "$@"; do echo "No rebuild necessary, we're done here." fi + # 9. Add list of rolling and immutable tags for release builds + if ! (( IS_DEV )); then + RELEASE_TAGS_LIST="[" + if (( IS_CURRENT_RELEASE )); then + RELEASE_TAGS_LIST+="\"latest\", " + fi + RELEASE_TAGS_LIST+="\"${BASE_IMAGE_REF#*:}\", " + if (( NEWER_IMAGE )); then + RELEASE_TAGS_LIST+="\"$NEXT_REV_TAG\"]" + else + RELEASE_TAGS_LIST+="\"$CURRENT_REV_TAG\"]" + fi + SUPPORTED_ROLLING_TAGS+=("${RELEASE_TAGS_LIST}") + fi + echo "::endgroup::" done From 452849450e9890dfd54aecb2a4eaaa83e0404a70 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 18:24:24 +0200 Subject: [PATCH 348/366] style,ci(ct): add some more verbosity about progress in maintenance job --- .github/workflows/scripts/maintenance-job.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/scripts/maintenance-job.sh b/.github/workflows/scripts/maintenance-job.sh index 59e880e7a05..370988b9812 100755 --- a/.github/workflows/scripts/maintenance-job.sh +++ b/.github/workflows/scripts/maintenance-job.sh @@ -70,7 +70,9 @@ for BRANCH in "$@"; do cd "$MAINTENANCE_WORKSPACE/$BRANCH" # 2. Now let's apply the patches (we have them checked out in $GITHUB_WORKSPACE, not necessarily in this local checkout) + echo "Checking for patches..." if [[ -d ${GITHUB_WORKSPACE}/modules/container-base/src/backports/$BRANCH ]]; then + echo "Applying patches now." find "${GITHUB_WORKSPACE}/modules/container-base/src/backports/$BRANCH" -type f -name '*.patch' -print0 | xargs -0 -n1 patch -p1 -s -i fi @@ -82,9 +84,11 @@ for BRANCH in "$@"; do else BASE_IMAGE_REF=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout ) fi + echo "Determined BASE_IMAGE_REF=$BASE_IMAGE_REF from Maven" # 4. Check for Temurin image updates JAVA_IMAGE_REF=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=java.image -q -DforceStdout ) + echo "Determined JAVA_IMAGE_REF=$JAVA_IMAGE_REF from Maven" NEWER_JAVA_IMAGE=0 if check_newer_parent "$JAVA_IMAGE_REF" "$BASE_IMAGE_REF"; then NEWER_JAVA_IMAGE=1 @@ -92,6 +96,7 @@ for BRANCH in "$@"; do # 5. Check for package updates in base image PKGS="$( grep "ARG PKGS" modules/container-base/src/main/docker/Dockerfile | cut -f2 -d= | tr -d '"' )" + echo "Determined installed packages=\"$PKGS\" from Maven" NEWER_PKGS=0 # Don't bother with package checks if the java image is newer already if ! (( NEWER_JAVA_IMAGE )); then From 9b9ab1024f25d4634372d3d29ea99d9155f3c869 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 18:55:47 +0200 Subject: [PATCH 349/366] refactor,ci(ct): finishing touches for #10478 Re-enable and change everything necessary to reference the upstream IQSS context as of now. --- .github/workflows/container_app_push.yml | 10 ++- .github/workflows/container_base_push.yml | 67 ++++++++++----------- .github/workflows/container_maintenance.yml | 12 ++-- .github/workflows/maven_unit_test.yml | 4 ++ 4 files changed, 44 insertions(+), 49 deletions(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index e3dbcd4d2c6..8e38a17209c 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -35,13 +35,11 @@ jobs: packages: write pull-requests: write # Only run in upstream repo - avoid unnecessary runs in forks - # TODO: re-enable for final PR - #if: ${{ github.repository_owner == 'IQSS' }} + if: ${{ github.repository_owner == 'IQSS' }} steps: - name: Checkout and Setup Maven - # TODO: change to upstream location in final PR - uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img + uses: IQSS/dataverse/.github/actions/setup-maven@develop with: pom-paths: | pom.xml @@ -51,6 +49,7 @@ jobs: # TODO: Add a filter step here, that avoids building the image if this is a PR and there are other files touched than declared above. # Use https://github.com/dorny/paths-filter to solve this. This will ensure we do not run this twice if this workflow # will be triggered by the other workflows already (base image or java changes) + # To become a part of #10618. - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests) run: > @@ -117,8 +116,7 @@ jobs: ( github.event_name != 'push' || ( github.event_name == 'push' && contains(fromJSON('["develop", "master"]'), github.ref_name))) steps: - name: Checkout and Setup Maven - # TODO: change to upstream location in final PR - uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img + uses: IQSS/dataverse/.github/actions/setup-maven@develop with: pom-paths: | pom.xml diff --git a/.github/workflows/container_base_push.yml b/.github/workflows/container_base_push.yml index 24b1102d3a7..c2340576c78 100644 --- a/.github/workflows/container_base_push.yml +++ b/.github/workflows/container_base_push.yml @@ -7,8 +7,6 @@ on: - 'v[6-9].**' branches: - 'develop' - # TODO: delete for final PR - - '10478-version-base-img' # "Path filters are not evaluated for pushes of tags" https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#onpushpull_requestpull_request_targetpathspaths-ignore paths: - 'modules/container-base/**' @@ -17,13 +15,13 @@ on: - 'modules/dataverse-parent/pom.xml' - '.github/workflows/container_base_push.yml' + # These TODOs are left for #10618 # TODO: we are missing a workflow_call option here, so we can trigger this flow from pr comments and maven tests (keep the secrets availability in mind!) # TODO: we are missing a pull_request option here (filter for stuff that would trigger the maven runs!) so we can trigger preview builds for them when coming from the main repo (keep the secrets availability in mind!) env: PLATFORMS: linux/amd64,linux/arm64 - # TODO: set back to develop for final PR - DEVELOPMENT_BRANCH: 10478-version-base-img + DEVELOPMENT_BRANCH: develop jobs: build: @@ -32,16 +30,14 @@ jobs: permissions: contents: read packages: read - # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks - #if: ${{ github.repository_owner == 'IQSS' }} + if: ${{ github.repository_owner == 'IQSS' }} outputs: base-image-ref: ${{ steps.finalize.outputs.base-image-ref }} steps: - name: Checkout and Setup Maven - # TODO: change to upstream location in final PR - uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img + uses: IQSS/dataverse/.github/actions/setup-maven@develop with: pom-paths: modules/container-base/pom.xml @@ -55,34 +51,33 @@ jobs: # In case this is a push to develop, we care about buildtime. # Configure a remote ARM64 build host in addition to the local AMD64 in two steps. - # TODO: re-enable for final PR - #- name: Setup SSH agent - # if: ${{ github.event_name != 'schedule' }} - # uses: webfactory/ssh-agent@v0.9.0 - # with: - # ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }} - #- name: Provide the known hosts key and the builder config - # if: ${{ github.event_name != 'schedule' }} - # run: | - # echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts - # mkdir -p modules/container-base/target/buildx-state/buildx/instances - # cat > modules/container-base/target/buildx-state/buildx/instances/maven << EOF - # { "Name": "maven", - # "Driver": "docker-container", - # "Dynamic": false, - # "Nodes": [{"Name": "maven0", - # "Endpoint": "unix:///var/run/docker.sock", - # "Platforms": [{"os": "linux", "architecture": "amd64"}], - # "DriverOpts": null, - # "Flags": ["--allow-insecure-entitlement=network.host"], - # "Files": null}, - # {"Name": "maven1", - # "Endpoint": "ssh://${{ secrets.BUILDER_ARM64_SSH_CONNECTION }}", - # "Platforms": [{"os": "linux", "architecture": "arm64"}], - # "DriverOpts": null, - # "Flags": ["--allow-insecure-entitlement=network.host"], - # "Files": null}]} - # EOF + - name: Setup SSH agent + if: ${{ github.event_name != 'schedule' }} + uses: webfactory/ssh-agent@v0.9.0 + with: + ssh-private-key: ${{ secrets.BUILDER_ARM64_SSH_PRIVATE_KEY }} + - name: Provide the known hosts key and the builder config + if: ${{ github.event_name != 'schedule' }} + run: | + echo "${{ secrets.BUILDER_ARM64_SSH_HOST_KEY }}" > ~/.ssh/known_hosts + mkdir -p modules/container-base/target/buildx-state/buildx/instances + cat > modules/container-base/target/buildx-state/buildx/instances/maven << EOF + { "Name": "maven", + "Driver": "docker-container", + "Dynamic": false, + "Nodes": [{"Name": "maven0", + "Endpoint": "unix:///var/run/docker.sock", + "Platforms": [{"os": "linux", "architecture": "amd64"}], + "DriverOpts": null, + "Flags": ["--allow-insecure-entitlement=network.host"], + "Files": null}, + {"Name": "maven1", + "Endpoint": "ssh://${{ secrets.BUILDER_ARM64_SSH_CONNECTION }}", + "Platforms": [{"os": "linux", "architecture": "arm64"}], + "DriverOpts": null, + "Flags": ["--allow-insecure-entitlement=network.host"], + "Files": null}]} + EOF # Determine the base image name we are going to use from here on - name: Determine base image name diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml index 2b1deaded5f..986fe25cdf5 100644 --- a/.github/workflows/container_maintenance.yml +++ b/.github/workflows/container_maintenance.yml @@ -26,18 +26,15 @@ jobs: permissions: contents: read packages: read - # TODO: re-enable for final PR # Only run in upstream repo - avoid unnecessary runs in forks - #if: ${{ github.repository_owner == 'IQSS' }} + if: ${{ github.repository_owner == 'IQSS' }} outputs: supported_tag_matrix: ${{ steps.execute.outputs.supported_tag_matrix }} rebuilt_base_images: ${{ steps.execute.outputs.rebuilt_base_images }} steps: - name: Checkout and Setup Maven - # TODO: change to upstream location in final PR - # Necessary as the checked out release branch might not contain the action as files - uses: gdcc/wip-dataverse-base-image/.github/actions/setup-maven@10478-version-base-img + uses: IQSS/dataverse/.github/actions/setup-maven@develop with: pom-paths: modules/container-base/pom.xml @@ -68,7 +65,9 @@ jobs: run: | .github/workflows/scripts/maintenance-job.sh ${{ steps.discover.outputs.branches }} - # TODO: This job should become part of the matrix as an action, so we don't need to fiddle with matrix outputs hacks + # TODO: Use the needs.build.outputs.rebuilt_base_images with fromJSON() to create a matrix job. + # Must be a single rank matrix (vector), the branch and base image tag information ships as "branch=tag" string + # Will be part of working on #10618, app image versioned tags. #push-app-img: # name: "Rebase & Publish App Image" # permissions: @@ -77,7 +76,6 @@ jobs: # pull-requests: write # secrets: inherit # needs: - # - discover # - build # strategy: # fail-fast: false diff --git a/.github/workflows/maven_unit_test.yml b/.github/workflows/maven_unit_test.yml index 1c9c6c7d5e3..a94b17a67ba 100644 --- a/.github/workflows/maven_unit_test.yml +++ b/.github/workflows/maven_unit_test.yml @@ -30,6 +30,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} runs-on: ubuntu-latest steps: + # TODO: As part of #10618 change to setup-maven custom action # Basic setup chores - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.jdk }} @@ -95,6 +96,7 @@ jobs: # status: "Experimental" continue-on-error: ${{ matrix.experimental }} steps: + # TODO: As part of #10618 change to setup-maven custom action # Basic setup chores - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.jdk }} @@ -128,6 +130,7 @@ jobs: needs: integration-test name: Coverage Report Submission steps: + # TODO: As part of #10618 change to setup-maven custom action # Basic setup chores - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -159,6 +162,7 @@ jobs: # TODO: Add a filter step here, that avoids calling the app image release workflow if there are changes to the base image. # Use https://github.com/dorny/paths-filter to solve this. Will require and additional job or adding to integration-test job. # This way we ensure that we're not running the app image flow with a non-matching base image. + # To become a part of #10618. push-app-img: name: Publish App Image From aa3ea20a40396ce2801da8c7ff95499743db3d14 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Thu, 19 Sep 2024 14:43:40 -0400 Subject: [PATCH 350/366] add docs for disable-dataset-thumbnail-autoselect #10819 #10820 --- doc/sphinx-guides/source/installation/config.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index a3d0743216e..1433497063b 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -3343,6 +3343,9 @@ please find all known feature flags below. Any of these flags can be activated u * - disable-return-to-author-reason - Removes the reason field in the `Publish/Return To Author` dialog that was added as a required field in v6.2 and makes the reason an optional parameter in the :ref:`return-a-dataset` API call. - ``Off`` + * - disable-dataset-thumbnail-autoselect + - Turns off automatic selection of a dataset thumbnail from image files in that dataset. When set to ``On``, a user can still manually pick a thumbnail image, or upload a dedicated thumbnail image. + - ``Off`` **Note:** Feature flags can be set via any `supported MicroProfile Config API source`_, e.g. the environment variable ``DATAVERSE_FEATURE_XXX`` (e.g. ``DATAVERSE_FEATURE_API_SESSION_AUTH=1``). These environment variables can be set in your shell before starting Payara. If you are using :doc:`Docker for development `, you can set them in the `docker compose `_ file. From 45b412b139761bea7404da341be6f55e8db950dd Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 22:46:47 +0200 Subject: [PATCH 351/366] fix,ci(ct): only add base image Maven option when the input is defined Without this in case of the pull_request event the input is null and the build fails because we have base image defined at all. Simply not adding the option if the input is undefined means we stick to what is defined within the POM. --- .github/workflows/container_app_push.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml index 8e38a17209c..3b7ce066d73 100644 --- a/.github/workflows/container_app_push.yml +++ b/.github/workflows/container_app_push.yml @@ -55,7 +55,7 @@ jobs: run: > mvn -B -f modules/dataverse-parent -P ct -pl edu.harvard.iq:dataverse -am - -Dbase.image=${{ inputs.base-image-ref }} + $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" ) install # TODO: add smoke / integration testing here (add "-Pct -DskipIntegrationTests=false") @@ -157,12 +157,13 @@ jobs: run: > mvn -B -f modules/dataverse-parent -P ct -pl edu.harvard.iq:dataverse -am - -Dbase.image=${{ inputs.base-image-ref }} + $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" ) install - name: Deploy multi-arch application and configbaker container image run: > mvn - -Dapp.image.tag=${{ env.IMAGE_TAG }} -Dbase.image=${{ inputs.base-image-ref }} + -Dapp.image.tag=${{ env.IMAGE_TAG }} + $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" ) ${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }} -P ct deploy From 52e6408a5a0d33629139c2098253e6ca8f08588a Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 23:00:22 +0200 Subject: [PATCH 352/366] docs(ct): add release note for maintenance workflow #10478 --- doc/release-notes/10478-version-base-image.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/release-notes/10478-version-base-image.md diff --git a/doc/release-notes/10478-version-base-image.md b/doc/release-notes/10478-version-base-image.md new file mode 100644 index 00000000000..34f444a2122 --- /dev/null +++ b/doc/release-notes/10478-version-base-image.md @@ -0,0 +1,7 @@ +### Adding versioned tags to Container Base Images + +With this release we introduce a detailed maintenance workflow for our container images. +As output of the GDCC Containerization Working Group, the community takes another step towards production ready containers available directly from the core project. + +The maintenance workflow regularly updates the Container Base Image, which contains the operating system, Java, Payara Application Server, as well as tools and libraries required by the Dataverse application. +Shipping these rolling releases as well as immutable revisions is the foundation for secure and reliable Dataverse Application Container images. From dc6b59742550106513fb018f9872512ab7cd1039 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Thu, 19 Sep 2024 23:34:36 +0200 Subject: [PATCH 353/366] style(ct): add comment explaining what a flavor is in base image Maven props Co-authored-by: Philip Durbin --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index d8fe55ba22a..edf72067976 100644 --- a/pom.xml +++ b/pom.xml @@ -999,6 +999,7 @@ unstable false gdcc/base:${base.image.tag} + noble ${base.image.version}-${base.image.flavor}-p${payara.version}-j${target.java.version} From 79273b0c37985849231b6db0f7fdce20645ceeb4 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Thu, 19 Sep 2024 19:34:53 -0400 Subject: [PATCH 354/366] A potential simple fix for #10667 ? --- .../java/edu/harvard/iq/dataverse/EditDatafilesPage.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java index 993cb02b66b..8953c16aa6e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java @@ -2092,6 +2092,12 @@ public void handleFileUpload(FileUploadEvent event) throws IOException { errorMessages.add(cex.getMessage()); uploadComponentId = event.getComponent().getClientId(); return; + } finally { + try { + uFile.delete(); + } catch (IOException ioex) { + logger.warning("Failed to delete temp file uploaded via PrimeFaces " + uFile.getFileName()); + } } /*catch (FileExceedsMaxSizeException ex) { logger.warning("Failed to process and/or save the file " + uFile.getFileName() + "; " + ex.getMessage()); From 6cb3cd3092992d59ea6cf9d7106d211df35e1396 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 20 Sep 2024 16:24:46 -0400 Subject: [PATCH 355/366] doc how to handle develop into develop PRs #9508 --- .../source/developers/version-control.rst | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index 127955a44ea..02539d5286f 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -97,10 +97,12 @@ In the issue you can simply leave a comment to say you're working on it. If you tell us your GitHub username we are happy to add you to the "read only" team at https://github.com/orgs/IQSS/teams/dataverse-readonly/members so that we can assign the issue to you while you're working on it. You can also tell us if you'd like to be added to the `Dataverse Community Contributors spreadsheet `_. +.. _create-branch-for-pr: + Create a New Branch Off the develop Branch ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Always create your feature branch from the latest code in develop, pulling the latest code if necessary. As mentioned above, your branch should have a name like "3728-doc-apipolicy-fix" that starts with the issue number you are addressing (e.g. `#3728 `_) and ends with a short, descriptive name. Dashes ("-") and underscores ("_") in your branch name are ok, but please try to avoid other special characters such as ampersands ("&") that have special meaning in Unix shells. +Always create your feature branch from the latest code in develop, pulling the latest code if necessary. As mentioned above, your branch should have a name like "3728-doc-apipolicy-fix" that starts with the issue number you are addressing (e.g. `#3728 `_) and ends with a short, descriptive name. Dashes ("-") and underscores ("_") in your branch name are ok, but please try to avoid other special characters such as ampersands ("&") that have special meaning in Unix shells. Please do not call your branch "develop" as it can cause maintainers :ref:`trouble `. Commit Your Change to Your New Branch ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -299,3 +301,41 @@ GitHub documents how to make changes to a fork at https://help.github.com/articl vim path/to/file.txt git commit git push OdumInstitute 4709-postgresql_96 + +.. _develop-into-develop: + +Handing a Pull Request from a "develop" Branch +---------------------------------------------- + +Note: this is something only maintainers of Dataverse need to worry about, typically. + +From time to time a pull request comes in from a fork of Dataverse that uses "develop" as the branch behind the PR. (We've started asking contributors not to do this. See :ref:`create-branch-for-pr`.) This is problematic because the "develop" branch is the main integration branch for the project. (See :ref:`develop-branch`.) + +If the PR is perfect and can be merged as-is, no problem. Just merge it. However, if you would like to push commits to the PR, you are likely to run into trouble with multiple "develop" branches locally. + +The following is a list of commands oriented toward the simple task of merging the latest from the "develop" branch into the PR but the same technique can be used to push other commits to the PR as well. In this example the PR is coming from username "coder123" on GitHub. At a high level, what we're doing is working in a safe place (/tmp) away from our normal copy of the repo. We clone the main repo from IQSS, check out coder123's version of "develop" (called "dev2" or "false develop"), merge the real "develop" into it, and push to the PR. + +If there's a better way to do this, please get in touch! + + +.. code-block:: bash + + # do all this in /tmp away from your normal code + cd /tmp + git clone git@github.com:IQSS/dataverse.git + cd dataverse + git remote add coder123 git@github.com:coder123/dataverse.git + git fetch coder123 + # check out coder123's "develop" to a branch with a different name ("dev2") + git checkout coder123/develop -b dev2 + # merge IQSS "develop" into coder123's "develop" ("dev2") + git merge origin/develop + # delete the IQSS "develop" branch locally (!) + git branch -d develop + # checkout "dev2" (false "develop") as "develop" for now + git checkout -b develop + # push the false "develop" to coder123's fork (to the PR) + git push coder123 develop + cd .. + # delete the tmp space (done! \o/) + rm -rf /tmp/dataverse From c07f1d0452ed32593ee8ecab18b910e4c36fe3f3 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 20 Sep 2024 16:27:17 -0400 Subject: [PATCH 356/366] remove extra line --- doc/sphinx-guides/source/developers/version-control.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/version-control.rst b/doc/sphinx-guides/source/developers/version-control.rst index 02539d5286f..ecd2db6214d 100644 --- a/doc/sphinx-guides/source/developers/version-control.rst +++ b/doc/sphinx-guides/source/developers/version-control.rst @@ -317,7 +317,6 @@ The following is a list of commands oriented toward the simple task of merging t If there's a better way to do this, please get in touch! - .. code-block:: bash # do all this in /tmp away from your normal code From 48f9f72ac6cb8b6995c10c3375c9aa756e3532ba Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:55:24 -0400 Subject: [PATCH 357/366] dont return image_url if there is none --- .../iq/dataverse/DataverseServiceBean.java | 2 +- .../iq/dataverse/ThumbnailServiceWrapper.java | 11 ++++----- .../harvard/iq/dataverse/api/SearchIT.java | 23 ++++++++++++++++++- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java index 65082011eba..91b15f77111 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java @@ -364,7 +364,7 @@ public String getDataverseLogoThumbnailAsBase64ById(Long dvId) { public String getDataverseLogoThumbnailAsUrl(Long dvId) { File dataverseLogoFile = getLogoById(dvId); - if (dataverseLogoFile != null) { + if (dataverseLogoFile != null && dataverseLogoFile.exists()) { return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/dvCardImage/" + dvId; } return null; diff --git a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java index 91d25ba2d38..36be7c61642 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java +++ b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java @@ -49,15 +49,14 @@ public class ThumbnailServiceWrapper implements java.io.Serializable { private Map hasThumbMap = new HashMap<>(); public String getFileCardImageAsUrl(SolrSearchResult result) { - if (result.isHarvested()) { - return null; - } - if (result.getEntity() == null) { - return null; + if (!result.isHarvested() && result.getEntity() != null && (!((DataFile)result.getEntity()).isRestricted() + || permissionsWrapper.hasDownloadFilePermission(result.getEntity())) + && isThumbnailAvailable((DataFile) result.getEntity())) { + return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + result.getEntity().getId() + "?imageThumb=true"; } - return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + result.getEntity().getId() + "?imageThumb=true"; + return null; } // it's the responsibility of the user - to make sure the search result diff --git a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java index 4b422002cf2..3a2b684c421 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/SearchIT.java @@ -1284,7 +1284,7 @@ public static void cleanup() { } @Test - public void testSearchFiles() { + public void testSearchFilesAndUrlImages() { Response createUser = UtilIT.createRandomUser(); createUser.prettyPrint(); String username = UtilIT.getUsernameFromResponse(createUser); @@ -1304,6 +1304,11 @@ public void testSearchFiles() { String pathToFile = "src/main/webapp/resources/images/dataverseproject.png"; Response uploadImage = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken); uploadImage.prettyPrint(); + uploadImage.then().assertThat() + .statusCode(200); + pathToFile = "src/main/webapp/resources/js/mydata.js"; + Response uploadFile = UtilIT.uploadFileViaNative(datasetId.toString(), pathToFile, apiToken); + uploadImage.prettyPrint(); uploadImage.then().assertThat() .statusCode(200); @@ -1325,5 +1330,21 @@ public void testSearchFiles() { .body("data.items[0].url", CoreMatchers.containsString("/api/access/datafile/")) .body("data.items[0].image_url", CoreMatchers.containsString("/api/access/datafile/")) .body("data.items[0].image_url", CoreMatchers.containsString("imageThumb=true")); + + searchResp = UtilIT.search(dataverseAlias, apiToken); + searchResp.prettyPrint(); + searchResp.then().assertThat() + .statusCode(OK.getStatusCode()) + .body("data.items[0].type", CoreMatchers.is("dataverse")) + .body("data.items[0].url", CoreMatchers.containsString("/dataverse/")) + .body("data.items[0]", CoreMatchers.not(CoreMatchers.hasItem("url_image"))); + + searchResp = UtilIT.search("mydata", apiToken); + searchResp.prettyPrint(); + searchResp.then().assertThat() + .statusCode(OK.getStatusCode()) + .body("data.items[0].type", CoreMatchers.is("file")) + .body("data.items[0].url", CoreMatchers.containsString("/datafile/")) + .body("data.items[0]", CoreMatchers.not(CoreMatchers.hasItem("url_image"))); } } From c1fa3349062099219ad496eea43367deab5a7b6c Mon Sep 17 00:00:00 2001 From: Ludovic DANIEL Date: Mon, 16 Sep 2024 23:11:22 +0200 Subject: [PATCH 358/366] Fix NPE using CVOC --- .../java/edu/harvard/iq/dataverse/search/IndexServiceBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index fe8f1030f82..a8cf9ed519b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -1128,7 +1128,7 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set childDatasetFields = dsf.getParentDatasetFieldCompoundValue().getChildDatasetFields(); for (DatasetField df : childDatasetFields) { - if(cvocManagedFieldMap.get(dsfType.getId()).contains(df.getDatasetFieldType().getName())) { + if(cvocManagedFieldMap.containsKey(dsfType.getId()) && cvocManagedFieldMap.get(dsfType.getId()).contains(df.getDatasetFieldType().getName())) { String solrManagedFieldSearchable = df.getDatasetFieldType().getSolrField().getNameSearchable(); // Try to get string values from externalvocabularyvalue but for a managed fields of the CVOCConf Set stringsForManagedField = datasetFieldService.getIndexableStringsByTermUri(val, cvocMap.get(dsfType.getId()), df.getDatasetFieldType().getName()); From d265e509e643de1d1dd61cf5273412a34052f24f Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Mon, 23 Sep 2024 09:18:38 -0400 Subject: [PATCH 359/366] set dataset type before registering pid (which needs the type) --- .../engine/command/impl/AbstractCreateDatasetCommand.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java index 7b7c5fd0e93..db9dc142506 100644 --- a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java +++ b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java @@ -118,9 +118,6 @@ public Dataset execute(CommandContext ctxt) throws CommandException { pidProvider.generatePid(theDataset); } - // Attempt the registration if importing dataset through the API, or the app (but not harvest) - handlePid(theDataset, ctxt); - DatasetType defaultDatasetType = ctxt.datasetTypes().getByName(DatasetType.DEFAULT_DATASET_TYPE); DatasetType existingDatasetType = theDataset.getDatasetType(); logger.fine("existing dataset type: " + existingDatasetType); @@ -130,6 +127,11 @@ public Dataset execute(CommandContext ctxt) throws CommandException { } else { theDataset.setDatasetType(defaultDatasetType); } + + // Attempt the registration if importing dataset through the API, or the app (but not harvest) + handlePid(theDataset, ctxt); + + ctxt.em().persist(theDataset); From 6d9d6777ae37e0105285a3c73afff771170082b4 Mon Sep 17 00:00:00 2001 From: Ludovic DANIEL Date: Mon, 23 Sep 2024 16:19:03 +0200 Subject: [PATCH 360/366] add release note --- doc/release-notes/10869-fix-npe-using-cvoc.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/release-notes/10869-fix-npe-using-cvoc.md diff --git a/doc/release-notes/10869-fix-npe-using-cvoc.md b/doc/release-notes/10869-fix-npe-using-cvoc.md new file mode 100644 index 00000000000..53214d3789d --- /dev/null +++ b/doc/release-notes/10869-fix-npe-using-cvoc.md @@ -0,0 +1 @@ +This release fixes a bug in the external controlled vocabulary mechanism (introduced in v6.3) that could cause indexing to fail when a script is configured for one child field and no other child fields were managed. \ No newline at end of file From d215221b8b884b55a1ef2c1468deb2e4c799a9b4 Mon Sep 17 00:00:00 2001 From: Steven Winship <39765413+stevenwinship@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:20:51 -0400 Subject: [PATCH 361/366] adding fix from review comment --- .../iq/dataverse/ThumbnailServiceWrapper.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java index 36be7c61642..542cf39cfbe 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java +++ b/src/main/java/edu/harvard/iq/dataverse/ThumbnailServiceWrapper.java @@ -10,6 +10,7 @@ import edu.harvard.iq.dataverse.dataaccess.StorageIO; import edu.harvard.iq.dataverse.dataset.DatasetUtil; import edu.harvard.iq.dataverse.search.SolrSearchResult; +import edu.harvard.iq.dataverse.util.FileUtil; import edu.harvard.iq.dataverse.util.SystemConfig; import java.io.IOException; @@ -49,14 +50,16 @@ public class ThumbnailServiceWrapper implements java.io.Serializable { private Map hasThumbMap = new HashMap<>(); public String getFileCardImageAsUrl(SolrSearchResult result) { - - if (!result.isHarvested() && result.getEntity() != null && (!((DataFile)result.getEntity()).isRestricted() - || permissionsWrapper.hasDownloadFilePermission(result.getEntity())) - && isThumbnailAvailable((DataFile) result.getEntity())) { - return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + result.getEntity().getId() + "?imageThumb=true"; + DataFile dataFile = result != null && result.getEntity() != null ? ((DataFile) result.getEntity()) : null; + if (dataFile == null || result.isHarvested() + || !isThumbnailAvailable(dataFile) + || dataFile.isRestricted() + || !dataFile.isReleased() + || FileUtil.isActivelyEmbargoed(dataFile) + || FileUtil.isRetentionExpired(dataFile)) { + return null; } - - return null; + return SystemConfig.getDataverseSiteUrlStatic() + "/api/access/datafile/" + dataFile.getId() + "?imageThumb=true"; } // it's the responsibility of the user - to make sure the search result From 7b6f81eb4992c075be22e2debea3ec1b24c9551f Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Mon, 23 Sep 2024 11:21:44 -0400 Subject: [PATCH 362/366] remove tabs to make reviewdog happy. woof! #10623 --- .../iq/dataverse/ExternalFileUploadInProgress.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java index 96bfd3f63f5..c90fdc6edc2 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java +++ b/src/main/java/edu/harvard/iq/dataverse/ExternalFileUploadInProgress.java @@ -23,10 +23,10 @@ * externally. (?) */ @NamedQueries({ - @NamedQuery( name="ExternalFileUploadInProgress.deleteByTaskId", - query="DELETE FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId"), - @NamedQuery(name = "ExternalFileUploadInProgress.findByTaskId", - query = "SELECT f FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId")}) + @NamedQuery(name = "ExternalFileUploadInProgress.deleteByTaskId", + query = "DELETE FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId"), + @NamedQuery(name = "ExternalFileUploadInProgress.findByTaskId", + query = "SELECT f FROM ExternalFileUploadInProgress f WHERE f.taskId=:taskId")}) @Entity @Table(indexes = {@Index(columnList="taskid")}) public class ExternalFileUploadInProgress implements Serializable { From 2baf62e7cac957979f5d16637acd1b4c39e3713f Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Mon, 23 Sep 2024 11:39:54 -0400 Subject: [PATCH 363/366] globus doc tweaks #10623 --- doc/release-notes/10623-globus-improvements.md | 2 +- doc/sphinx-guides/source/developers/big-data-support.rst | 2 +- doc/sphinx-guides/source/developers/globus-api.rst | 2 +- doc/sphinx-guides/source/installation/config.rst | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/release-notes/10623-globus-improvements.md b/doc/release-notes/10623-globus-improvements.md index 03579b59631..c6b9febbb02 100644 --- a/doc/release-notes/10623-globus-improvements.md +++ b/doc/release-notes/10623-globus-improvements.md @@ -1 +1 @@ -A new alternative implementation of Globus polling during upload data transfers has been added in this release. This experimental framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. See the `globus-use-experimental-async-framework` feature flag in the Configuration guide. \ No newline at end of file +A new alternative implementation of Globus polling during upload data transfers has been added in this release. This experimental framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. See the `globus-use-experimental-async-framework` under [Feature Flags](https://dataverse-guide--10781.org.readthedocs.build/en/10781/installation/config.html#feature-flags) in the Installation Guide. diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst index 99ea4d2e0ba..02dd31b8472 100644 --- a/doc/sphinx-guides/source/developers/big-data-support.rst +++ b/doc/sphinx-guides/source/developers/big-data-support.rst @@ -188,4 +188,4 @@ An overview of the control and data transfer interactions between components was See also :ref:`Globus settings <:GlobusSettings>`. -An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.globus.taskMonitoringServer`` described in the Configuration guide. +An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag (see :ref:`feature-flags`) and the JVM option :ref:`dataverse.globus.taskMonitoringServer`. diff --git a/doc/sphinx-guides/source/developers/globus-api.rst b/doc/sphinx-guides/source/developers/globus-api.rst index 0f16dc704ef..26620fd6a92 100644 --- a/doc/sphinx-guides/source/developers/globus-api.rst +++ b/doc/sphinx-guides/source/developers/globus-api.rst @@ -185,7 +185,7 @@ As the transfer can take significant time and the API call is asynchronous, the Once the transfer completes, Dataverse will remove the write permission for the principal. -An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This new framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.globus.taskMonitoringServer`` described in the Configuration guide. +An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This new framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag (see :ref:`feature-flags`) and the JVM option :ref:`dataverse.globus.taskMonitoringServer`. Note that when using a managed endpoint that uses the Globus S3 Connector, the checksum should be correct as Dataverse can validate it. For file-based endpoints, the checksum should be included if available but Dataverse cannot verify it. diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 23168e12f30..bfbf9190357 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -3271,7 +3271,7 @@ Can also be set via *MicroProfile Config API* sources, e.g. the environment vari dataverse.globus.taskMonitoringServer +++++++++++++++++++++++++++++++++++++ -This setting is required in conjunction with the ``globus-use-experimental-async-framework`` feature flag. Setting it to true designates the Dataverse instance to serve as the dedicated polling server. It is needed so that the new framework can be used in a multi-node installation. +This setting is required in conjunction with the ``globus-use-experimental-async-framework`` feature flag (see :ref:`feature-flags`). Setting it to true designates the Dataverse instance to serve as the dedicated polling server. It is needed so that the new framework can be used in a multi-node installation. .. _feature-flags: @@ -3309,7 +3309,7 @@ please find all known feature flags below. Any of these flags can be activated u - Removes the reason field in the `Publish/Return To Author` dialog that was added as a required field in v6.2 and makes the reason an optional parameter in the :ref:`return-a-dataset` API call. - ``Off`` * - globus-use-experimental-async-framework - - Activates a new experimental implementation of Globus polling of ongoing remote data transfers that does not rely on the instance staying up continuously for the duration of the transfers and saves the state information about Globus upload requests in the database. Added in v6.4. Note that the JVM option ``dataverse.globus.taskMonitoringServer`` described above must also be enabled on one (and only one, in a multi-node installation) Dataverse instance. + - Activates a new experimental implementation of Globus polling of ongoing remote data transfers that does not rely on the instance staying up continuously for the duration of the transfers and saves the state information about Globus upload requests in the database. Added in v6.4. Affects :ref:`:GlobusPollingInterval`. Note that the JVM option :ref:`dataverse.globus.taskMonitoringServer` described above must also be enabled on one (and only one, in a multi-node installation) Dataverse instance. - ``Off`` **Note:** Feature flags can be set via any `supported MicroProfile Config API source`_, e.g. the environment variable @@ -4789,6 +4789,8 @@ The list of parent dataset field names for which the LDN Announce workflow step The URL where the `dataverse-globus `_ "transfer" app has been deployed to support Globus integration. See :ref:`globus-support` for details. +.. _:GlobusPollingInterval: + :GlobusPollingInterval ++++++++++++++++++++++ From d610094c7fc557b06fad2115f44291057d72cc3d Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Wed, 25 Sep 2024 10:20:17 -0400 Subject: [PATCH 364/366] Updated the docs to reflect the new name of a JVM option (#10623) --- doc/sphinx-guides/source/developers/big-data-support.rst | 2 +- doc/sphinx-guides/source/developers/globus-api.rst | 2 +- doc/sphinx-guides/source/installation/config.rst | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/sphinx-guides/source/developers/big-data-support.rst b/doc/sphinx-guides/source/developers/big-data-support.rst index 99ea4d2e0ba..dc4006b7d89 100644 --- a/doc/sphinx-guides/source/developers/big-data-support.rst +++ b/doc/sphinx-guides/source/developers/big-data-support.rst @@ -188,4 +188,4 @@ An overview of the control and data transfer interactions between components was See also :ref:`Globus settings <:GlobusSettings>`. -An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.globus.taskMonitoringServer`` described in the Configuration guide. +An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.files.globus-monitoring-server`` described in the Configuration guide. diff --git a/doc/sphinx-guides/source/developers/globus-api.rst b/doc/sphinx-guides/source/developers/globus-api.rst index 0f16dc704ef..a1bde106f92 100644 --- a/doc/sphinx-guides/source/developers/globus-api.rst +++ b/doc/sphinx-guides/source/developers/globus-api.rst @@ -185,7 +185,7 @@ As the transfer can take significant time and the API call is asynchronous, the Once the transfer completes, Dataverse will remove the write permission for the principal. -An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This new framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.globus.taskMonitoringServer`` described in the Configuration guide. +An alternative, experimental implementation of Globus polling of ongoing upload transfers has been added in v6.4. This new framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. Due to its experimental nature it is not enabled by default. See the ``globus-use-experimental-async-framework`` feature flag and the JVM option ``dataverse.files.globus-monitoring-server`` described in the Configuration guide. Note that when using a managed endpoint that uses the Globus S3 Connector, the checksum should be correct as Dataverse can validate it. For file-based endpoints, the checksum should be included if available but Dataverse cannot verify it. diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst index 23168e12f30..bf64793e385 100644 --- a/doc/sphinx-guides/source/installation/config.rst +++ b/doc/sphinx-guides/source/installation/config.rst @@ -3266,10 +3266,10 @@ The email for your institution that you'd like to appear in bag-info.txt. See :r Can also be set via *MicroProfile Config API* sources, e.g. the environment variable ``DATAVERSE_BAGIT_SOURCEORG_EMAIL``. -.. _dataverse.globus.taskMonitoringServer: +.. _dataverse.files.globus-monitoring-server: -dataverse.globus.taskMonitoringServer -+++++++++++++++++++++++++++++++++++++ +dataverse.files.globus-monitoring-server +++++++++++++++++++++++++++++++++++++++++ This setting is required in conjunction with the ``globus-use-experimental-async-framework`` feature flag. Setting it to true designates the Dataverse instance to serve as the dedicated polling server. It is needed so that the new framework can be used in a multi-node installation. @@ -3309,7 +3309,7 @@ please find all known feature flags below. Any of these flags can be activated u - Removes the reason field in the `Publish/Return To Author` dialog that was added as a required field in v6.2 and makes the reason an optional parameter in the :ref:`return-a-dataset` API call. - ``Off`` * - globus-use-experimental-async-framework - - Activates a new experimental implementation of Globus polling of ongoing remote data transfers that does not rely on the instance staying up continuously for the duration of the transfers and saves the state information about Globus upload requests in the database. Added in v6.4. Note that the JVM option ``dataverse.globus.taskMonitoringServer`` described above must also be enabled on one (and only one, in a multi-node installation) Dataverse instance. + - Activates a new experimental implementation of Globus polling of ongoing remote data transfers that does not rely on the instance staying up continuously for the duration of the transfers and saves the state information about Globus upload requests in the database. Added in v6.4. Note that the JVM option ``dataverse.files.globus-monitoring-server`` described above must also be enabled on one (and only one, in a multi-node installation) Dataverse instance. - ``Off`` **Note:** Feature flags can be set via any `supported MicroProfile Config API source`_, e.g. the environment variable From ea02478879820b0780122c4c85982f3c1f21c9c4 Mon Sep 17 00:00:00 2001 From: ofahimIQSS Date: Wed, 25 Sep 2024 11:39:14 -0400 Subject: [PATCH 365/366] I fixed anchor links #10876 (#10877) --- doc/sphinx-guides/source/contributor/documentation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/sphinx-guides/source/contributor/documentation.md b/doc/sphinx-guides/source/contributor/documentation.md index 96277c3b373..2a8d6794921 100644 --- a/doc/sphinx-guides/source/contributor/documentation.md +++ b/doc/sphinx-guides/source/contributor/documentation.md @@ -56,7 +56,7 @@ In case you decide to use a Sphinx Docker container to build the guides, you can ### Installing Sphinx -First, make a fork of https://github.com/IQSS/dataverse and clone your fork locally. Then change to the ``doc/sphinx-guides`` directory. +First, make a fork of and clone your fork locally. Then change to the ``doc/sphinx-guides`` directory. ``cd doc/sphinx-guides`` @@ -83,7 +83,7 @@ On a Mac we recommend installing GraphViz through [Homebrew](). To edit the existing documentation: -- Create a branch (see :ref:`how-to-make-a-pull-request`). +- Create a branch (see {ref}`how-to-make-a-pull-request`). - In ``doc/sphinx-guides/source`` you will find the .rst files that correspond to https://guides.dataverse.org. - Using your preferred text editor, open and edit the necessary files, or create new ones. From 682c89fc069f71c5cd6477bdbffc58107fb01720 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Wed, 25 Sep 2024 11:43:33 -0400 Subject: [PATCH 366/366] improve release note #10623 --- doc/release-notes/10623-globus-improvements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/10623-globus-improvements.md b/doc/release-notes/10623-globus-improvements.md index c6b9febbb02..9eb529bc4f7 100644 --- a/doc/release-notes/10623-globus-improvements.md +++ b/doc/release-notes/10623-globus-improvements.md @@ -1 +1 @@ -A new alternative implementation of Globus polling during upload data transfers has been added in this release. This experimental framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. See the `globus-use-experimental-async-framework` under [Feature Flags](https://dataverse-guide--10781.org.readthedocs.build/en/10781/installation/config.html#feature-flags) in the Installation Guide. +A new alternative implementation of Globus polling during upload data transfers has been added in this release. This experimental framework does not rely on the instance staying up continuously for the duration of the transfer and saves the state information about Globus upload requests in the database. See `globus-use-experimental-async-framework` under [Feature Flags](https://dataverse-guide--10781.org.readthedocs.build/en/10781/installation/config.html#feature-flags) and [dataverse.files.globus-monitoring-server](https://dataverse-guide--10781.org.readthedocs.build/en/10781/installation/config.html#dataverse-files-globus-monitoring-server) in the Installation Guide. See also #10623 and #10781.