Improved loading resource file.
Change-Id: I2c80d0991e5d3bc6799e493a244944ff1d5dd79e
diff --git a/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java b/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
index 290351c..3cbb2ab 100644
--- a/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
+++ b/full/src/main/java/de/ids_mannheim/korap/annotation/FreeResourceParser.java
@@ -1,5 +1,7 @@
package de.ids_mannheim.korap.annotation;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashSet;
@@ -38,8 +40,16 @@
public static ObjectMapper mapper = new ObjectMapper();
public void run () throws IOException, KustvaktException {
- InputStream is = FreeResourceParser.class.getClassLoader()
- .getResourceAsStream(FREE_RESOURCE_FILE);
+ InputStream is=null;
+ File f = new File(FREE_RESOURCE_FILE);
+ if (f.exists()){
+ is = new FileInputStream(f);
+ }
+ else{
+ is = FreeResourceParser.class.getClassLoader()
+ .getResourceAsStream(FREE_RESOURCE_FILE);
+ }
+
JsonNode node = mapper.readTree(is);
for (JsonNode resource : node) {
String resourceId = resource.at("/id").asText();
diff --git a/full/src/main/resources/free-resources.json b/full/src/main/resources/free-resources.json
index ba6f63e..22b5052 100644
--- a/full/src/main/resources/free-resources.json
+++ b/full/src/main/resources/free-resources.json
@@ -1,13 +1,43 @@
[{
- "id": "WPD15",
- "de_title" : "Deutsche Wikipedia Artikel 2015",
- "en_title" : "German Wikipedia Articles 2015",
- "en_description" : "A collection of German Wikipedia articles from May 2015.",
+ "id": "WPD17",
+ "de_title" : "Deutsche Wikipedia Artikel 2017",
+ "en_title" : "German Wikipedia Articles 2017",
+ "en_description" : "A collection of articles of German Wikipedia from July 1st, 2017.",
"layers": [
- "opennlp/p",
"corenlp/p",
- "corenlp/c",
"marmot/m",
- "marmot/p"
+ "marmot/p",
+ "opennlp/p",
+ "tt/l",
+ "tt/p"
]
-}]
\ No newline at end of file
+},
+{
+ "id": "WDD17",
+ "de_title" : "Deutsche Wikipedia-Diskussionskorpus 2017",
+ "en_title" : "German Wikipedia talk corpus 2017",
+ "en_description" : "A collection of talk pages of German Wikipedia from July 1st, 2017.",
+ "layers": [
+ "corenlp/p",
+ "marmot/m",
+ "marmot/p",
+ "opennlp/p",
+ "tt/l",
+ "tt/p"
+ ]
+},
+{
+ "id": "WUD17",
+ "de_title" : "Deutsche Wikipedia-Benutzerdiskussionskorpus 2017",
+ "en_title" : "German Wikipedia talk corpus 2017",
+ "en_description" : "A collection of user talk pages of German Wikipedia from July 1st, 2017.",
+ "layers": [
+ "corenlp/p",
+ "marmot/m",
+ "marmot/p",
+ "opennlp/p",
+ "tt/l",
+ "tt/p"
+ ]
+}
+]
\ No newline at end of file
diff --git a/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java b/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
index df9e71d..2c23b04 100644
--- a/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/web/controller/FreeResourceControllerTest.java
@@ -23,11 +23,11 @@
String entity = response.getEntity(String.class);
JsonNode n = JsonUtils.readTree(entity).get(0);
- assertEquals("WPD15",n.at("/resourceId").asText());
- assertEquals("Deutsche Wikipedia Artikel 2015", n.at("/titles/de").asText());
- assertEquals("German Wikipedia Articles 2015", n.at("/titles/en").asText());
+ assertEquals("WPD17",n.at("/resourceId").asText());
+ assertEquals("Deutsche Wikipedia Artikel 2017", n.at("/titles/de").asText());
+ assertEquals("German Wikipedia Articles 2017", n.at("/titles/en").asText());
assertEquals(1, n.at("/languages").size());
- assertEquals(5, n.at("/layers").size());
+ assertEquals(6, n.at("/layers").size());
}
}