diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000..0641702
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,8 @@
+log4j.rootLogger=INFO,stdout
+log4j.logger.com.endeca=INFO
+# Logger for crawl metrics
+log4j.logger.com.endeca.itl.web.metrics=INFO
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%p\t%d{ISO8601}\t%r\t%c\t[%t]\t%m%n
diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js
index d3a4079..f4054f4 100644
--- a/src/main/webapp/js/main.js
+++ b/src/main/webapp/js/main.js
@@ -102,12 +102,12 @@ $(document).ready(function() {
},
onSuccess : function(files, data, xhr) {
hideProgress();
- console.log('' + data.language);
+ //console.log('' + data.language);
checkLanguage(data.language);
selectAnnotationsByLanguage();
$("#reset-upload").css("display",
"inline");
- console.log("files: " + files);
+ //console.log("files: " + files);
$("#file-info").empty();
$("#file-info")
.append(
@@ -373,6 +373,7 @@ showProgress = function() {
$(".progress-circular-div").css("left", left);
$(".progress-circular-div").css("top", top);
$(".hidden-div").css("display", "block");
+ $(".hidden-div").show();
}
/*
@@ -380,6 +381,7 @@ showProgress = function() {
*/
hideProgress = function() {
$(".hidden-div").css("display", "none");
+ $(".hidden-div").hide();
}
/*
@@ -471,7 +473,7 @@ getOutputJson = function(message) {
parameters += "&plink=" + encodeURI(publicLink);
parameters += "&lang=" + $("#language-select").val();
parameters += "&tobemap=" + encodeURI(tobemap);
- console.log(parameters);
+ //console.log(parameters);
$.ajax({
url : "/nlphub/nlphub-mapper-servlet?" + parameters,
@@ -479,7 +481,7 @@ getOutputJson = function(message) {
async : true,
success : function(data, stato) {
hideProgress();
- console.log(data);
+ //console.log(data);
if ((typeof (data.response) != "undefined")
&& (data.response.trim().toUpperCase() == "ERROR")) {
alert("ERROR\n" + data.message);
@@ -604,49 +606,46 @@ rewriteText = function(annotation, color) {
var G = enhanceColor(complement.substring(2,4));
var B = enhanceColor(complement.substring(4));
complement = "#" + R + G + B;
- console.log("-getIndices: start");
- var indices = getIndices(annotation);
- console.log("-getIndices: end");
- $("#result-header-right").empty();
- $("#result-header-right").append("" + annotation + " occurs " + indices.length + " times.");
- var indexedText = "";
+ showProgress();
+ $(".hidden-div").show();
+ window.setTimeout(function() {
+ var indices = getIndices(annotation);
+ $(".hidden-div").hide();
+
+ $("#result-header-right").empty();
+ $("#result-header-right").append("" + annotation + " occurs " + indices.length + " times.");
+ var indexedText = "";
+
+ if ((typeof (indices) == 'undefined') || (indices.length == 0)) {
+ indexedText = resultText;
+ indexedText = indexedText.replace(/\n/g, "
");
+ indexedText = indexedText.replace(//g, ">");
+ $("#result-text-div").append("
" + indexedText + "
"); + return; + } + + var t = 0; + var offset = 0; + for (var i = 0; i < indices.length; i++) { + var index = indices[i]; + var start = index[0]; + var end = index[1]; + indexedText += resultText.substring(t, start); + + var colored = "" + + resultText.substring(start, end) + ""; + indexedText += colored; + t = end; + } + if (t < resultText.length) + indexedText += resultText.substring(t); - if ((typeof (indices) == 'undefined') || (indices.length == 0)) { - indexedText = resultText; indexedText = indexedText.replace(/\n/g, "" + indexedText + "
"); - return; - } - - var t = 0; - var offset = 0; - for (var i = 0; i < indices.length; i++) { - var index = indices[i]; - var start = index[0]; - var end = index[1]; - indexedText += resultText.substring(t, start); - /* - offset += countSubstringOccurrencies(resultText.substring(t, start), - "\n"); - offset += countSubstringOccurrencies(resultText.substring(t, start), - "\r"); - offset += countSubstringOccurrencies(resultText.substring(t, start), - "\t"); - start += offset; - end += offset;*/ - var colored = "" - + resultText.substring(start, end) + ""; - indexedText += colored; - t = end; - } - if (t < resultText.length) - indexedText += resultText.substring(t); - - indexedText = indexedText.replace(/\n/g, "" + indexedText + "
"); + + }, 50); } /* @@ -699,14 +698,12 @@ getIndices = function(annotation) { * Merge the indices */ mergeIndices = function(indices) { - console.log("--mergeIndices start"); var newIndices = []; //console.log("--mergeIndices: indices.length=" + indices.length); if (indices.length == 1) newIndices = indices[0]; else newIndices = mergeAll(indices); - console.log("--mergeIndices end"); return newIndices; } diff --git a/src/main/webapp/js/merge.js b/src/main/webapp/js/merge.js index 67576db..cf52ceb 100644 --- a/src/main/webapp/js/merge.js +++ b/src/main/webapp/js/merge.js @@ -43,43 +43,6 @@ compareSegments = function(s1, s2) { return (s1[0] - s2[0]); } -cleanSegmentList = function(list) { - var cleaned = []; - for(var i=0; i