From b452a81e9c0a470bf9aa51f0192378f5fba5177a Mon Sep 17 00:00:00 2001
From: gebele <gebele@in-silico.ch>
Date: Thu, 29 Oct 2015 09:54:15 +0000
Subject: trim and log SMILES input

---
 application.rb     | 14 ++++++++------
 views/predict.haml |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/application.rb b/application.rb
index 9c9cabb..d77842d 100644
--- a/application.rb
+++ b/application.rb
@@ -259,12 +259,14 @@ post '/predict/?' do
   # validate identifier input
   # transfered input
   if !params[:identifier].blank?
-    @identifier = params[:identifier]
-    begin
-      # get compound from SMILES
-      @compound = Compound.from_smiles @identifier
-    rescue
-      @error_report = "Attention, '#{params[:identifier]}' is not a valid SMILES string."
+    # remove whitespaces they terminate a SMILES string
+    # can result in wrong conversion for compound object
+    @identifier = params[:identifier].gsub(/\s+/, "")
+    $logger.debug "input:#{@identifier}"
+    # get compound from SMILES
+    @compound = Compound.from_smiles @identifier
+    if @compound.blank?
+      @error_report = "Attention, '#{@identifier}' is not a valid SMILES string."
       return haml :error
     end
 
diff --git a/views/predict.haml b/views/predict.haml
index a4fa080..7f19071 100644
--- a/views/predict.haml
+++ b/views/predict.haml
@@ -24,7 +24,7 @@
   });  
   
   function getInput(){
-    identifier = document.getElementById("identifier").value;
+    identifier = document.getElementById("identifier").value.trim();
     fileselect = document.getElementById("fileselect").value;
     if (fileselect != ""){
       return 1;
-- 
cgit v1.2.3