summaryrefslogtreecommitdiff
path: root/reach_reports
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2010-10-06 12:09:08 +0200
committermguetlein <martin.guetlein@gmail.com>2010-10-06 12:09:08 +0200
commitf72a88dcb8fd18778445b4e6678cdfdee7feda28 (patch)
tree84c65896bf2a049db5b48f4dabd2b6e2b6a3b646 /reach_reports
parent18e1ec84378d711b36b1a77b29baa9b5ef664faa (diff)
add text/html support, remove delete disabling, add new line to uri-list returns
Diffstat (limited to 'reach_reports')
-rw-r--r--reach_reports/reach_application.rb4
-rw-r--r--reach_reports/reach_test.rb5
2 files changed, 6 insertions, 3 deletions
diff --git a/reach_reports/reach_application.rb b/reach_reports/reach_application.rb
index 4afaf51..e63c2a4 100644
--- a/reach_reports/reach_application.rb
+++ b/reach_reports/reach_application.rb
@@ -34,9 +34,9 @@ post '/reach_report/:type' do
result_uri = ReachReports.create_report(type,params,request.env["rack.input"])
if OpenTox::Utils.task_uri?(result_uri)
- halt 202,result_uri
+ halt 202,result_uri+"\n"
else
- result_uri
+ result_uri+"\n"
end
end
diff --git a/reach_reports/reach_test.rb b/reach_reports/reach_test.rb
index 2f07302..44f37ff 100644
--- a/reach_reports/reach_test.rb
+++ b/reach_reports/reach_test.rb
@@ -114,13 +114,16 @@ class ReachTest < Test::Unit::TestCase
# post "/reach_report/qmrf/8"
# puts last_response.body
+ #model_uri = "http://ambit.uni-plovdiv.bg:8080/ambit2/model/173393"
model_uri = "http://localhost/model/1"
#model_uri = "http://localhost/majority/regr/model/12"
- #model_uri = "http://localhost/majority/class/model/1"
+ # model_uri = "http://localhost/majority/class/model/91"
#model_uri = "http://apps.ideaconsult.net:8080/ambit2/model/2"
post '/reach_report/qmrf',:model_uri=>model_uri #http://localhost/model/1"
##post '/reach_report/qprf',:compound_uri=>"http://localhost/compound/XYZ"
uri = last_response.body
+ puts "task: "+uri.to_s
+ uri = Lib::TestUtil.wait_for_task(uri)
id = uri.split("/")[-1]
puts uri