Merge branch 'master' of github.com:pks/lfpe

6 files changed, 7 insertions, 3 deletions

diff --git a/js/interface.js b/js/interface.js
index 58c89d8..677c343 100644
--- a/js/interface.js
+++ b/js/interface.js
@@ -450,6 +450,9 @@ var request_and_process_next = function ()
       $("#next").html("Next");
       $("#oov_tgt0").focus();
       not_working(false);
+      if (ui_type == "g") {
+        DE_ui_lock = true;
+      }
 
     // translation mode
     } else {
diff --git a/server.rb b/server.rb
index a2109db..d6cbec7 100755
--- a/server.rb
+++ b/server.rb
@@ -682,6 +682,7 @@ get '/reset_progress' do                                # reset current session
   update_database true
   $confirmed = true
   $last_reply = nil
+  $oov_corrected.clear
 
   return "progress reset: done"
 end
diff --git a/util/run_all b/util/run_all
index 6b4b382..a873e63 100755
--- a/util/run_all
+++ b/util/run_all
@@ -3,7 +3,7 @@
 #for i in `find ../sessions -maxdepth 1 | cut -d "/" -f 3 | grep -P "^sess_"`; do
 for i in `cat ../sessions/sessions | cut -f 1`; do
   echo $i
-  ./util/run_server $i &
+  ./util/run_session $i &
   sleep 60
 done
 
diff --git a/util/run_beta_test b/util/run_beta_test
index 9180b52..7e8e4e7 100755
--- a/util/run_beta_test
+++ b/util/run_beta_test
@@ -5,6 +5,6 @@ cd /srv/postedit/lfpe/util
 for i in `ls -1 ../../sessions/ | grep -v "_1_" | grep -v data | grep -v toy`; do
   echo $i
   echo $(basename $i)
-  ./run_server $(basename $i) &; sleep 600;
+  ./run_session $(basename $i) &; sleep 600;
 done
 
diff --git a/util/run_demo b/util/run_demo
index 2140a1c..74ff529 100755
--- a/util/run_demo
+++ b/util/run_demo
@@ -1,4 +1,4 @@
 #!/bin/zsh -x
 
-for i in {0..24}; do for j in pe nomt; do ./util/run_server g0_"$i"_"$j" &; done; done
+for i in {0..24}; do for j in pe nomt; do ./util/run_session g0_"$i"_"$j" &; done; done
 
diff --git a/util/run_server b/util/run_session
index a4b7a6c..a4b7a6c 100755
--- a/util/run_server
+++ b/util/run_session