Merge pull request #158 from clarin-eric/bugfixes

Bug fixes (languages in UI, errors while downloading resources)
clarin-eric · Nov 30, 2020 · 19f69c9 · 19f69c9
2 parents f6389ae + aad978c
commit 19f69c9
Show file tree

Hide file tree

Showing 7 changed files with 7,906 additions and 154 deletions.
diff --git a/backend/src/main/java/eu/clarin/switchboard/core/LinkMetadata.java b/backend/src/main/java/eu/clarin/switchboard/core/LinkMetadata.java
@@ -67,6 +67,11 @@ public static LinkInfo getLinkData(CloseableHttpClient client, String originalUr
             throw new LinkException(LinkException.Kind.DATA_STREAM_ERROR, "" + linkInfo.downloadLink, xc);
         }
 
+        int status = response.getStatusLine().getStatusCode();
+        if (status >= 400) {
+            throw new LinkException(LinkException.Kind.STATUS_ERROR, "" + linkInfo.downloadLink, status);
+        }
+
         switch (context.getCacheResponseStatus()) {
             case CACHE_HIT:
                 LOGGER.debug("A response was generated from the cache with no requests sent upstream");

diff --git a/backend/src/main/java/eu/clarin/switchboard/resources/InfoResource.java b/backend/src/main/java/eu/clarin/switchboard/resources/InfoResource.java
@@ -9,8 +9,10 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.io.*;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 @Path("/api")
@@ -21,12 +23,26 @@ public class InfoResource {
     long maxAllowedDataSize;
     String contactEmail;
     ToolRegistry toolRegistry;
+    Map<String, String> languageCodeToName;
 
-    public InfoResource(ToolRegistry toolRegistry, Map<String, String> gitProps, long maxAllowedDataSize, String contactEmail) {
+    public InfoResource(ToolRegistry toolRegistry, Map<String, String> gitProps, long maxAllowedDataSize, String contactEmail) throws IOException {
         this.toolRegistry = toolRegistry;
         this.gitProps = gitProps == null ? new HashMap<>() : gitProps;
         this.maxAllowedDataSize = maxAllowedDataSize;
         this.contactEmail = contactEmail;
+
+        this.languageCodeToName = new HashMap<>();
+        try (InputStream is = getClass().getResourceAsStream("/iso639-3.tsv");
+             Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
+             BufferedReader buffered = new BufferedReader(reader)) {
+            buffered.lines().forEach(line -> {
+                int i = line.indexOf('\t');
+                assert i > 0;
+                languageCodeToName.put(
+                        line.substring(0, i),
+                        line.substring(i+1, line.length()).trim());
+            });
+        }
     }
 
     @GET
@@ -77,8 +93,13 @@ public Response getMimetypes() {
     @Path("/languages")
     @Produces(MediaType.APPLICATION_JSON + ";charset=utf-8")
     public Response getLanguages() {
-        List<String> list = new ArrayList<>(toolRegistry.getAllLanguages());
-        list.sort(String::compareTo);
+        List<String[]> list = new ArrayList<>();
+        for (String code : toolRegistry.getAllLanguages()) {
+            String name = languageCodeToName.get(code);
+            if (name != null) {
+                list.add(new String[]{code, name});
+            }
+        }
         return Response.ok(list).build();
     }
 }