diff --git a/pom.xml b/pom.xml index d9b5c3b..fca8c73 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - org.gcube + org.gcube.data.analysis nlphub 0.0.1-SNAPSHOT war diff --git a/src/main/java/org/gcube/nlphub/NLPHub.java b/src/main/java/org/gcube/data/analysis/nlphub/NLPHub.java similarity index 93% rename from src/main/java/org/gcube/nlphub/NLPHub.java rename to src/main/java/org/gcube/data/analysis/nlphub/NLPHub.java index db67104..38e0bcb 100644 --- a/src/main/java/org/gcube/nlphub/NLPHub.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/NLPHub.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub; +package org.gcube.data.analysis.nlphub; import java.io.BufferedReader; import java.io.IOException; @@ -15,11 +15,11 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.log4j.Logger; -import org.gcube.nlphub.legacy.Constants; -import org.gcube.nlphub.legacy.JsonManager; -import org.gcube.nlphub.nlp.NlpAsyncNerRunner; -import org.gcube.nlphub.nlp.NlpParameter; -import org.gcube.nlphub.nlp.RunnerCommander; +import org.gcube.data.analysis.nlphub.legacy.Constants; +import org.gcube.data.analysis.nlphub.legacy.JsonManager; +import org.gcube.data.analysis.nlphub.nlp.NlpAsyncNerRunner; +import org.gcube.data.analysis.nlphub.nlp.NlpParameter; +import org.gcube.data.analysis.nlphub.nlp.RunnerCommander; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/org/gcube/nlphub/NLPMapper.java b/src/main/java/org/gcube/data/analysis/nlphub/NLPMapper.java similarity index 92% rename from src/main/java/org/gcube/nlphub/NLPMapper.java rename to src/main/java/org/gcube/data/analysis/nlphub/NLPMapper.java index 752ddee..cabf7ad 100644 --- a/src/main/java/org/gcube/nlphub/NLPMapper.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/NLPMapper.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub; +package org.gcube.data.analysis.nlphub; import java.io.BufferedReader; import java.io.IOException; @@ -15,12 +15,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.gcube.nlphub.workspace.WorkspaceManager; -import org.gcube.nlphub.mapper.JsonMapper; -import org.gcube.nlphub.legacy.Constants; -import org.gcube.nlphub.legacy.JsonManager; -import org.gcube.nlphub.legacy.NlpHubException; -import org.gcube.nlphub.mapper.DefaultMapper; +import org.gcube.data.analysis.nlphub.legacy.Constants; +import org.gcube.data.analysis.nlphub.legacy.JsonManager; +import org.gcube.data.analysis.nlphub.legacy.NlpHubException; +import org.gcube.data.analysis.nlphub.mapper.DefaultMapper; +import org.gcube.data.analysis.nlphub.mapper.JsonMapper; +import org.gcube.data.analysis.nlphub.workspace.WorkspaceManager; /** * Servlet implementation class NlpMapper diff --git a/src/main/java/org/gcube/nlphub/NLPUploader.java b/src/main/java/org/gcube/data/analysis/nlphub/NLPUploader.java similarity index 93% rename from src/main/java/org/gcube/nlphub/NLPUploader.java rename to src/main/java/org/gcube/data/analysis/nlphub/NLPUploader.java index 73761db..d04c124 100644 --- a/src/main/java/org/gcube/nlphub/NLPUploader.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/NLPUploader.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub; +package org.gcube.data.analysis.nlphub; //import static org.gcube.common.authorization.client.Constants.authorizationService; @@ -15,12 +15,12 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; import org.apache.log4j.Logger; -import org.gcube.nlphub.legacy.Constants; -import org.gcube.nlphub.legacy.JsonManager; -import org.gcube.nlphub.legacy.NlpHubException; -import org.gcube.nlphub.nlp.NLpLanguageRecognizer; -import org.gcube.nlphub.nlp.NlpUtils; -import org.gcube.nlphub.workspace.WorkspaceManager; +import org.gcube.data.analysis.nlphub.legacy.Constants; +import org.gcube.data.analysis.nlphub.legacy.JsonManager; +import org.gcube.data.analysis.nlphub.legacy.NlpHubException; +import org.gcube.data.analysis.nlphub.nlp.NLpLanguageRecognizer; +import org.gcube.data.analysis.nlphub.nlp.NlpUtils; +import org.gcube.data.analysis.nlphub.workspace.WorkspaceManager; /** * Servlet implementation class NLPUploader diff --git a/src/main/java/org/gcube/nlphub/legacy/AsyncHttpRequest.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/AsyncHttpRequest.java similarity index 96% rename from src/main/java/org/gcube/nlphub/legacy/AsyncHttpRequest.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/AsyncHttpRequest.java index 2933953..02a9f8a 100644 --- a/src/main/java/org/gcube/nlphub/legacy/AsyncHttpRequest.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/AsyncHttpRequest.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -7,7 +7,7 @@ import java.net.URL; import java.net.URLEncoder; import java.util.ArrayList; import org.apache.log4j.Logger; -import org.gcube.nlphub.nlp.NlpParameter; +import org.gcube.data.analysis.nlphub.nlp.NlpParameter; public class AsyncHttpRequest extends Thread { private String baseUrl, finalUrl, result, method; diff --git a/src/main/java/org/gcube/nlphub/legacy/Constants.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/Constants.java similarity index 96% rename from src/main/java/org/gcube/nlphub/legacy/Constants.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/Constants.java index 7424047..8483bc5 100644 --- a/src/main/java/org/gcube/nlphub/legacy/Constants.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/Constants.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; import javax.servlet.http.HttpServletRequest; public class Constants { diff --git a/src/main/java/org/gcube/nlphub/legacy/DataminerException.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/DataminerException.java similarity index 76% rename from src/main/java/org/gcube/nlphub/legacy/DataminerException.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/DataminerException.java index 0373c11..513c0ae 100644 --- a/src/main/java/org/gcube/nlphub/legacy/DataminerException.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/DataminerException.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; class DataminerClientException extends Exception { public DataminerClientException(String message, Throwable throwable) { diff --git a/src/main/java/org/gcube/nlphub/legacy/JsonManager.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/JsonManager.java similarity index 98% rename from src/main/java/org/gcube/nlphub/legacy/JsonManager.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/JsonManager.java index 81e9d99..8f7b530 100644 --- a/src/main/java/org/gcube/nlphub/legacy/JsonManager.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/JsonManager.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; import java.io.Reader; diff --git a/src/main/java/org/gcube/nlphub/legacy/NerAlgorithm.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAlgorithm.java similarity index 97% rename from src/main/java/org/gcube/nlphub/legacy/NerAlgorithm.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAlgorithm.java index ef1866c..cd1e036 100644 --- a/src/main/java/org/gcube/nlphub/legacy/NerAlgorithm.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAlgorithm.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; import java.util.ArrayList; import com.google.gson.JsonArray; diff --git a/src/main/java/org/gcube/nlphub/legacy/NerAnnotationData.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAnnotationData.java similarity index 97% rename from src/main/java/org/gcube/nlphub/legacy/NerAnnotationData.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAnnotationData.java index c8a3903..55d295d 100644 --- a/src/main/java/org/gcube/nlphub/legacy/NerAnnotationData.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerAnnotationData.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; import java.util.ArrayList; import com.google.gson.JsonArray; diff --git a/src/main/java/org/gcube/nlphub/legacy/NerEntity.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerEntity.java similarity index 97% rename from src/main/java/org/gcube/nlphub/legacy/NerEntity.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/NerEntity.java index 06dd53d..a2d4bd7 100644 --- a/src/main/java/org/gcube/nlphub/legacy/NerEntity.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerEntity.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; import java.util.HashMap; import java.util.Set; diff --git a/src/main/java/org/gcube/nlphub/legacy/NerOutput.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerOutput.java similarity index 98% rename from src/main/java/org/gcube/nlphub/legacy/NerOutput.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/NerOutput.java index 09beb3e..bdba0ac 100644 --- a/src/main/java/org/gcube/nlphub/legacy/NerOutput.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NerOutput.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; import java.util.ArrayList; import com.google.gson.JsonArray; diff --git a/src/main/java/org/gcube/nlphub/legacy/NlpHubException.java b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NlpHubException.java similarity index 75% rename from src/main/java/org/gcube/nlphub/legacy/NlpHubException.java rename to src/main/java/org/gcube/data/analysis/nlphub/legacy/NlpHubException.java index 4696c1b..2254307 100644 --- a/src/main/java/org/gcube/nlphub/legacy/NlpHubException.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/legacy/NlpHubException.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.legacy; +package org.gcube.data.analysis.nlphub.legacy; public class NlpHubException extends Exception { public NlpHubException(String message, Throwable throwable) { diff --git a/src/main/java/org/gcube/nlphub/mapper/DefaultMapper.java b/src/main/java/org/gcube/data/analysis/nlphub/mapper/DefaultMapper.java similarity index 93% rename from src/main/java/org/gcube/nlphub/mapper/DefaultMapper.java rename to src/main/java/org/gcube/data/analysis/nlphub/mapper/DefaultMapper.java index 105fb0c..d454eae 100644 --- a/src/main/java/org/gcube/nlphub/mapper/DefaultMapper.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/mapper/DefaultMapper.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.mapper; +package org.gcube.data.analysis.nlphub.mapper; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -11,9 +11,9 @@ import com.google.gson.JsonParser; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import org.apache.log4j.Logger; -import org.gcube.nlphub.legacy.NerAlgorithm; -import org.gcube.nlphub.legacy.NerAnnotationData; -import org.gcube.nlphub.legacy.NerEntity; +import org.gcube.data.analysis.nlphub.legacy.NerAlgorithm; +import org.gcube.data.analysis.nlphub.legacy.NerAnnotationData; +import org.gcube.data.analysis.nlphub.legacy.NerEntity; public class DefaultMapper implements JsonMapper { private Logger logger = Logger.getLogger(DefaultMapper.class.getSimpleName()); diff --git a/src/main/java/org/gcube/nlphub/mapper/JsonMapper.java b/src/main/java/org/gcube/data/analysis/nlphub/mapper/JsonMapper.java similarity index 84% rename from src/main/java/org/gcube/nlphub/mapper/JsonMapper.java rename to src/main/java/org/gcube/data/analysis/nlphub/mapper/JsonMapper.java index 08299b9..9692441 100644 --- a/src/main/java/org/gcube/nlphub/mapper/JsonMapper.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/mapper/JsonMapper.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.mapper; +package org.gcube.data.analysis.nlphub.mapper; public interface JsonMapper { diff --git a/src/main/java/org/gcube/nlphub/nlp/NLpLanguageRecognizer.java b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NLpLanguageRecognizer.java similarity index 95% rename from src/main/java/org/gcube/nlphub/nlp/NLpLanguageRecognizer.java rename to src/main/java/org/gcube/data/analysis/nlphub/nlp/NLpLanguageRecognizer.java index 6f65228..33c3bd6 100644 --- a/src/main/java/org/gcube/nlphub/nlp/NLpLanguageRecognizer.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NLpLanguageRecognizer.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.nlp; +package org.gcube.data.analysis.nlphub.nlp; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.log4j.Logger; -import org.gcube.nlphub.legacy.Constants; -import org.gcube.nlphub.legacy.JsonManager; -import org.gcube.nlphub.legacy.NlpHubException; +import org.gcube.data.analysis.nlphub.legacy.Constants; +import org.gcube.data.analysis.nlphub.legacy.JsonManager; +import org.gcube.data.analysis.nlphub.legacy.NlpHubException; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.w3c.dom.Node; diff --git a/src/main/java/org/gcube/nlphub/nlp/NlpAsyncNerRunner.java b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpAsyncNerRunner.java similarity index 97% rename from src/main/java/org/gcube/nlphub/nlp/NlpAsyncNerRunner.java rename to src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpAsyncNerRunner.java index 01aa580..348515e 100644 --- a/src/main/java/org/gcube/nlphub/nlp/NlpAsyncNerRunner.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpAsyncNerRunner.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.nlp; +package org.gcube.data.analysis.nlphub.nlp; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -12,8 +12,8 @@ import java.util.ArrayList; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.log4j.Logger; -import org.gcube.nlphub.legacy.AsyncHttpRequest; -import org.gcube.nlphub.legacy.Constants; +import org.gcube.data.analysis.nlphub.legacy.AsyncHttpRequest; +import org.gcube.data.analysis.nlphub.legacy.Constants; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/org/gcube/nlphub/nlp/NlpParameter.java b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpParameter.java similarity index 95% rename from src/main/java/org/gcube/nlphub/nlp/NlpParameter.java rename to src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpParameter.java index 22b470d..e2d771f 100644 --- a/src/main/java/org/gcube/nlphub/nlp/NlpParameter.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpParameter.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.nlp; +package org.gcube.data.analysis.nlphub.nlp; public class NlpParameter { public static String ANNOTATION_LIST = "annotations"; diff --git a/src/main/java/org/gcube/nlphub/nlp/NlpUtils.java b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpUtils.java similarity index 98% rename from src/main/java/org/gcube/nlphub/nlp/NlpUtils.java rename to src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpUtils.java index 57c8f00..f0ef235 100644 --- a/src/main/java/org/gcube/nlphub/nlp/NlpUtils.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/NlpUtils.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.nlp; +package org.gcube.data.analysis.nlphub.nlp; import java.util.ArrayList; diff --git a/src/main/java/org/gcube/nlphub/nlp/RunnerCommander.java b/src/main/java/org/gcube/data/analysis/nlphub/nlp/RunnerCommander.java similarity index 96% rename from src/main/java/org/gcube/nlphub/nlp/RunnerCommander.java rename to src/main/java/org/gcube/data/analysis/nlphub/nlp/RunnerCommander.java index 1a49ed3..269a5df 100644 --- a/src/main/java/org/gcube/nlphub/nlp/RunnerCommander.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/nlp/RunnerCommander.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.nlp; +package org.gcube.data.analysis.nlphub.nlp; import java.io.PrintWriter; import java.util.ArrayList; @@ -6,8 +6,8 @@ import java.util.ArrayList; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.gcube.nlphub.legacy.Constants; -import org.gcube.nlphub.legacy.JsonManager; +import org.gcube.data.analysis.nlphub.legacy.Constants; +import org.gcube.data.analysis.nlphub.legacy.JsonManager; public class RunnerCommander extends Thread { private HttpServletResponse response = null; diff --git a/src/main/java/org/gcube/nlphub/workspace/WorkspaceManager.java b/src/main/java/org/gcube/data/analysis/nlphub/workspace/WorkspaceManager.java similarity index 95% rename from src/main/java/org/gcube/nlphub/workspace/WorkspaceManager.java rename to src/main/java/org/gcube/data/analysis/nlphub/workspace/WorkspaceManager.java index d7a4a06..1b4b8c6 100644 --- a/src/main/java/org/gcube/nlphub/workspace/WorkspaceManager.java +++ b/src/main/java/org/gcube/data/analysis/nlphub/workspace/WorkspaceManager.java @@ -1,4 +1,4 @@ -package org.gcube.nlphub.workspace; +package org.gcube.data.analysis.nlphub.workspace; import static org.gcube.common.authorization.client.Constants.authorizationService; @@ -13,9 +13,9 @@ import java.net.URLEncoder; import javax.servlet.http.Part; import org.apache.log4j.Logger; -import org.gcube.nlphub.NLPUploader; -import org.gcube.nlphub.legacy.Constants; -import org.gcube.nlphub.legacy.NlpHubException; +import org.gcube.data.analysis.nlphub.NLPUploader; +import org.gcube.data.analysis.nlphub.legacy.Constants; +import org.gcube.data.analysis.nlphub.legacy.NlpHubException; public class WorkspaceManager { private Logger logger = Logger.getLogger(WorkspaceManager.class.getSimpleName()); diff --git a/src/main/webapp/WEB-INF/gcube-app.xml b/src/main/webapp/WEB-INF/gcube-app.xml new file mode 100644 index 0000000..4bad841 --- /dev/null +++ b/src/main/webapp/WEB-INF/gcube-app.xml @@ -0,0 +1,9 @@ + + + nlphub + org.gcube.data.analysis + 1.0.0 + + NLPHub webapp + + \ No newline at end of file diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 3d12e4e..642b85b 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,4 +1,4 @@ -<%@ page import="org.gcube.nlphub.legacy.Constants" %> +<%@ page import="org.gcube.data.analysis.nlphub.legacy.Constants" %> @@ -25,6 +25,7 @@ var inputFile = '<%= ((request.getParameter(Constants.INPUT_FILE_PARAMETER) == null) ? "" : "" + request.getParameter(Constants.INPUT_FILE_PARAMETER)) %>'; var gCubeToken = '<%= ((request.getParameter(Constants.TOKEN_PARAMETER) == null) ? "" : "" + request.getParameter(Constants.TOKEN_PARAMETER)) %>'; var scheme = '<%= request.getScheme() %>'; + var contextPath = '<%= request.getContextPath() %>'; diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js index cca2212..0cc0fb6 100644 --- a/src/main/webapp/js/main.js +++ b/src/main/webapp/js/main.js @@ -15,7 +15,8 @@ var checkedAnnotation = ""; var algIndexedArray = []; var computedLanguage = ""; var dataMiner = ""; -var appRoot = "."; +var appLocation = window.location.href; +var appRoot = ""; // ------------------------------------------------------------------------------------------------------ // Starting point: get the csv file with algorithm parameters and set the page @@ -23,6 +24,9 @@ var appRoot = "."; // ------------------------------------------------------------------------------------------------------ $(document).ready(function() { + console.log('HREF: '+appLocation); + appRoot=contextPath; + console.log('appRoot: '+ appRoot ); $(".popup-text").hide(); disableExecuteButton(); showAnnotationsList(); @@ -1006,26 +1010,31 @@ getIndices = function() { var indices = []; // get indices for (var i = 0; i < jsonContent.output.result.length; i++) { - // filter on algorithm - var found = false; - for (var j = 0; j < checkedAlgs.length; j++) { - if (checkedAlgs[j].getAttribute("named") == jsonContent.output.result[i].algorithm) { - found = true; - break; + if (typeof jsonContent.output.result[i] === 'undefined' + || jsonContent.output.result[i] == null) { + console.log("No result for " + i); + } else { + // filter on algorithm + var found = false; + for (var j = 0; j < checkedAlgs.length; j++) { + if (checkedAlgs[j].getAttribute("named") == jsonContent.output.result[i].algorithm) { + found = true; + break; + } } - } - if (!found) - continue; + if (!found) + continue; - var entities = jsonContent.output.result[i].entities; - for (var j = 0; j < entities.length; j++) { - // filter on annotation - a = entities[j][checkedAnnotation]; - if (typeof a != 'undefined') { - indices[i] = []; - for (var k = 0; k < a.length; k++) { - var index = a[k].indices; - indices[i][k] = index; + var entities = jsonContent.output.result[i].entities; + for (var j = 0; j < entities.length; j++) { + // filter on annotation + a = entities[j][checkedAnnotation]; + if (typeof a != 'undefined') { + indices[i] = []; + for (var k = 0; k < a.length; k++) { + var index = a[k].indices; + indices[i][k] = index; + } } } }