Merge commit 'mguetlein/test'

Conflicts:

	application.rb

1 files changed, 9 insertions, 5 deletions

diff --git a/report/report_persistance.rb b/report/report_persistance.rb
index a06dba8..46a014e 100644
--- a/report/report_persistance.rb
+++ b/report/report_persistance.rb
@@ -1,4 +1,6 @@
 
+REPORT_DIR = File.join(Dir.pwd,'/reports')
+
 # = Reports::ReportPersistance
 #
 # service that stores reports (Reports::ReportConent), and provides access in various formats
@@ -68,10 +70,9 @@ class Reports::FileReportPersistance < Reports::ReportPersistance
   
   def initialize()
     raise "pls specify report-directory (:reports -> :report_dir) in config file" unless @@config[:reports] and @@config[:reports][:report_dir]
-    @report_dir = @@config[:reports][:report_dir]
-    FileUtils.mkdir @report_dir.to_s unless File.directory?(@report_dir)
-    raise "report cannot be found nor created" unless File.directory?(@report_dir)
-    LOGGER.debug "reports are stored in "+@report_dir.to_s 
+    FileUtils.mkdir REPORT_DIR unless File.directory?(REPORT_DIR)
+    raise "report cannot be found nor created" unless File.directory?(REPORT_DIR)
+    LOGGER.debug "reports are stored in "+REPORT_DIR 
   end
   
   def list_reports(type, filter_params=nil)
@@ -165,7 +166,7 @@ class Reports::FileReportPersistance < Reports::ReportPersistance
   end
   
   def type_directory(type)
-    dir = @report_dir+"/"+type
+    dir = REPORT_DIR+"/"+type
     FileUtils.mkdir dir.to_s unless (File.directory?(dir))
     return dir
   end
@@ -230,6 +231,9 @@ module Reports
     end
     
     def list_reports(type, filter_params=nil)
+      #QMRF-STUB
+      return "1" if type == ReportFactory::RT_QMRF
+      
       filter_params = {} unless filter_params
       filter_params.each{ |k,v| raise Reports::BadRequest.new("no report-attribute: "+k.to_s) unless ReportData.column_names.include?(k.gsub(/_like$/,"")) }
       filter_params[:report_type] = type