typo in error message Model not found fixed

2 files changed, 12 insertions, 8 deletions

diff --git a/application.rb b/application.rb
index 866a267..ba3c1a1 100644
--- a/application.rb
+++ b/application.rb
@@ -22,7 +22,7 @@ before do
 
     @uri = uri @id
     @yaml_file = "public/#{@id}.yaml"
-    halt 404, "Dataset #{@id} not found." unless File.exists? @yaml_file
+    halt 404, "Model #{@id} not found." unless File.exists? @yaml_file
   end
 
   # make sure subjectid is not included in params, subjectid is set as member variable
diff --git a/lazar.rb b/lazar.rb
index 9c76bbb..617ec73 100644
--- a/lazar.rb
+++ b/lazar.rb
@@ -68,13 +68,17 @@ post '/:id/?' do
   if compound_uri
     cache = PredictionCache.find(:model_uri => @lazar.uri, :compound_uri => compound_uri).first
     return cache.dataset_uri if cache and uri_available?(cache.dataset_uri)
-    begin
-      prediction_uri = @lazar.predict(compound_uri,true,@subjectid).uri
-      PredictionCache.create(:model_uri => @lazar.uri, :compound_uri => compound_uri, :dataset_uri => prediction_uri)
-      prediction_uri
-    rescue
-      LOGGER.error "Lazar prediction failed for #{compound_uri} with #{$!} "
-      halt 500, "Prediction of #{compound_uri} with #{@lazar.uri} failed."
+    if cache and uri_available?(cache.dataset_uri)
+      return cache.dataset_uri 
+    else
+      begin
+        prediction_uri = @lazar.predict(compound_uri,true,@subjectid).uri
+        PredictionCache.create(:model_uri => @lazar.uri, :compound_uri => compound_uri, :dataset_uri => prediction_uri)
+        prediction_uri
+      rescue
+        LOGGER.error "Lazar prediction failed for #{compound_uri} with #{$!} "
+        halt 500, "Prediction of #{compound_uri} with #{@lazar.uri} failed."
+      end
     end
   elsif dataset_uri
     task = OpenTox::Task.create("Predict dataset",url_for("/#{@lazar.id}", :full)) do |task|