lib/rfm/utilities/factory.rb in lardawge-rfm-1.4.1.2 vs lib/rfm/utilities/factory.rb in lardawge-rfm-1.4.2
- old
+ new
@@ -18,11 +18,11 @@
super or (self[dbname] = Rfm::Database.new(dbname, @server))
end
def all
if !@loaded
- Rfm::Result::ResultSet.new(@server, @server.connect(@server.state[:account_name], @server.state[:password], '-dbnames', {}).body).each {|record|
+ Rfm::Result::ResultSet.new(@server, @server.connect('-dbnames', {}).body).each {|record|
name = record['DATABASE_NAME']
self[name] = Rfm::Database.new(name, @server) if self[name] == nil
}
@loaded = true
end
@@ -43,11 +43,11 @@
super or (self[layout_name] = Rfm::Layout.new(layout_name, @database))
end
def all
if !@loaded
- Rfm::Result::ResultSet.new(@server, @server.connect(@server.state[:account_name], @server.state[:password], '-layoutnames', {"-db" => @database.name}).body).each {|record|
+ Rfm::Result::ResultSet.new(@server, @server.connect('-layoutnames', {"-db" => @database.name}).body).each {|record|
name = record['LAYOUT_NAME']
self[name] = Rfm::Layout.new(name, @database) if self[name] == nil
}
@loaded = true
end
@@ -68,17 +68,17 @@
super or (self[script_name] = Rfm::Script.new(script_name, @database))
end
def all
if !@loaded
- Rfm::Result::ResultSet.new(@server, @server.connect(@server.state[:account_name], @server.state[:password], '-scriptnames', {"-db" => @database.name}).body).each {|record|
+ Rfm::Result::ResultSet.new(@server, @server.connect('-scriptnames', {"-db" => @database.name}).body).each {|record|
name = record['SCRIPT_NAME']
self[name] = Rfm::Script.new(name, @database) if self[name] == nil
}
@loaded = true
end
self.values
end
end
end
-end
\ No newline at end of file
+end