From 750c3a57db4ed5ad3ec50c7875ad3edf877727f6 Mon Sep 17 00:00:00 2001 From: mguetlein Date: Fri, 20 May 2011 10:51:18 +0200 Subject: handle confidence nil values, and fix prediction confidence sorting, improved prediction table --- report/environment.rb | 2 ++ report/report_application.rb | 4 ++++ report/xml_report.rb | 10 +++++----- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'report') diff --git a/report/environment.rb b/report/environment.rb index 59465aa..bdb4a04 100755 --- a/report/environment.rb +++ b/report/environment.rb @@ -27,6 +27,8 @@ require "report/validation_data.rb" require "report/util.rb" require "report/statistical_test.rb" +ICON_ERROR = File.join(CONFIG[:services]["opentox-validation"],"resources/error.png") +ICON_OK = File.join(CONFIG[:services]["opentox-validation"],"resources/ok.png") diff --git a/report/report_application.rb b/report/report_application.rb index 1637ead..3c8670a 100755 --- a/report/report_application.rb +++ b/report/report_application.rb @@ -23,6 +23,10 @@ get '/'+ENV['DOCBOOK_DIRECTORY']+'/:resource' do get_docbook_resource ENV['DOCBOOK_DIRECTORY']+"/"+request.env['REQUEST_URI'].split("/")[-1] end +get '/resources/:resource' do + get_docbook_resource "resources/"+request.env['REQUEST_URI'].split("/")[-1] +end + get '/report/:type/css_style_sheet/?' do perform do |rs| "@import \""+params[:css_style_sheet]+"\";" diff --git a/report/xml_report.rb b/report/xml_report.rb index b308c01..cf30e3b 100755 --- a/report/xml_report.rb +++ b/report/xml_report.rb @@ -159,16 +159,16 @@ module Reports table end - def add_image( element, url ) + def add_image( element, url ) #, scale=false ) image = Element.new("imageobject") - imagedata = Reports::XMLReportUtil.attribute_element("imagedata", - {"fileref" => url, "format"=>"PNG", "contentwidth" => "2in" }) #PENDING: do not hardcode size + params = {"fileref" => url, "format"=>"PNG"} + #params["contentwidth"] = "2in" + imagedata = Reports::XMLReportUtil.attribute_element("imagedata",params) image << imagedata element << image return image end - # adds a table to a REXML:Element, _table_values_ should be a multi-dimensional-array, returns the table as element # # call-seq: @@ -216,7 +216,7 @@ module Reports row = Element.new("row") r.each do |v| entry = Element.new("entry") - if auto_link_urls && v.to_s =~ /depict/ || v.to_s =~ /image\/png$/ #PENDING + if auto_link_urls && v.to_s =~ /depict/ || v.to_s =~ /png$/ #PENDING add_image(entry, v.to_s) elsif auto_link_urls && v.to_s =~ /^http(s?):\/\// #add_url(entry, v.to_s, v.to_s) -- cgit v1.2.3