switch from datamapper/mysql to redis (sqlite for qmrf)

3 files changed, 8 insertions, 5 deletions

diff --git a/reach_reports/reach_persistance.rb b/reach_reports/reach_persistance.rb
index 3118809..b90778b 100755
--- a/reach_reports/reach_persistance.rb
+++ b/reach_reports/reach_persistance.rb
@@ -1,5 +1,8 @@
 
-require "dm-validations"
+['dm-core', 'dm-serializer', 'dm-timestamps', 'dm-types', 'dm-migrations', 'dm-validations' ].each{|lib| require lib }
+db_dir = File.join(File.join(ENV['HOME'], ".opentox"), "db")
+FileUtils.mkdir_p db_dir
+DataMapper::setup(:default, "sqlite3://#{db_dir}/reach_reports.sqlite3")
 
 DataMapper::Model.raise_on_save_failure = true
 
diff --git a/reach_reports/reach_service.rb b/reach_reports/reach_service.rb
index 53acb62..0cf4172 100755
--- a/reach_reports/reach_service.rb
+++ b/reach_reports/reach_service.rb
@@ -133,11 +133,11 @@ module ReachReports
     val_datasets = []
     
     if algorithm
-      cvs = Lib::Crossvalidation.find_all_uniq({:algorithm_uri => algorithm.uri, :finished => true},r.subjectid)
+      cvs = Validation::Crossvalidation.find_all_uniq({:algorithm_uri => algorithm.uri, :finished => true},r.subjectid)
       # PENDING: cv classification/regression hack
       cvs = cvs.delete_if do |cv|
         #val = Validation::Validation.first( :all, :conditions => { :crossvalidation_id => cv.id } )
-        val = Validation::Validation.first( :crossvalidation_id => cv.id )
+        val = Validation::Validation.find( :crossvalidation_id => cv.id ).first
         raise "should not happen: no validations found for crossvalidation "+cv.id.to_s unless val
         (val.classification_statistics!=nil) != (feature_type=="classification")
       end
@@ -196,7 +196,7 @@ module ReachReports
 
     LOGGER.debug "looking for validations with "+{:model_uri => model.uri}.inspect
     #vals = Lib::Validation.find(:all, :conditions => {:model_uri => model.uri})
-    vals = Lib::Validation.all({:model_uri => model.uri})
+    vals = Validation::Validation.find({:model_uri => model.uri})
     uniq_vals = []
     vals.each do |val|
       match = false
diff --git a/reach_reports/reach_test.rb b/reach_reports/reach_test.rb
index 87addfa..43aec28 100755
--- a/reach_reports/reach_test.rb
+++ b/reach_reports/reach_test.rb
@@ -150,7 +150,7 @@ class ReachTest < Test::Unit::TestCase
     
     
     #model_uri = "http://local-ot/model/104"
-    model_uri = "http://local-ot/majority/class/model/125"
+    model_uri = "http://local-ot/model/72"
     
     
 #    m = OpenTox::Model::Generic.find(model_uri)