Updated files for validation.

4 files changed, 28 insertions, 16 deletions

diff --git a/config.sh b/config.sh
index 7a540d0..9cdbca7 100755
--- a/config.sh
+++ b/config.sh
@@ -18,12 +18,17 @@ OT_JAVA_HOME="/usr/lib/jvm/java-6-openjdk"
 OB_NUM_VER="2.3.1"
 RAPTOR2_NUM_VER="2.0.8"
 RASQAL_NUM_VER="0.9.29"
+REDIS_NUM_VER="2.4.4"
 RUBY_NUM_VER="1.9.3-p194"
 FOUR_STORE_VER="4store-v1.1.5"
+REDIS_URL="http://redis.googlecode.com/files"
 REDLAND_DWL="http://download.librdf.org"
 REDLAND_APT_KEY="http://purl.org/net/dajobe/gnupg.asc"
 FOUR_STORE_URL="http://4store.org/download"
 
+# 4) Server settings.
+OHM_PORT="6379" # set to port (no colon)
+
 # Done.
 
 ### Nothing to gain from changes below this line.
@@ -33,6 +38,7 @@ OB_CONF="$HOME/.opentox/OB.sh"
 R_CONF="$HOME/.opentox/R.sh"
 RAPTOR2_CONF="$HOME/.opentox/RAPTOR2.sh"
 RASQAL_CONF="$HOME/.opentox/RASQAL.sh"
+REDIS_CONF="$HOME/.opentox/REDIS.sh"
 OT_UI_CONF="$HOME/.opentox/opentox-ui.sh"
 OT_TOOLS_CONF="$HOME/.opentox/ot-tools.sh"
 OT_DEFAULT_CONF="$HOME/.opentox/config/default.rb"
@@ -40,11 +46,15 @@ OT_DEFAULT_CONF="$HOME/.opentox/config/default.rb"
 OB_VER="openbabel-$OB_NUM_VER"
 RAPTOR2_VER="raptor2-$RAPTOR2_NUM_VER"
 RASQAL_VER="rasqal-$RASQAL_NUM_VER"
+REDIS_VER="redis-$REDIS_NUM_VER"
 OB_DEST="$OT_PREFIX/$OB_VER"
 OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install"
 R_DEST="$OT_PREFIX/r-packages"
 RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/1.9"
 RAPTOR2_DWL="$REDLAND_DWL/source/$RAPTOR2_VER.tar.gz"
 RASQAL_DWL="$REDLAND_DWL/source/$RASQAL_VER.tar.gz"
+REDIS_DWL="$REDIS_URL/$REDIS_VER.tar.gz"
+REDIS_DIR="$OT_PREFIX/$REDIS_VER"
+REDIS_SERVER_CONF="$REDIS_DIR/redis.conf"
 REDLAND_DEB="$REDLAND_DWL/binaries/$OT_DIST/unstable"
 FOUR_STORE_DWL="$FOUR_STORE_URL/$FOUR_STORE_VER.tar.gz"
diff --git a/debian.list b/debian.list
index b10234d..e5af5b5 100644
--- a/debian.list
+++ b/debian.list
@@ -4,6 +4,7 @@ avahi-daemon install
 build-essential install
 cmake install
 curl install
+gnuplot install
 libavahi-glib-dev install
 libavahi-client-dev install
 libcairo2-dev install
@@ -22,3 +23,4 @@ openjdk-6-jdk install
 r-base-dev install
 r-base install
 uuid-dev install
+xsltproc install
diff --git a/ot-tools-user.sh b/ot-tools-user.sh
index b9b2d7e..e003ac4 100644
--- a/ot-tools-user.sh
+++ b/ot-tools-user.sh
@@ -72,8 +72,8 @@ otstart() {
     "feature")    start_unicorn $1 8084;;
     "model")      start_unicorn $1 8085;;
     "task")       start_unicorn $1 8086;;
-    "validation") #start_unicorn $1 8087;;
-                  echo "$1 not available yet.";;
+    "validation") start_unicorn $1 8087;
+                  nice bash -c "nohup redis-server $HOME/opentox-ruby/redis-*/redis.conf >/dev/null 2>&1 &";;
     "4store")     start_4s opentox 9088; 
                   if ! pgrep -u $USER 4s-backend>/dev/null 2>&1; then echo "Failed to start 4s-backend."; fi
                   if ! pgrep -u $USER 4s-httpd>/dev/null 2>&1; then echo "Failed to start 4s-httpd."; fi;;
@@ -83,8 +83,8 @@ otstart() {
                   otstart dataset;
                   otstart feature;
                   otstart model;
-                  otstart task;;
-                  #otstart validation;;
+                  otstart task;
+                  otstart validation;;
     *)            echo "One argument required: [service_name] or 'all'";
                   echo "usage: otstart [all|algorithm|compound|dataset|feature|model|task|validation|4store]";
                   return 1;;
@@ -132,9 +132,8 @@ otreload() {
                   check_service "model";;
     "task")       reload_unicorn 8086;
                   check_service "task";;
-    "validation") #reload_unicorn 8087;;
-                  #check_service "validation";
-                  echo "$1 not available yet.";;
+    "validation") reload_unicorn 8087;
+                  check_service "validation";;
     "4store")     #killall 4s-httpd >/dev/null 2>&1;
                   #killall 4s-backend >/dev/null 2>&1;
                   #check_service "four_store";;
@@ -144,8 +143,8 @@ otreload() {
                   otreload dataset;
                   otreload feature;
                   otreload model;
-                  otreload task;;
-                  #otrelaod validation;
+                  otreload task;
+                  otrelaod validation;;
                   #otreload 4store;;
     *)            echo "One argument required: [service_name] or 'all'";
                   echo "usage: otreload [all|algorithm|compound|dataset|feature|model|task|validation|4store]";
@@ -176,8 +175,8 @@ otkill() {
     "feature")    kill_unicorn 8084;;
     "model")      kill_unicorn 8085;;
     "task")       kill_unicorn 8086;;
-    "validation") #kill_unicorn 8087;;
-                  echo "$1 not available yet.";;
+    "validation") kill_unicorn 8087;
+                  bash -c "redis-cli -p $OHM_PORT shutdown >/dev/null 2>&1";;
     "4store")     killall 4s-httpd >/dev/null 2>&1;
                   killall 4s-backend >/dev/null 2>&1;;
     "all")        otkill algorithm;
@@ -186,7 +185,7 @@ otkill() {
                   otkill feature;
                   otkill model;
                   otkill task;
-                  #otkill validation;
+                  otkill validation;
                   otkill 4store;;
     *)            echo "One argument required: [service_name] or 'all'";
                   echo "usage: otkill [all|algorithm|compound|dataset|feature|model|task|validation|4store]";
@@ -265,8 +264,7 @@ otcheck() {
     "feature")    check_service "feature";;
     "model")      check_service "model";;
     "task")       check_service "task";;
-    "validation") #check_service "validation";;
-                  echo "$1 not available yet.";;
+    "validation") check_service "validation";;
     "4store")     check_service "four_store";; 
     "all")        otcheck "algorithm";
                   otcheck "compound";
@@ -274,7 +272,7 @@ otcheck() {
                   otcheck "feature";
                   otcheck "model";
                   otcheck "task";
-                  #otcheck "validation";
+                  otcheck "validation";
                   otcheck 4store;;
     *)            echo "One argument required: [service_name] or 'all'";
                   echo "usage: otcheck [all|algorithm|compound|dataset|feature|model|task|validation|4store]";
diff --git a/ubuntu.list b/ubuntu.list
index 2905b76..e5af5b5 100644
--- a/ubuntu.list
+++ b/ubuntu.list
@@ -4,6 +4,7 @@ avahi-daemon install
 build-essential install
 cmake install
 curl install
+gnuplot install
 libavahi-glib-dev install
 libavahi-client-dev install
 libcairo2-dev install
@@ -21,4 +22,5 @@ ncurses-dev install
 openjdk-6-jdk install
 r-base-dev install
 r-base install
-uuid-dev install
\ No newline at end of file
+uuid-dev install
+xsltproc install