Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
1eb6d9d2
by Tony CHEMIT at 2018-03-12T23:54:12Z
4 changed files:
- t3-domain/src/main/config/T3.ini
- t3-domain/src/main/resources/i18n/t3-domain_en_GB.properties
- t3-domain/src/main/resources/i18n/t3-domain_fr_FR.properties
- t3-web/src/main/java/fr/ird/t3/web/actions/io/input/ConfigureImportDataAction.java
Changes:
| ... | ... | @@ -56,6 +56,12 @@ defaultValue = ${data.directory}/treatments |
| 56 | 56 |
transient = true
|
| 57 | 57 |
final = true
|
| 58 | 58 |
|
| 59 |
+[option defaultInputPilotId]
|
|
| 60 |
+description = t3.config.defaultInputPilotId.description
|
|
| 61 |
+key = defaultInputPilotId
|
|
| 62 |
+type = String
|
|
| 63 |
+defaultValue = AVDTH__3.5
|
|
| 64 |
+ |
|
| 59 | 65 |
[option stratumWeightRatio]
|
| 60 | 66 |
description = t3.config.stratum.weightRatio.description
|
| 61 | 67 |
key = stratum.weightRatio
|
| ... | ... | @@ -147,6 +147,7 @@ t3.common.zoneVersion=Version of zone |
| 147 | 147 |
t3.config.context.path.description=Context path
|
| 148 | 148 |
t3.config.data.directory.description=Data directory of T3+
|
| 149 | 149 |
t3.config.data.version.description=Data version
|
| 150 |
+t3.config.defaultInputPilotId.description=Default AVDTH Input pilot name to use
|
|
| 150 | 151 |
t3.config.internal.db.directory.description=Path of T3+ internal database
|
| 151 | 152 |
t3.config.level0.weightedSetWeight.description=Weighted set weight (used to split mixed sets)
|
| 152 | 153 |
t3.config.level2.defaultSpecies.description=Codes of selected species by default for level 2
|
| ... | ... | @@ -147,6 +147,7 @@ t3.common.zoneVersion=Version de zone |
| 147 | 147 |
t3.config.context.path.description=Contexte applicatif
|
| 148 | 148 |
t3.config.data.directory.description=Répertoire par défaut où mettre toutes les données de t3 (logs, fichier de configuration de db, ...)
|
| 149 | 149 |
t3.config.data.version.description=Version des données
|
| 150 |
+t3.config.defaultInputPilotId.description=Nom du pilote AVDTH à utiliser par défaut
|
|
| 150 | 151 |
t3.config.internal.db.directory.description=Chemin de la base interne de T3+
|
| 151 | 152 |
t3.config.level0.weightedSetWeight.description=Poids moyen d'une calée
|
| 152 | 153 |
t3.config.level2.defaultSpecies.description=Code des espèces sélectionnées par défaut pour le niveau 2
|
| ... | ... | @@ -135,6 +135,9 @@ public class ConfigureImportDataAction extends AbstractConfigureAction<AnalyzeIn |
| 135 | 135 |
} else {
|
| 136 | 136 |
log.info(String.format("Use existing treatment directory %s", getTreatmentDirectoryPath()));
|
| 137 | 137 |
}
|
| 138 |
+ if (getConfiguration().getInputProvider() == null) {
|
|
| 139 |
+ inputProviderId = getApplicationConfig().getDefaultInputPilotId();
|
|
| 140 |
+ }
|
|
| 138 | 141 |
}
|
| 139 | 142 |
|
| 140 | 143 |
public String doAddSource() throws Exception {
|