diff options
Diffstat (limited to 'reach_reports')
-rwxr-xr-x | reach_reports/reach_application.rb | 5 | ||||
-rwxr-xr-x | reach_reports/reach_service.rb | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/reach_reports/reach_application.rb b/reach_reports/reach_application.rb index e35df7b..d77906d 100755 --- a/reach_reports/reach_application.rb +++ b/reach_reports/reach_application.rb @@ -48,6 +48,7 @@ end get '/reach_report/:type' do type = extract_type(params) LOGGER.info "list all "+type+" reports" + uris = ReachReports.list_reports(type,params[:model] || params[:model_uri]) if request.env['HTTP_ACCEPT'] =~ /text\/html/ content_type "text/html" related_links = @@ -66,10 +67,10 @@ get '/reach_report/:type' do when /(?i)QPRF/ #TODO end - OpenTox.text_to_html ReachReports.list_reports(type),@subjectid,related_links,description,post_command + OpenTox.text_to_html uris,@subjectid,related_links,description,post_command else content_type "text/uri-list" - ReachReports.list_reports(type) + uris end end diff --git a/reach_reports/reach_service.rb b/reach_reports/reach_service.rb index fa4c0d7..2030dbd 100755 --- a/reach_reports/reach_service.rb +++ b/reach_reports/reach_service.rb @@ -12,10 +12,12 @@ end module ReachReports - def self.list_reports(type) + def self.list_reports(type, model_uri=nil) case type when /(?i)QMRF/ - ReachReports::QmrfReport.all.collect{ |r| r.report_uri }.join("\n")+"\n" + params = {} + params[:model_uri]=model_uri if model_uri + ReachReports::QmrfReport.all(params).collect{ |r| r.report_uri }.join("\n")+"\n" when /(?i)QPRF/ ReachReports::QprfReport.all.collect{ |r| r.report_uri }.join("\n")+"\n" end |