limit data page to 1-3000 collections

[arvados.git] / app / models / orvos_base.rb

diff --git a/app/models/orvos_base.rb b/app/models/orvos_base.rb
index e4eff9c93aa37ed6e587d47b70ba172538731dd2..96016059cad97d232c5a177698cafaf117cc5cc5 100644 (file)
--- a/app/models/orvos_base.rb
+++ b/app/models/orvos_base.rb
@@ -23,11 +23,17 @@ class OrvosBase < ActiveRecord::Base
     ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
   end
   def self.find(uuid)
+    if uuid.class != String or uuid.length < 27 then
+      raise 'argument to find() must be a uuid string. Acceptable formats: warehouse locator or string with format xxxxx-xxxxx-xxxxxxxxxxxxxxx'
+    end
     new.private_reload(uuid)
   end
   def self.where(*args)
     OrvosResourceList.new(self).where(*args)
   end
+  def self.limit(*args)
+    OrvosResourceList.new(self).limit(*args)
+  end
   def self.eager(*args)
     OrvosResourceList.new(self).eager(*args)
   end
@@ -105,14 +111,14 @@ class OrvosBase < ActiveRecord::Base
       hash = $orvos_api_client.api(self.class, '/' + uuid_or_hash)
     end
     hash.each do |k,v|
-      if self.respond_to?((k.to_s + '=').to_s)
+      if self.respond_to?(k.to_s + '=')
         self.send(k.to_s + '=', v)
       else
         # When OrvosApiClient#schema starts telling us what to expect
         # in API responses (not just the server side database
         # columns), this sort of awfulness can be avoided:
         self.instance_variable_set('@' + k.to_s, v)
-        if !self.respond_to?(k.to_s)
+        if !self.respond_to? k
           singleton = class << self; self end
           singleton.send :define_method, k, lambda { instance_variable_get('@' + k.to_s) }
         end