git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/nlphub@164620 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/nlphub/NLPUploader.java

@@ -79,6 +79,7 @@ public class NLPUploader extends HttpServlet {
 	private void handleFreeText(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 		String freeText = request.getParameter("freetext");
+		System.out.println("freeText: " + freeText);
 		byte[] content = freeText.getBytes("UTF-8");
 		String fileName = generateFileName();
 		PrintWriter writer = response.getWriter();

src/main/webapp/index.jsp

@@ -533,7 +533,13 @@
 			}
 		}
 
-		return mergeIndices(indices);
+		var indices2 = [];
+		for(var i=0; i<indices.length; i++) {
+			if(typeof (indices[i]) != 'undefined')
+				indices2[indices2.length] = indices[i];
+		}
+		
+		return mergeIndices(indices2);
 	}
 
 	mergeIndices = function(indices) {

src/main/webapp/js/merge.js

@@ -80,7 +80,11 @@ compareSegmentList = function(list1, list2) {
 	return true;
 }
 
-
+/**
+ * mergeAll: merge indices
+ * parameters: indices = Array of Array of indices (index = [start, end])
+ * Example: indices = [[[1,2], [4,5]], [[0,5], [7,11]]];
+ */
 
 mergeAll = function(indices) {
 	var m = [];