fix small bug where cmdi was considered a collection name for both cl…

…arin and europeana
clarin-eric · Mar 6, 2020 · 15d4e96 · 15d4e96
1 parent 8ac63b6
commit 15d4e96
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/curation-module-web/src/main/java/eu/clarin/main/Configuration.java b/curation-module-web/src/main/java/eu/clarin/main/Configuration.java
@@ -108,14 +108,14 @@ private static void loadVariables(Properties properties) {
 
         //collection categorizing into europeana and clarin based on the data folder
         String dataDirectory = properties.getProperty("DATA_DIRECTORY");
-        try (Stream<Path> walk = Files.walk(Paths.get(dataDirectory + "/clarin/results/cmdi"))) {
-            clarinCollections = (ArrayList<String>) walk.filter(Files::isDirectory).map(file -> file.getFileName().toString()).collect(Collectors.toList());
+        try (Stream<Path> walk = Files.walk(Paths.get(dataDirectory + "/clarin/results/cmdi/"))) {
+            clarinCollections = (ArrayList<String>) walk.filter(Files::isDirectory).filter(path -> !path.getFileName().toString().equals("cmdi")).map(file -> file.getFileName().toString()).collect(Collectors.toList());
         } catch (IOException e) {
             _logger.error("Error when reading folders from :" + dataDirectory + "/clarin/results/cmdi, Message:" + e.getMessage());
         }
 
-        try (Stream<Path> walk = Files.walk(Paths.get(dataDirectory + "/europeana/results/cmdi"))) {
-            europeanaCollections = (ArrayList<String>) walk.filter(Files::isDirectory).map(file -> file.getFileName().toString()).collect(Collectors.toList());
+        try (Stream<Path> walk = Files.walk(Paths.get(dataDirectory + "/europeana/results/cmdi/"))) {
+            europeanaCollections = (ArrayList<String>) walk.filter(Files::isDirectory).filter(path -> !path.getFileName().toString().equals("cmdi")).map(file -> file.getFileName().toString()).collect(Collectors.toList());
         } catch (IOException e) {
             _logger.error("Error when reading folders from :" + dataDirectory + "/europeana/results/cmdi, Message:" + e.getMessage());
         }