diff options
author | Christoph Helma <helma@in-silico.ch> | 2011-08-16 14:46:31 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2011-08-16 14:46:31 +0200 |
commit | 64354959e04fcac11bcf70e75099691b74573033 (patch) | |
tree | c858f073e1acfcf621f7d2c55b2ae623a7329001 /lib/feature.rb | |
parent | b98bc374b119e5a21f43d4f45048376aeeeead09 (diff) |
initial minimal version
Diffstat (limited to 'lib/feature.rb')
-rw-r--r-- | lib/feature.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/feature.rb b/lib/feature.rb index f3bec5c..84a85b9 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -6,12 +6,12 @@ module OpenTox # Find a feature # @param [String] uri Feature URI - # @return [OpenTox::Task] Feature object + # @return [OpenTox::Feature] Feature object def self.find(uri, subjectid=nil) return nil unless uri - feature = Feature.new uri + feature = Feature.new uri, subjectid if (CONFIG[:yaml_hosts].include?(URI.parse(uri).host)) - feature.add_metadata YAML.load(RestClientWrapper.get(uri,{:accept => "application/x-yaml", :subjectid => subjectid})) + feature.add_metadata YAML.load(RestClientWrapper.get(uri,{:accept => "application/x-yaml", :subjectid => @subjectid})) else feature.add_metadata Parser::Owl::Dataset.new(uri).load_metadata end |