commit 4fa4b06791ffb812942189337d16a3c76a9a7f40
author margaretha <margaretha@ids-mannheim.de> Mon Jan 28 19:43:30 2019 +0100
committer margaretha <margaretha@ids-mannheim.de> Mon Jan 28 19:43:30 2019 +0100
tree c8af2a34edc3b070e7a6d9bc613c9254d76dcebd
parent 4a33812c7460509b15b4aba7050a1ccbf20b714c

Added foundry rewrite with user default setting.

Change-Id: Ibc09468b6851af359eaf18df140fc973ab9dce69

core/src/main/java/de/ids_mannheim/korap/config/Attributes.java

diff --git a/core/src/main/java/de/ids_mannheim/korap/config/Attributes.java b/core/src/main/java/de/ids_mannheim/korap/config/Attributes.java
index dd54f28..2ad58cc 100644
--- a/core/src/main/java/de/ids_mannheim/korap/config/Attributes.java
+++ b/core/src/main/java/de/ids_mannheim/korap/config/Attributes.java
@@ -144,10 +144,11 @@
     /**
      * default layers
      */
-    public static final String DEFAULT_POS_FOUNDRY = "POSFoundry";
-    public static final String DEFAULT_LEMMA_FOUNDRY = "lemmaFoundry";
-    public static final String DEFAULT_CONST_FOUNDRY = "constFoundry";
-    public static final String DEFAULT_REL_FOUNDRY = "relFoundry";
+    public static final String DEFAULT_FOUNDRY_POS = "pos-foundry";
+    public static final String DEFAULT_FOUNDRY_LEMMA = "lemma-foundry";
+    public static final String DEFAULT_FOUNDRY_CONSTITUENT = "constituent-foundry";
+    public static final String DEFAULT_FOUNDRY_RELATION = "relation-foundry";
+    public static final String DEFAULT_FOUNDRY_MORPHOLOGY = "morphology-foundry";
 
     /**
      * db column keys

core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java

diff --git a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
index 2d0d720..f4f107f 100644
--- a/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
+++ b/core/src/main/java/de/ids_mannheim/korap/config/KustvaktConfiguration.java
@@ -71,6 +71,7 @@
     private String passcodeSaltField;
 
     private String default_pos;
+    private String default_morphology;
     private String default_lemma;
     private String default_token;
     private String default_dep;
@@ -95,6 +96,7 @@
     // random code generator
     private String secureRandomAlgorithm;
     private String messageDigestAlgorithm;
+
     
     public KustvaktConfiguration (Properties properties) throws Exception {
         load(properties);
@@ -131,14 +133,15 @@
             queryLanguages.add(querylang.trim().toUpperCase());
 
         default_const =
-                properties.getProperty("default.layer.constituent", "mate");
+                properties.getProperty("default.foundry.constituent", "corenlp");
         default_dep =
-                properties.getProperty("default.layer.dependency", "mate");
-        default_lemma = properties.getProperty("default.layer.lemma", "tt");
+                properties.getProperty("default.foundry.dependency", "malt");
+        default_lemma = properties.getProperty("default.foundry.lemma", "tt");
+        default_morphology = properties.getProperty("default.foundry.morphology", "marmot");
         default_pos =
-                properties.getProperty("default.layer.partOfSpeech", "tt");
+                properties.getProperty("default.foundry.partOfSpeech", "tt");
         default_token =
-                properties.getProperty("default.layer.orthography", "opennlp");
+                properties.getProperty("default.foundry.orthography", "opennlp");
 
         // security configuration
         inactiveTime = TimeUtils.convertTimeToSeconds(