diff --git a/devops/deploy/docker-compose.yml b/devops/deploy/docker-compose.yml index 5f369d41bd..c095ff6326 100644 --- a/devops/deploy/docker-compose.yml +++ b/devops/deploy/docker-compose.yml @@ -106,7 +106,7 @@ services: WILDBOOK_LOG_LEVEL: "${WILDBOOK_LOG_LEVEL:-INFO}" opensearch: - image: opensearchproject/opensearch:2.15.0 + image: opensearchproject/opensearch:3.1.0 container_name: opensearch healthcheck: # Check cluster health and verify status is not "red" @@ -295,4 +295,4 @@ volumes: db-pgdata-var: opensearch-var1: alloy-data: - postgresql-logs: \ No newline at end of file + postgresql-logs: diff --git a/pom.xml b/pom.xml index 621f603316..5c8bf083de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.ecocean wildbook - 10.10.0 + 10.10.1 war diff --git a/src/main/webapp/appadmin/catchUpEmbeddings.jsp b/src/main/webapp/appadmin/catchUpEmbeddings.jsp new file mode 100644 index 0000000000..01788dbe84 --- /dev/null +++ b/src/main/webapp/appadmin/catchUpEmbeddings.jsp @@ -0,0 +1,32 @@ +<%@ page contentType="text/plain; charset=utf-8" language="java" import="org.ecocean.servlet.ServletUtilities,java.util.Properties, java.io.FileInputStream, +org.ecocean.shepherd.core.Shepherd, +org.ecocean.ia.*, +org.ecocean.ia.plugin.*, +org.ecocean.identity.IBEISIA, + +java.util.ArrayList, +org.json.JSONObject, + +java.io.File, java.io.FileNotFoundException, org.ecocean.*" %> +<% + +String context = ServletUtilities.getContext(request); +Shepherd myShepherd = new Shepherd(context); +myShepherd.beginDBTransaction(); + +// integer arg below is how big a batch to run; adjust if desired +// see Embedding.catchUpEmbeddings() for details on what this does +JSONObject res = Embedding.catchUpEmbeddings(myShepherd, null, 100); + +JSONObject show = new JSONObject(); +show.put("_runCount", res.get("_runCount")); +show.put("_runOk", res.get("_runOk")); +show.put("_runIds", res.get("_runIds")); + +out.println(show.toString(4)); + + +myShepherd.commitDBTransaction(); +%> + +