update serach facilities, minor test fixes

1 files changed, 13 insertions, 36 deletions

diff --git a/lib/data_mapper_util.rb b/lib/data_mapper_util.rb
index 25d9d61..23f52f5 100644
--- a/lib/data_mapper_util.rb
+++ b/lib/data_mapper_util.rb
@@ -8,53 +8,30 @@ module Lib
       prop_names = model.properties.collect{|p| p.name.to_s if p.is_a?DataMapper::Property::Object}
       params.keys.each do |k|
         key = k.to_s
-        unless prop_names.include?(key)
-          key = key.from_rdf_format
+        if (key == "subjectid")
+          params.delete(k)
+        else
           unless prop_names.include?(key)
-            key = key+"_uri"
+            key = key.from_rdf_format
             unless prop_names.include?(key)
-              key = key+"s"
+              key = key+"_uri"
               unless prop_names.include?(key)
-                raise OpenTox::BadRequestError.new "no attribute found: '"+k.to_s+"'"
+                key = key+"s"
+                unless prop_names.include?(key)
+                  raise OpenTox::BadRequestError.new "no attribute found: '"+k.to_s+"'"
+                end
               end
             end
           end
+          params[key.to_sym] = params.delete(k)
         end
-        params[key.to_sym] = params.delete(k)
       end
       params
     end
     
-#    def self.all(model, filter_params)
-#      prop_names = model.properties.collect{|p| p.name.to_s if p.is_a?DataMapper::Property::Object}
-#      puts prop_names.inspect
-#      
-#      filter_params.keys.each do |k|
-#        key = k.to_s
-#        unless prop_names.include?(key)
-#          key = key.from_rdf_format
-#          unless prop_names.include?(key)
-#            key = key+"_uri"
-#            unless prop_names.include?(key)
-#              key = key+"s"
-#              unless prop_names.include?(key)
-#                err = "no attribute found: '"+k.to_s+"'"
-#                if $sinatra
-#                  $sinatra.halt 400,err
-#                else
-#                  raise err
-#                end
-#              end
-#            end
-#          end
-#        end
-#        filter_params[key.to_sym] = filter_params.delete(k)
-#      end
-#      puts filter_params.inspect
-#      
-#      #model.all(filter_params)
-#      model.all(:model_uris.like => "%")
-#    end
+    def self.all(model, filter_params)
+      model.all(check_params(model,filter_params))
+    end
     
   end 
 end
\ No newline at end of file