merge with new version from helma

4 files changed, 18 insertions, 16 deletions

diff --git a/application.rb b/application.rb
index dbdba93..177b641 100755
--- a/application.rb
+++ b/application.rb
@@ -29,7 +29,7 @@ class ToxCreateModel
 	end
 
 	def validation_status
-		RestClient.get(File.join(@validation_task_uri, 'hasStatus')).body
+		RestClient.get(File.join(@validation_task_uri, 'hasStatus')).body if @validation_task_uri
 	end
 
 	def validation_report_status
@@ -124,19 +124,22 @@ end
 get '/model/:id/?' do
   response['Content-Type'] = 'text/plain'
 	model = ToxCreateModel.get(params[:id])
-  if !model.uri and model.status == "completed"
-	  model.uri = RestClient.get(File.join(model.task_uri, 'resource')).to_s
-		model.save
-	end
+  if !model.uri and model.status == "Completed"
+	  model.uri = RestClient.get(File.join(model.task_uri, 'resultURI')).body
+	  model.save
+  end
 =begin
 		unless @@config[:services]["opentox-model"].match(/localhost/)
-			if !model.validation_uri and model.validation_status == "completed"
-				model.validation_uri = RestClient.get(File.join(model.validation_task_uri, 'resource')).to_s
+			if !model.validation_uri and model.validation_status == "Completed"
+				model.validation_uri = RestClient.get(File.join(model.validation_task_uri, 'resultURI')).body
 				LOGGER.debug "Validation URI: #{model.validation_uri}"
-				model.validation_report_uri = RestClient.post(File.join(@@config[:services]["opentox-validation"],"/report/crossvalidation"), :validation_uris => validation_uri).to_s
-				LOGGER.debug "Validation Report URI: #{model.validation_report_uri}"
+				model.validation_report_task_uri = RestClient.post(File.join(@@config[:services]["opentox-validation"],"/report/crossvalidation"), :validation_uris => model.validation_uri).body
+				LOGGER.debug "Validation Report Task URI: #{model.validation_report_task_uri}"
 				model.save
 			end
+			if model.validation_report_task_uri and !model.validation_report_uri and model.validation_report_status == 'Completed'
+				model.validation_report_uri = RestClient.get(File.join(model.validation_report_task_uri, 'resultURI')).body
+			end
 		end
 =end
 
diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js
index d341c4d..dd2b584 100755
--- a/public/javascripts/toxcreate.js
+++ b/public/javascripts/toxcreate.js
@@ -36,7 +36,7 @@ $(function() {
         '_method': 'get'
       },
       success: function(data) {
-        var erg = data.search(/started/);
+        var erg = data.search(/Running/);
         status_changed = false;
         if(erg < 0) status_changed = true;        
         $("span#model_" + id + "_status").animate({"opacity": "0.1"},1000);
diff --git a/views/model.haml b/views/model.haml
index affc25a..f676465 100644
--- a/views/model.haml
+++ b/views/model.haml
@@ -27,7 +27,7 @@
       %a{:href => "#", :id => "show_model_#{model.id}_warnings"} show
       %dd{:id => "model_#{model.id}_warnings", :style => "display: none;"}= model.warnings
 
-    - if model.status == 'completed'
+    - if model.status == 'Completed'
       %dt Algorithm:
       %dd
         %a{:href => model.algorithm} #{File.basename model.algorithm}
@@ -56,8 +56,8 @@
         %a{:href => "#{model.uri}.yaml"} YAML
         %em  (more formats to be added)
       %dt Validation:
-        - if model.validation_report_uri
-          %a{:href => model.validation_report_uri, :target => "_blank"} (more details)
+      - if model.validation_report_uri
+        %a{:href => model.validation_report_uri, :target => "_blank"} (more details)
       %dd
         - if model.validation_uri
           - uri = File.join(model.validation_uri, 'statistics')
diff --git a/views/model_status.haml b/views/model_status.haml
index 91afb0d..1357d99 100755
--- a/views/model_status.haml
+++ b/views/model_status.haml
@@ -1,3 +1,2 @@
-- if model.status.match(/started|created/)
-  = image_tag("/snake_transparent.gif") 
-= model.status
\ No newline at end of file
+= image_tag("/snake_transparent.gif") if model.status.match(/running|started|created/i)
+= model.status