From c724cad519801c11b7d5ddd57312f3d921727b06 Mon Sep 17 00:00:00 2001
From: Patrick Simianer <p@simianer.de>
Date: Fri, 29 Jan 2016 18:21:39 +0100
Subject: refactoring, support for polling

---
 js/interface.js | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 js/lfpe.js      | 425 -----------------------------------------------
 server.rb       |  86 ++++++++--
 3 files changed, 576 insertions(+), 437 deletions(-)
 create mode 100644 js/interface.js
 delete mode 100644 js/lfpe.js

diff --git a/js/interface.js b/js/interface.js
new file mode 100644
index 0000000..77a94bb
--- /dev/null
+++ b/js/interface.js
@@ -0,0 +1,502 @@
+/*
+ * (common) global vars
+ *
+ */
+var data,    // global data object
+    ui_type; // 't' (text) or 'g' (graphical)
+
+/*
+ * cross-site request
+ *
+ */
+var create_cors_req = function (method, url)
+{
+  var xhr = new XMLHttpRequest();
+  if ("withCredentials" in xhr) {
+    xhr.open(method, url, true);
+    xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded; charset=UTF-8');
+  } else {
+    xhr = null;
+  }
+
+  return xhr;
+}
+
+/*
+ * Timer
+ *
+ */
+var Timer = {
+  start_t: 0,
+  pause_start_t: 0,
+  pause_acc_t: 0,
+  paused: false,
+
+  start: function () {
+    this.start_t = Date.now();
+    this.pause_start_t = 0;
+    this.pause_acc_t = 0;
+    this.paused = false;
+  },
+  pause: function () {
+    this.paused = true;
+    this.pause_start_t = Date.now();
+  },
+  unpause: function () {
+    this.paused = false;
+    this.pause_acc_t += Date.now()-this.pause_start_t;
+    this.pause_start_t = 0;
+  },
+  get: function () {
+    return (Date.now()-this.start_t)-this.pause_acc_t;
+  }
+}
+
+/*
+ * pause/unpause timer
+ *
+ */
+var pause = function ()
+{
+  var paused          = document.getElementById("paused");
+  var button          = document.getElementById("pause_button");
+  var next_button     = document.getElementById("next");
+  var target_textarea = document.getElementById("target_textarea")
+  var initialized     = document.getElementById("init");
+
+  if (paused.value == 0) {
+    button.innerHTML = "Unpause";
+    paused.value = 1;
+    next.setAttribute("disabled", "disabled");
+    target_textarea.setAttribute("disabled", "disabled");
+    Timer.pause();
+  } else {
+    button.innerHTML = "Pause";
+    paused.value = 0;
+    next.removeAttribute("disabled");
+    if (initialized.value != "") {
+      target_textarea.removeAttribute("disabled");
+    }
+    Timer.unpause();
+  }
+}
+
+/*
+ * no newline on return in textarea
+ *
+ */
+var catch_return = function (e)
+{
+  if (e.keyCode == 13) {
+    e.preventDefault();
+    Next();
+  }
+
+  return false;
+}
+
+/*
+ * working/not working
+ *
+ */
+var working = function ()
+{
+  // elements
+  var button              = document.getElementById("next");
+  var pause_button        = document.getElementById("pause_button");
+  var target_textarea     = document.getElementById("target_textarea")
+  var raw_source_textarea = document.getElementById("raw_source_textarea");
+  var current_seg_id      = document.getElementById("current_seg_id");
+  var source              = document.getElementById("source");
+  var status              = document.getElementById("status");
+  var oov_correct         = document.getElementById("oov_correct");
+  var last_post_edit      = document.getElementById("last_post_edit");
+
+  if ($("#ui_type").val() == "t") {
+    $("#textboxes").fadeTo(200,0.1);
+  } else {
+    $("#derivation_editor").fadeTo(200,0.1);
+  }
+
+  // show 'working' message
+  $("#status").fadeToggle();
+
+  // disable button and textarea
+           button.setAttribute("disabled", "disabled");
+     pause_button.setAttribute("disabled", "disabled");
+  target_textarea.setAttribute("disabled", "disabled");
+  document.getElementById("reset_button").setAttribute("disabled", "disabled");
+
+  DE_locked = true;
+}
+function not_working(fadein=true)
+{
+  document.getElementById("reset_button").removeAttribute("disabled");
+  // elements
+  var button              = document.getElementById("next");
+  var pause_button        = document.getElementById("pause_button");
+  var target_textarea     = document.getElementById("target_textarea")
+  var raw_source_textarea = document.getElementById("raw_source_textarea");
+  var current_seg_id      = document.getElementById("current_seg_id");
+  var source              = document.getElementById("source");
+  var status              = document.getElementById("status");
+  var oov_correct         = document.getElementById("oov_correct");
+  var last_post_edit      = document.getElementById("last_post_edit");
+
+  if (fadein) {
+  if ($("#ui_type").val() == "t") {
+    $("#textboxes").fadeTo(200,1);
+  } else {
+    $("#derivation_editor").fadeTo(200,1);
+  }
+  }
+
+  // hide 'working' message
+  $("#status").fadeToggle();
+
+  // enable buttons
+          document.getElementById("next").removeAttribute("disabled");
+  document.getElementById("pause_button").removeAttribute("disabled");
+  document.getElementById("reset_button").removeAttribute("disabled");
+
+  DE_locked = false;
+}
+
+/*
+ * polling the server
+ *
+ */
+var poll = function (url_prefix)
+{
+  setTimeout(function(){
+     $.get(url_prefix+"/status").done(function(response){
+       $("#status_detail").text(response);
+       if (response == "Ready") {
+         ready = true;
+         request_and_process_next();
+         return;
+       } else {
+         poll(url_prefix);
+       }
+     });
+  }, 1000);
+}
+
+/*
+ * next button
+ *
+ */
+var next =  function ()
+{
+  // elements
+  var button              = document.getElementById("next");
+  var pause_button        = document.getElementById("pause_button");
+  var target_textarea     = document.getElementById("target_textarea")
+  var raw_source_textarea = document.getElementById("raw_source_textarea");
+  var current_seg_id      = document.getElementById("current_seg_id");
+  var source              = document.getElementById("source");
+  var status              = document.getElementById("status");
+  var oov_correct         = document.getElementById("oov_correct");
+  var last_post_edit      = document.getElementById("last_post_edit");
+
+  working();
+
+  // get metadata stored in DOM
+  var base_url = "http://coltrane.cl.uni-heidelberg.de";
+  var port     = document.getElementById("port").value;
+  var key      = document.getElementById("key").value;
+
+  // url
+  next_url = base_url+":"+port+"/next";
+
+  // post edit
+  var post_edit = '';
+  var send_data = new Object();
+
+  // extract data from interfaces
+  if (ui_type == 'g') {
+    data_s = DE_extract_data();
+    if (!data_s) {
+      not_working();
+      return;
+    }
+    send_data = JSON.parse(data_s);
+    post_edit = $.trim(send_data["target"].join(" "));
+    if (DE_target_done.length != DE_target_shapes.length)
+      post_edit = "";
+    send_data["post_edit"] = encodeURIComponent(post_edit);
+    send_data['type'] = 'g';
+    send_data["original_svg"] = document.getElementById("original_svg").value;
+  } else {
+    post_edit = $.trim(target_textarea.value);
+    send_data["post_edit"] = post_edit;
+    send_data['type'] = 't';
+  }
+
+  send_data["key"] = key;
+
+  // send data
+  if (oov_correct.value=="false" && post_edit != "") {
+      send_data["EDIT"] = true;
+      send_data["duration"] = Timer.get();
+      send_data["source_value"] = encodeURIComponent(source.value);
+      // compose request
+      // no change?
+      if (post_edit == last_post_edit.value) {
+        send_data["nochange"] = true;
+      }
+      // update document overview
+      document.getElementById("seg_"+(current_seg_id.value)+"_t").innerHTML=decodeURIComponent(post_edit);
+  // OOV correction mode
+  } else if (oov_correct.value=="true") {
+     send_data["OOV"] = true;
+     var l = document.getElementById("oov_num_items").value;
+     var src = [];
+     var tgt = [];
+     for (var i=0; i<l; i++) {
+       src.push(encodeURIComponent($.trim(document.getElementById("oov_src"+i).value)));
+       tgt.push(encodeURIComponent($.trim(document.getElementById("oov_tgt"+i).value)));
+       if (tgt[tgt.length-1] == "") { // empty correction
+         alert("Please provide translations for all words.");
+         not_working();
+
+         return;
+       }
+     }
+     var l = document.getElementById("oov_fields").children.length;
+     for (var i=0; i<l; i++)
+       { document.getElementById("oov_fields").children[0].remove(); }
+    $("#oov_form").toggle("blind");
+    $("#next").val("Next");
+     send_data["correct"] = src.join("\t") + " ||| " + tgt.join("\t");
+  } else {
+    if (source.value != "") {
+      alert("Please provide a post-edit and mark all phrases as finished.");
+      target_textarea.removeAttribute("disabled", "disabled");
+         pause_button.removeAttribute("disabled", "disabled");
+               button.removeAttribute("disabled", "disabled");
+      not_working();
+      return;
+    }
+  }
+
+  // confirm to server
+  if (document.getElementById("init").value != "") {
+    var xhr_confirm = create_cors_req('get', base_url+":"+port+"/confirm");
+    xhr_confirm.send(); // FIXME handle errors
+  }
+
+  // build request
+  var xhr = create_cors_req('post', next_url);
+  if (!xhr) {
+    alert("Error: 2"); // FIXME do something reasonable
+  }
+  xhr.onerror = function (e) { alert("XHR ERRROR 1x " + e.target.status); }
+  xhr.send(JSON.stringify(send_data)); // send 'next' request
+
+  poll(base_url+":"+port);
+}
+
+var request_and_process_next = function ()
+{
+  // elements
+  var button              = document.getElementById("next");
+  var pause_button        = document.getElementById("pause_button");
+  var target_textarea     = document.getElementById("target_textarea")
+  var raw_source_textarea = document.getElementById("raw_source_textarea");
+  var current_seg_id      = document.getElementById("current_seg_id");
+  var source              = document.getElementById("source");
+  var status              = document.getElementById("status");
+  var oov_correct         = document.getElementById("oov_correct");
+  var last_post_edit      = document.getElementById("last_post_edit");
+
+  // get metadata stored in DOM
+  var base_url = "http://coltrane.cl.uni-heidelberg.de";
+  var port     = document.getElementById("port").value;
+  var key      = document.getElementById("key").value;
+
+  // url
+  next_url = base_url+":"+port+"/next";
+
+  var xhr = create_cors_req('get', base_url+":"+port+"/fetch");
+  if (!xhr) {
+    alert("Error: 2"); // FIXME do something reasonable
+  }
+  xhr.onerror = function (e) { alert("XHR ERRROR 1 " + e.target.status); }
+  xhr.send(); // send 'next' request
+
+  // 'next' request's callbacks
+  xhr.onload = function() {
+    if (xhr.readyState != 4 || xhr.status!=200) { alert("XHR ERROR 2"); return; }
+
+    document.getElementById("init").value = 1; // for pause()
+     // translation system is currently handling a request
+     // FIXME maybe poll server for result?
+     if (xhr.responseText == "locked") {
+       alert("Translation system is locked, try again in a moment (reload the page and click 'Start/Continue').");
+       not_working();
+
+       return;
+     }
+
+    data = JSON.parse(xhr.responseText)
+    document.getElementById("data").value = xhr.responseText;
+
+    // done, disable interface
+    if (data["fin"]) {
+      target_textarea.setAttribute("disabled", "disabled");
+      status.style.display              = "none";
+      button.innerHTML                  = "Session finished, thank you!";
+      $("#raw_source_textarea").html("");
+      $("#target_textarea").val("");
+      $("#target_textarea").attr("rows", 1);
+            button.setAttribute("disabled", "disabled");
+      pause_button.setAttribute("disabled", "disabled");
+      if (current_seg_id.value)
+        $("#seg_"+current_seg_id.value).removeClass("bold");
+
+      return;
+
+    // enter OOV correct mode
+    } else if (data["oovs"]) {
+      var append_to = document.getElementById("oov_fields");
+      document.getElementById("oov_num_items").value = data["oovs"].length;
+      if ($("#ui_type").val() == "t") {
+        $("#textboxes").fadeTo(200,0.1);
+      } else {
+        $("#derivation_editor").fadeTo(200,0.1);
+      }
+      $("#oov_context").html(data["raw_source"].replace(/\*\*\*/g,"<u>").replace(/###/g,"</u>"));
+      for (var i=0; i<data["oovs"].length; i++) {
+        var node_src = document.createElement("input");
+        var node_tgt = document.createElement("input");
+        node_src.type = "text";
+        node_tgt.type = "text";
+        node_src.id = "oov_src"+i;
+        node_tgt.id = "oov_tgt"+i;
+        node_src.value = data["oovs"][i];
+        node_src.setAttribute("disabled", "disabled");
+        append_to.appendChild(node_src);
+        append_to.appendChild(node_tgt);
+        append_to.appendChild(document.createElement("br"));
+        $("#oov_src"+i).attr({width: 'auto', size: $("#oov_src"+i).val().length});
+        node_tgt.onkeypress = function (event) {
+          $(this).attr({width: 'auto', size: 5+$(this).val().length});
+          catch_return(event);
+        }
+      }
+      oov_correct.value = true;
+
+      $("#oov_form").toggle("blind");
+      $("#next").html("Next");
+      $("#oov_tgt0").focus();
+      not_working(false);
+      DE_locked = true;
+
+    // translation mode
+    } else {
+      if ($("#ui_type").val() == "t") {
+        $("#textboxes").fadeTo(200,1);
+      } else {
+        $("#derivation_editor").fadeTo(200,1);
+      }
+
+      var id          = data["progress"];
+      var src         = data["source"];
+      var translation = data["transl_detok"];
+      var raw_source  = data["raw_source"];
+
+      // update interface
+      oov_correct.value         = false;
+      status.style.display      = "none";
+      if (!translation) {
+        target_textarea.value   = "";
+      } else {
+        target_textarea.value   = translation;
+      }
+      //raw_source_textarea.value = raw_source;
+      $("#raw_source_textarea").html(raw_source);
+      button.innerHTML          = "Next";
+               button.removeAttribute("disabled");
+      target_textarea.removeAttribute("disabled", "disabled");
+         pause_button.removeAttribute("disabled", "disabled");
+         document.getElementById("reset_button").removeAttribute("disabled");
+      document.getElementById("seg_"+id).className += " bold";
+      if (id > 0) {
+        $("#seg_"+(id-1)).removeClass("bold");
+      }
+      if (translation)
+        target_textarea.rows     = Math.round(translation.length/80+0.5);
+      //raw_source_textarea.rows = Math.round(raw_source.length/80+0.5);
+      target_textarea.focus();
+      target_textarea.selectionStart = 0;
+      target_textarea.selectionEnd   = 0;
+
+      // remember aux data in DOM
+      current_seg_id.value = id;
+      source.value         = src;
+      last_post_edit.value = translation;
+
+      // confirm to server
+      var xhr_confirm = create_cors_req('get', base_url+":"+port+"/confirm");
+      xhr_confirm.send(); // FIXME handle errors
+
+      // load data into graphical UI
+      if (ui_type == "g") {
+        DE_init();
+        var x = $.trim(JSON.parse(DE_extract_data())["target"].join(" "));
+        last_post_edit.value = x;
+        document.getElementById("original_svg").value = DE_get_raw_svg_data();
+      }
+
+      // start timer
+      Timer.start();
+    }
+  };
+
+  return;
+}
+
+/*
+ * init text interface
+ *
+ */
+var init_text_editor = function ()
+{
+  document.getElementById("target_textarea").value     = "";
+  document.getElementById("target_textarea").setAttribute("disabled", "disabled");
+
+  return false;
+}
+
+/*
+ * init site
+ *
+ */
+window.onload = function ()
+{
+  // reset vars
+  document.getElementById("source").value              = "";
+  document.getElementById("current_seg_id").value      = "";
+  document.getElementById("paused").value              = "";
+  document.getElementById("oov_correct").value         = false;
+  document.getElementById("displayed_oov_hint").value  = false;
+  document.getElementById("init").value                = "";
+  document.getElementById("reset_button").setAttribute("disabled", "disabled");
+
+  not_working();
+
+  ui_type = document.getElementById("ui_type").value;
+
+  // graphical derivation editor
+  if (ui_type == "g") {
+    document.getElementById("derivation_editor").style.display = "block";
+
+  // text based editor
+  } else {
+    init_text_editor();
+    document.getElementById("textboxes").style.display = "block";
+  }
+
+};
+
diff --git a/js/lfpe.js b/js/lfpe.js
deleted file mode 100644
index 152c668..0000000
--- a/js/lfpe.js
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Timer
- *
- */
-var Timer = {
-  start_t: 0,
-  pause_start_t: 0,
-  pause_acc_t: 0,
-  paused: false,
-
-  start: function() {
-    this.start_t = Date.now();
-    this.pause_start_t = 0;
-    this.pause_acc_t = 0;
-    this.paused = false;
-  },
-  pause: function() {
-    this.paused = true;
-    this.pause_start_t = Date.now();
-  },
-  unpause: function() {
-    this.paused = false;
-    this.pause_acc_t += Date.now()-this.pause_start_t;
-    this.pause_start_t = 0;
-  },
-  get: function() {
-    return (Date.now()-this.start_t)-this.pause_acc_t;
-  }
-}
-
-/*
- * pause/unpause timer
- *
- */
-function pause()
-{
-  var paused          = document.getElementById("paused");
-  var button          = document.getElementById("pause_button");
-  var next_button     = document.getElementById("next");
-  var target_textarea = document.getElementById("target_textarea")
-  var initialized     = document.getElementById("init");
-
-  if (paused.value == 0) {
-    button.innerHTML = "Unpause";
-    paused.value = 1;
-    next.setAttribute("disabled", "disabled");
-    target_textarea.setAttribute("disabled", "disabled");
-    Timer.pause();
-  } else {
-    button.innerHTML = "Pause";
-    paused.value = 0;
-    next.removeAttribute("disabled");
-    if (initialized.value != "") {
-      target_textarea.removeAttribute("disabled");
-    }
-    Timer.unpause();
-  }
-}
-
-/*
- * no newline on return in textarea
- *
- */
-function catch_return(e)
-{
-  if (e.keyCode == 13) {
-    e.preventDefault();
-    Next();
-  }
-
-  return false;
-}
-
-/*
- * working/not working
- *
- */
-function working()
-{
-  // elements
-  var button              = document.getElementById("next");
-  var pause_button        = document.getElementById("pause_button");
-  var target_textarea     = document.getElementById("target_textarea")
-  var raw_source_textarea = document.getElementById("raw_source_textarea");
-  var current_seg_id      = document.getElementById("current_seg_id");
-  var source              = document.getElementById("source");
-  var status              = document.getElementById("status");
-  var oov_correct         = document.getElementById("oov_correct");
-  var last_post_edit      = document.getElementById("last_post_edit");
-
-  if ($("#ui_type").val() == "t") {
-    $("#textboxes").fadeTo(200,0.1);
-  } else {
-    $("#derivation_editor").fadeTo(200,0.1);
-  }
-
-  // show 'working' message
-  $("#status").fadeToggle();
-
-  // disable button and textarea
-           button.setAttribute("disabled", "disabled");
-     pause_button.setAttribute("disabled", "disabled");
-  target_textarea.setAttribute("disabled", "disabled");
-  document.getElementById("reset_button").setAttribute("disabled", "disabled");
-
-  DE_locked = true;
-}
-function not_working(fadein=true)
-{
-  document.getElementById("reset_button").removeAttribute("disabled");
-  // elements
-  var button              = document.getElementById("next");
-  var pause_button        = document.getElementById("pause_button");
-  var target_textarea     = document.getElementById("target_textarea")
-  var raw_source_textarea = document.getElementById("raw_source_textarea");
-  var current_seg_id      = document.getElementById("current_seg_id");
-  var source              = document.getElementById("source");
-  var status              = document.getElementById("status");
-  var oov_correct         = document.getElementById("oov_correct");
-  var last_post_edit      = document.getElementById("last_post_edit");
-
-  if (fadein) {
-  if ($("#ui_type").val() == "t") {
-    $("#textboxes").fadeTo(200,1);
-  } else {
-    $("#derivation_editor").fadeTo(200,1);
-  }
-  }
-
-  // hide 'working' message
-  $("#status").fadeToggle();
-
-  // enable buttons
-          document.getElementById("next").removeAttribute("disabled");
-  document.getElementById("pause_button").removeAttribute("disabled");
-  document.getElementById("reset_button").removeAttribute("disabled");
-
-  DE_locked = false;
-}
-
-/*
- * next button
- *
- */
-function Next()
-{
-  // elements
-  var button              = document.getElementById("next");
-  var pause_button        = document.getElementById("pause_button");
-  var target_textarea     = document.getElementById("target_textarea")
-  var raw_source_textarea = document.getElementById("raw_source_textarea");
-  var current_seg_id      = document.getElementById("current_seg_id");
-  var source              = document.getElementById("source");
-  var status              = document.getElementById("status");
-  var oov_correct         = document.getElementById("oov_correct");
-  var last_post_edit      = document.getElementById("last_post_edit");
-
-  working();
-
-  // get metadata stored in DOM
-  var base_url = "http://coltrane.cl.uni-heidelberg.de";
-  var port     = document.getElementById("port").value;
-  var key      = document.getElementById("key").value;
-
-  // url
-  next_url = base_url+":"+port+"/next";
-
-  // post edit
-  var post_edit = '';
-  var send_data = new Object();
-
-  // extract data from interfaces
-  if (ui_type == 'g') {
-    data_s = DE_extract_data();
-    if (!data_s) {
-      not_working();
-      return;
-    }
-    send_data = JSON.parse(data_s);
-    post_edit = trim(send_data["target"].join(" "));
-    if (DE_target_done.length != DE_target_shapes.length)
-      post_edit = "";
-    send_data["post_edit"] = encodeURIComponent(post_edit);
-    send_data['type'] = 'g';
-    send_data["original_svg"] = document.getElementById("original_svg").value;
-  } else {
-    post_edit = trim(target_textarea.value);
-    send_data["post_edit"] = post_edit;
-    send_data['type'] = 't';
-  }
-
-  send_data["key"] = key;
-
-  // send data
-  if (oov_correct.value=="false" && post_edit != "") {
-      send_data["EDIT"] = true;
-      send_data["duration"] = Timer.get();
-      send_data["source_value"] = encodeURIComponent(source.value);
-      // compose request
-      // no change?
-      if (post_edit == last_post_edit.value) {
-        send_data["nochange"] = true;
-      }
-      // update document overview
-      document.getElementById("seg_"+(current_seg_id.value)+"_t").innerHTML=decodeURIComponent(post_edit);
-  // OOV correction mode
-  } else if (oov_correct.value=="true") {
-     send_data["OOV"] = true;
-     var l = document.getElementById("oov_num_items").value;
-     var src = [];
-     var tgt = [];
-     for (var i=0; i<l; i++) {
-       src.push(encodeURIComponent(trim(document.getElementById("oov_src"+i).value)));
-       tgt.push(encodeURIComponent(trim(document.getElementById("oov_tgt"+i).value)));
-       if (tgt[tgt.length-1] == "") { // empty correction
-         alert("Please provide translations for all words.");
-         not_working();
-
-         return;
-       }
-     }
-     var l = document.getElementById("oov_fields").children.length;
-     for (var i=0; i<l; i++)
-       { document.getElementById("oov_fields").children[0].remove(); }
-    $("#oov_form").toggle("blind");
-    $("#next").val("Next");
-     send_data["correct"] = src.join("\t") + " ||| " + tgt.join("\t");
-  } else {
-    if (source.value != "") {
-      alert("Please provide a post-edit and mark all phrases as finished.");
-      target_textarea.removeAttribute("disabled", "disabled");
-         pause_button.removeAttribute("disabled", "disabled");
-               button.removeAttribute("disabled", "disabled");
-      not_working();
-      return;
-    }
-  }
-
-  // confirm to server
-  if (document.getElementById("init").value != "") {
-    var xhr_confirm = CreateCORSRequest('get', base_url+":"+port+"/confirm");
-    xhr_confirm.send(); // FIXME handle errors
-  }
-
-  // build request
-  var xhr = CreateCORSRequest('post', next_url);
-  if (!xhr) {
-    alert("Error: 2"); // FIXME do something reasonable
-  }
-
-  // 'next' request's callbacks
-  xhr.onload = function() {
-    if (xhr.readyState != 4 || xhr.status!=200) { alert("XHR ERROR 2"); return; }
-
-    document.getElementById("init").value = 1; // for pause()
-     // translation system is currently handling a request
-     // FIXME maybe poll server for result?
-     if (xhr.responseText == "locked") {
-       alert("Translation system is locked, try again in a moment (reload the page and click 'Start/Continue').");
-       not_working();
-
-       return;
-     }
-
-    data = JSON.parse(xhr.responseText)
-    document.getElementById("data").value = xhr.responseText;
-
-    // done, disable interface
-    if (data["fin"]) {
-      target_textarea.setAttribute("disabled", "disabled");
-      status.style.display              = "none";
-      button.innerHTML                  = "Session finished, thank you!";
-      $("#raw_source_textarea").html("");
-      $("#target_textarea").val("");
-      $("#target_textarea").attr("rows", 1);
-            button.setAttribute("disabled", "disabled");
-      pause_button.setAttribute("disabled", "disabled");
-      if (current_seg_id.value)
-        removeClass(document.getElementById("seg_"+current_seg_id.value), "bold");
-
-      return;
-
-    // enter OOV correct mode
-    } else if (data["oovs"]) {
-      var append_to = document.getElementById("oov_fields");
-      document.getElementById("oov_num_items").value = data["oovs"].length;
-      if ($("#ui_type").val() == "t") {
-        $("#textboxes").fadeTo(200,0.1);
-      } else {
-        $("#derivation_editor").fadeTo(200,0.1);
-      }
-      $("#oov_context").html(data["raw_source"].replace(/\*\*\*/g,"<strong>").replace(/###/g,"</strong>"));
-      for (var i=0; i<data["oovs"].length; i++) {
-        var node_src = document.createElement("input");
-        var node_tgt = document.createElement("input");
-        node_src.type = "text";
-        node_tgt.type = "text";
-        node_src.id = "oov_src"+i;
-        node_tgt.id = "oov_tgt"+i;
-        node_src.value = data["oovs"][i];
-        node_src.setAttribute("disabled", "disabled");
-        append_to.appendChild(node_src);
-        append_to.appendChild(node_tgt);
-        append_to.appendChild(document.createElement("br"));
-        $("#oov_src"+i).attr({width: 'auto', size: $("#oov_src"+i).val().length});
-        node_tgt.onkeypress = function (event) {
-          $(this).attr({width: 'auto', size: 5+$(this).val().length});
-          catch_return(event);
-        }
-      }
-      oov_correct.value = true;
-
-      $("#oov_form").toggle("blind");
-      $("#next").html("Next");
-      $("#oov_tgt0").focus();
-      not_working(false);
-      DE_locked = true;
-
-    // translation mode
-    } else {
-      if ($("#ui_type").val() == "t") {
-        $("#textboxes").fadeTo(200,1);
-      } else {
-        $("#derivation_editor").fadeTo(200,1);
-      }
-
-      var id          = data["progress"];
-      var src         = data["source"];
-      var translation = data["transl_detok"];
-      var raw_source  = data["raw_source"];
-
-      // update interface
-      oov_correct.value         = false;
-      status.style.display      = "none";
-      if (!translation) {
-        target_textarea.value   = "";
-      } else {
-        target_textarea.value   = translation;
-      }
-      //raw_source_textarea.value = raw_source;
-      $("#raw_source_textarea").html(raw_source);
-      button.innerHTML          = "Next";
-               button.removeAttribute("disabled");
-      target_textarea.removeAttribute("disabled", "disabled");
-         pause_button.removeAttribute("disabled", "disabled");
-         document.getElementById("reset_button").removeAttribute("disabled");
-      document.getElementById("seg_"+id).className += " bold";
-      if (id > 0) {
-        removeClass(document.getElementById("seg_"+(id-1)), "bold");
-      }
-      if (translation)
-        target_textarea.rows     = Math.round(translation.length/80+0.5);
-      //raw_source_textarea.rows = Math.round(raw_source.length/80+0.5);
-      target_textarea.focus();
-      target_textarea.selectionStart = 0;
-      target_textarea.selectionEnd   = 0;
-
-      // remember aux data in DOM
-      current_seg_id.value = id;
-      source.value         = src;
-      last_post_edit.value = translation;
-
-      // confirm to server
-      var xhr_confirm = CreateCORSRequest('get', base_url+":"+port+"/confirm");
-      xhr_confirm.send(); // FIXME handle errors
-
-      // load data into graphical UI
-      if (ui_type == "g") {
-        DE_init();
-        var x = trim(JSON.parse(DE_extract_data())["target"].join(" "));
-        last_post_edit.value = x;
-        document.getElementById("original_svg").value = DE_get_raw_svg_data();
-      }
-
-      // start timer
-      Timer.start();
-    }
-  };
-
-  xhr.send(JSON.stringify(send_data)); // send 'next' request
-
-  return;
-}
-
-/*
- * init text interface
- *
- */
-function init_text_editor()
-{
-  document.getElementById("target_textarea").value     = "";
-  document.getElementById("target_textarea").setAttribute("disabled", "disabled");
-
-  return false;
-}
-
-/*
- * init site
- *
- */
-window.onload = function ()
-{
-  // reset vars
-  document.getElementById("source").value              = "";
-  document.getElementById("current_seg_id").value      = "";
-  document.getElementById("paused").value              = "";
-  document.getElementById("oov_correct").value         = false;
-  document.getElementById("displayed_oov_hint").value  = false;
-  document.getElementById("init").value                = "";
-  document.getElementById("reset_button").setAttribute("disabled", "disabled");
-
-  not_working();
-
-  ui_type = document.getElementById("ui_type").value;
-
-  // graphical derivation editor
-  if (ui_type == "g") {
-    document.getElementById("derivation_editor").style.display = "block";
-  // text based editor
-  } else {
-    init_text_editor();
-    document.getElementById("textboxes").style.display = "block";
-  }
-};
-
diff --git a/server.rb b/server.rb
index 3d24124..3afe2f7 100755
--- a/server.rb
+++ b/server.rb
@@ -25,6 +25,7 @@ if !FileTest.exist? LOCK_FILE # locked?
   $db  = {}                   # data file (JSON format)
   $env = {}                   # environment variables (socket connections to daemons)
 end
+$status           = "Idle"    # current server status
 
 # #############################################################################
 # Daemons
@@ -38,7 +39,7 @@ $daemons = {
   :truecaser        => "#{DIR}/lfpe/util/nanomsg_wrapper.rb -a truecase   -S '__ADDR__' -e #{EXTERNAL} -t #{SESSION_DIR}/truecase.model",
   #:lowercaser   => "#{DIR}/lfpe/util/nanomsg_wrapper.rb -a lowercase  -S '__ADDR__' -e #{EXTERNAL}",
   :dtrain           => "#{CDEC}/training/dtrain/dtrain_net_interface -c #{SESSION_DIR}/dtrain.ini -d #{WORK_DIR}/dtrain.debug.json -o #{WORK_DIR}/weights -a '__ADDR__' -E -R",
-  :extractor        => "python -m cdec.sa.extract -c #{SESSION_DIR}/sa.ini --online -u -S '__ADDR__'",
+  :extractor        => "python -m cdec.sa.extract -c #{SESSION_DIR}/extract.ini --online -u -S '__ADDR__'",
   :aligner_fwd      => "#{CDEC}/word-aligner/net_fa -f #{SESSION_DIR}/forward.params  -m #{FWD_MEAN_SRCLEN_MULT}  -T #{FWD_TENSION}  --sock_url '__ADDR__'",
   :aligner_back     => "#{CDEC}/word-aligner/net_fa -f #{SESSION_DIR}/backward.params -m #{BACK_MEAN_SRCLEN_MULT} -T #{BACK_TENSION} --sock_url '__ADDR__'",
   :atools           => "#{CDEC}/utils/atools_net -c grow-diag-final-and -S '__ADDR__'"
@@ -79,15 +80,18 @@ def start_daemon cmd, name, addr
 end
 
 def stop_all_daemons
+  $status = "Shutting down"
   logmsg :server, "shutting down all daemons"
   $env.each { |name,p|
     p[:socket].send "shutdown"                   # every daemon shuts down
                                                  # after receiving this keyword
     logmsg :server, "< #{name} is #{p[:socket].recv}"
   }
+  $status = "Ready to shutdown"
 end
 
 def update_database reset=false
+  $status = "Updating database"
   if !reset
     $db['progress'] += 1
   else
@@ -97,9 +101,11 @@ def update_database reset=false
   f = WriteFile.new DB_FILE
   f.write j.to_s
   f.close
+  $status = "Updated database"
 end
 
 def init
+  $status = "Initialization"
                                                           # data from JSON file
   $db = JSON.parse ReadFile.read DB_FILE
                                                             # working directory
@@ -114,6 +120,7 @@ def init
   }
                                                                    #  lock file
   `touch #{LOCK_FILE}`
+  $status = "Initialized"
 end
 
 def send_recv daemon, msg                            # simple pair communcation
@@ -149,23 +156,32 @@ get '/' do
   return ""                                                            # return
 end
 
-post '/next' do      # (receive post-edit, update models), send next translation
+post '/next' do
   cross_origin                           # enable Cross-Origin Resource Sharing
+  $status = "Received request"
   reply = request.body.read
-  #logmsg :server, "raw JSON client reply: #{reply}"
+  Thread.new { process_next reply }
+  "Received request"
+end
+
+def process_next reply
   data = JSON.parse(URI.decode(reply))
-  #logmsg :server, "parsed reply: #{data.to_s}"
-                                                  # already processing request?
-  return "locked" if $lock                                    # return (locked)
+  if $lock
+    $status = "Locked"
+    return
+  end
+  #return "locked" if $lock                                    # return (locked)
   $lock = true                                                           # lock
   key = data['key']              # TODO do something with it, e.g. simple auth?
   if data["OOV"]                                              # OOV corrections
+    $status = "Processing OOV corrections"
     logmsg :server, "received OOV corrections"
     grammar = "#{WORK_DIR}/g/#{$db['progress']}.grammar"
     src, tgt = splitpipe(data["correct"]) # format:src1\tsrc2\tsrc..|||tgt1\t..
     tgt = clean_str tgt
     src = src.split("\t").map { |i| URI.decode(i).strip }
     tgt = tgt.split("\t").map { |i| URI.decode(i).strip }
+    $status = "Adding rules to fix OOVs"
     src.each_with_index { |s,i|
       next if s==''||tgt[i]==''
       as = ""
@@ -189,6 +205,7 @@ post '/next' do      # (receive post-edit, update models), send next translation
 # 5d. actual update
 # 6. update database
   if data["EDIT"]
+    $status = "Processing post-edit"
     logmsg :server, "received post-edit"
                                                         # 0. save raw post-edit
     source = data["source_value"]
@@ -197,6 +214,7 @@ post '/next' do      # (receive post-edit, update models), send next translation
       post_edit = data["target"].join(" ")
       e = []
       logmsg :server, "post-edit before processing: '#{post_edit}'"
+      $status = "Tokenizing and truecasing post-edited phrases"
       data["target"].each_with_index { |i,j|
                                                                 # [1.] tokenize
         _ = clean_str send_recv(:tokenizer, URI.decode(i))
@@ -210,6 +228,7 @@ post '/next' do      # (receive post-edit, update models), send next translation
       f = []
       data["source_raw"].each { |i| f << URI.decode(i) }
                                                       # 2.5 new rule extraction
+      $status = "Extracting rules from post edit"
       new_rules = PhrasePhraseExtraction.extract_rules f, e, data["align"], true
       grammar = "#{WORK_DIR}/g/#{$db['progress']}.grammar"
       sts = {}
@@ -247,6 +266,7 @@ post '/next' do      # (receive post-edit, update models), send next translation
     else                                                       # text interface
       post_edit = data["post_edit"]
     end
+    $status  = "processing post-edit ..."
     post_edit.strip!
     post_edit.lstrip!
     post_edit = clean_str post_edit                      # FIXME escape [ and ]
@@ -258,12 +278,15 @@ post '/next' do      # (receive post-edit, update models), send next translation
     $db['durations']          << data['duration'].to_f
     $db['post_edits_display'] << send_recv(:detokenizer, post_edit)
     # 1. tokenize
+      $status = "Tokenizing post-edit"
       logmsg :server, "tokenizing post-edit"
       post_edit = send_recv :tokenizer, post_edit
     # 2. truecase
+      $status = "Truecasing post-edit"
       logmsg :server, "truecasing post-edit"
       post_edit = send_recv :truecaser, post_edit
     # 3. save processed post-edits
+      $status = "saving processed post-edit"
       logmsg :db, "saving processed post-edit"
       $db['post_edits'] << post_edit.strip
     nochange = false
@@ -272,22 +295,26 @@ post '/next' do      # (receive post-edit, update models), send next translation
       nochange = true
     end
     if !NOLEARN && !NOMT && !nochange
+      $status = "Updating"
       logmsg :server, "updating ..."
                                # 4. update weights
                                # nb: this uses unaltered grammar [no new rules]
       grammar = "#{WORK_DIR}/g/#{$db['progress']}.grammar"
       annotated_source = "<seg grammar=\"#{grammar}\"> #{source} </seg>"
+      $status = "Learning from post-edit"
       send_recv :dtrain, "#{annotated_source} ||| #{post_edit}"
                                                   # 5. update grammar extractor
                                                   # 5a. get forward alignment
       source_lc = source.downcase
       post_edit_lc = post_edit.downcase
+      $status = "Aligning post-edit"
       a_fwd = send_recv :aligner_fwd, "#{source_lc} ||| #{post_edit_lc}"
                                                    # 5b. get backward alignment
       a_back = send_recv :aligner_back, "#{source_lc} ||| #{post_edit_lc}"
                                                      # 5c. symmetrize alignment
       a = send_recv :atools, "#{a_fwd} ||| #{a_back}"
                                                           # 5d actual extractor
+      $status = "Updating grammar extractor"
       send_recv :extractor, "default_context ||| #{source} ||| #{post_edit} ||| #{a}"
                                                            # 6. update database
       $db['updated'] << true
@@ -298,19 +325,25 @@ post '/next' do      # (receive post-edit, update models), send next translation
     logmsg :db, "updating database"
     update_database
   end
+  $status = "Getting next data to translate"
   source     = $db['source_segments'][$db['progress']]
   raw_source = $db['raw_source_segments'][$db['progress']]
   if !source                                                    # input is done
     logmsg :server, "end of input, sending 'fin'"
     $lock = false
-    return {'fin'=>true}.to_json                                       # return
+    $status = "Ready"
+    $last_reply = {'fin'=>true}.to_json
+    return
+    #return $last_reply                                                 # return
   elsif !$confirmed \
     || ($confirmed && $last_reply && $last_reply!="" \
         && !data["EDIT"] && !$last_reply.to_json["oovs"])     # send last reply
     logmsg :server, "locked, re-sending last reply"
     logmsg :server, "last_reply: '#{$last_reply}'"
     $lock = false
-    return $last_reply                                                 # return
+    $status = "Ready"
+    return
+    #return $last_reply                                                 # return
   else
 # translate next sentence
 # 0. no mt?
@@ -332,13 +365,18 @@ post '/next' do      # (receive post-edit, update models), send next translation
       obj["progress"]   = $db["progress"]
       obj["source"]     = source
       obj["raw_source"] = raw_source
-      return obj.to_json                                               # return
+      $last_reply = obj.to_json
+      $status = "Ready"
+      return
+      #return obj.to_json                                               # return
     end
                                      # 1. generate grammar for current sentence
+    $status = "Generating grammar"
     grammar = "#{WORK_DIR}/g/#{$db['progress']}.grammar"
     send_recv :extractor, "default_context ||| #{source} ||| #{grammar}"
                                                                 # - known rules
     logmsg :server, "annotating known rules"
+    $status = "Adding rules to grammar"
     match = {}
     $rejected_rules.each { |r|
       _,src,tgt,_,_ = splitpipe r
@@ -361,6 +399,7 @@ post '/next' do      # (receive post-edit, update models), send next translation
       `echo "#{rule}" >> #{grammar}`
     }
     # 2. check for OOVs
+    $status = "Checking for OOVs"
     src_r = ReadFile.readlines(grammar).map {
       |l| splitpipe(l)[1].strip.split
     }.flatten.uniq
@@ -374,6 +413,7 @@ post '/next' do      # (receive post-edit, update models), send next translation
     oovs.uniq!
     logmsg :server, "have OOVs: '#{oovs.to_s}'"
     if oovs.size > 0                                                     # OOVs
+      $status = "Asking for feedback on OOVs"
       obj = Hash.new
       obj["oovs"]      = oovs
       obj["progress"]  = $db['progress']
@@ -386,15 +426,19 @@ post '/next' do      # (receive post-edit, update models), send next translation
       logmsg :server, "OOV reply: '#{$last_reply}'"
       $lock = false
       $confirmed = false
-      return $last_reply                                               # return
+      $status = "Ready"
+      return
+      #return $last_reply                                               # return
     end
     # 3. translation
+    $status = "Translating"
     msg = "act:translate ||| <seg grammar=\"#{grammar}\"> #{source} </seg>"
     derivation_str = send_recv :dtrain, msg
     obj_str = DerivationToJson.proc_deriv derivation_str
     obj = JSON.parse obj_str
     obj["transl"] = obj["target_groups"].join " "
     # 4. detokenizer
+    $status = "Processing raw translation"
     obj["transl_detok"] = send_recv(:detokenizer, obj["transl"]).strip
     obj["target_groups"].each_index { |j|
       prev = obj["target_groups"][j][0]
@@ -426,10 +470,14 @@ post '/next' do      # (receive post-edit, update models), send next translation
     $lock = false
     $confirmed = false
     logmsg :server, "response: '#{$last_reply}'"
-    return $last_reply                                                 # return
+    $status = "Ready"
+    return
+    #return $last_reply                                                 # return
   end
 
-  return "{}"                                                  # return [ERROR]
+  #$status = "Error"
+  #$last_reply = "{}"
+  #return "{}"                                                  # return [ERROR]
 end
 
 get '/debug' do                                                    # debug view
@@ -457,6 +505,20 @@ get '/debug' do                                                    # debug view
                             :session_key => SESSION_KEY }
 end
 
+get '/fetch' do                                                    # fetch next
+  cross_origin
+  return "Locked" if $locked
+  return $last_reply
+end
+
+
+get '/status' do                                                 # check status
+  cross_origin
+  logmsg :server, "status: #{$status}"
+  return "Locked" if $locked
+  return $status
+end
+
 get '/confirm' do                        # client confirms received translation
   cross_origin
   $confirmed = true
-- 
cgit v1.2.3