diff --git a/pom.xml b/pom.xml index 388638de5f451debdd2ea2e190e44f38bf67909c..b53a3aca5a40681fe536c3dc4fb27bc3a9d87974 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,11 @@ <artifactId>cors-filter</artifactId> <version>1.7.1</version> </dependency> + <dependency> + <groupId>no.bioforsk.vips.model.</groupId> + <artifactId>NaerstadModel</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>javax</groupId> <artifactId>javaee-web-api</artifactId> diff --git a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java b/src/main/java/no/bioforsk/vips/core/service/ModelResource.java index e36d4bd9a006df8c9851428d7b0cfe7290d00080..e9ef44eb286e79e78dffbb53c9e6e5d010b0e18b 100644 --- a/src/main/java/no/bioforsk/vips/core/service/ModelResource.java +++ b/src/main/java/no/bioforsk/vips/core/service/ModelResource.java @@ -46,6 +46,22 @@ public class ModelResource { /** * Prints the usage instructions from the requested model * @param modelId + * @param language two-letter code (<a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO-639-2</a>) + * @return + */ + @GET + @Path("models/{modelId}/usage/{language}") + @Produces("text/plain;charset=UTF-8") + public Response printModelUsage(@PathParam("modelId") String modelId, @PathParam("language") String language) + { + String usage = ModelFactory.getInstance().getModelUsage(modelId, language); + return Response.ok().entity(usage).build(); + } + + /** + * Prints the usage instructions from the requested model + * @param modelId + * @param language two-letter code (<a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO-639-2</a>) * @return */ @GET @@ -53,8 +69,7 @@ public class ModelResource { @Produces("text/plain;charset=UTF-8") public Response printModelUsage(@PathParam("modelId") String modelId) { - String usage = ModelFactory.getInstance().getModelUsage(modelId); - return Response.ok().entity(usage).build(); + return this.printModelUsage(modelId, null); } /** Tests for XML and JSON output */ diff --git a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java index 7f2b15ae79c5d4753781d4a97aef0b4b0ef23cdd..9ca5d7f23aecf2ee29bb36d28697fd5908573dbb 100644 --- a/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java +++ b/src/main/java/no/bioforsk/vips/model/factory/ModelFactory.java @@ -149,14 +149,13 @@ public class ModelFactory { } /** - * TODO: Add support for locale * @param modelId the id of the Model * @return usage instructions for the requested Model * */ - public String getModelUsage(String modelId) + public String getModelUsage(String modelId, String language) { - return this.models.get(modelId).getModelUsage(); + return language != null ? this.models.get(modelId).getModelUsage(language) : this.models.get(modelId).getModelUsage(); } /**