improve search facilites to enable rdf-format properties

2 files changed, 4 insertions, 17 deletions

diff --git a/report/environment.rb b/report/environment.rb
index d1321e7..7499491 100644
--- a/report/environment.rb
+++ b/report/environment.rb
@@ -6,17 +6,6 @@
 end
 gem 'ruby-plot', '= 0.0.2'
 
-unless ActiveRecord::Base.connected?
-  ActiveRecord::Base.establish_connection(  
-     :adapter => @@config[:database][:adapter],
-     :host => @@config[:database][:host],
-     :database => @@config[:database][:database],
-     :username => @@config[:database][:username],
-     :password => @@config[:database][:password]
-  )
-  ActiveRecord::Base.logger = Logger.new("/dev/null")
-end
-
 module Reports
 end
 
@@ -34,6 +23,7 @@ require "report/util.rb"
 require "report/external/mimeparse.rb"
 
 require "lib/ot_predictions.rb"
+require "lib/active_record_setup.rb"
 
 
 
diff --git a/report/report_persistance.rb b/report/report_persistance.rb
index d79cf7e..b6f52b6 100644
--- a/report/report_persistance.rb
+++ b/report/report_persistance.rb
@@ -222,14 +222,11 @@ module Reports
       new_report_with_id(report_content, type, report.id)
     end
     
-    def list_reports(type, filter_params=nil)
+    def list_reports(type, filter_params={})
       #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
-      ReportData.find(:all, :conditions => filter_params).collect{ |r| r.id }
+      filter_params["report_type"]=type unless filter_params.has_key?("report_type")
+      ReportData.find_like(filter_params).collect{ |r| r.id }
     end
     
     def get_report(type, id, format, force_formating, params)