summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-10-26 16:12:49 +0200
committerAndreas Maunz <andreas@maunz.de>2012-10-26 16:12:49 +0200
commit857fb907929b1d3947936f7ef928c634f08dcbd7 (patch)
tree4a4e383143dff4806d66fa025e74ae0b0f5be8a5
parent5b02cf8acb89997bdbdabfda43ade98aef676ac0 (diff)
Function names fixed
-rw-r--r--application.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/application.rb b/application.rb
index ccb4b0a..0b1d83e 100644
--- a/application.rb
+++ b/application.rb
@@ -293,7 +293,7 @@ module OpenTox
accept = "text/uri-list"
table = []
if ordered?
- features = OpenTox::Dataset.find_features(@uri)
+ features = OpenTox::Dataset.find_features_sparql(@uri)
features.each { |feat| feat.get }
quoted_features = features.collect { |feat|
(feat[RDF.type].include?(RDF::OT.NominalFeature) or
@@ -301,8 +301,8 @@ module OpenTox
!feat[RDF.type].include?(RDF::OT.NumericFeature))
}
table << ["InChI"] + features.collect{ |f| "\"" + f[RDF::DC.title] + "\"" }
- compounds = OpenTox::Dataset.find_compounds(@uri)
- values = OpenTox::Dataset.find_data_entries(@uri)
+ compounds = OpenTox::Dataset.find_compounds_sparql(@uri)
+ values = OpenTox::Dataset.find_data_entries_sparql(@uri)
values.each_slice(features.size).each_with_index { |vals,row_idx|
table << ["\"#{compounds[row_idx].inchi}\""] + vals.each_with_index.collect { |value,col_idx| (quoted_features[col_idx] ? "\"#{value}\"" : value) }
}