diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-10-29 16:18:19 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-10-29 16:18:19 +0100 |
commit | 35346926e9690f14a7e587d62ef76e82ddcac3ad (patch) | |
tree | 5755b8eb361461a75d3bb03a8c82e58a4a1c413d | |
parent | 06558a5ccc9199fd71f4823c70e4163af61f1d27 (diff) |
Avoiding feature rdf
-rw-r--r-- | application.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/application.rb b/application.rb index a0db875..99abe09 100644 --- a/application.rb +++ b/application.rb @@ -294,13 +294,14 @@ module OpenTox table = [] if ordered? 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 - feat[RDF.type].include?(RDF::OT.StringFeature) and - !feat[RDF.type].include?(RDF::OT.NumericFeature)) + sparql_constraints = {:type => RDF.type, :title => RDF::DC.title} + feature_props = OpenTox::Dataset.find_props_sparql(features.collect { |f| f.uri }, sparql_constraints) + quoted_features = []; feature_names = [] + features.each { |feature| + quoted_features << feature_props[feature.uri][:type].include?(RDF::OT.NominalFeature) + feature_names << feature_props[feature.uri][:title][0].strip } - table << ["InChI"] + features.collect{ |f| "\"" + f[RDF::DC.title] + "\"" } + table << ["InChI"] + feature_names compounds = OpenTox::Dataset.find_compounds_sparql(@uri) values = OpenTox::Dataset.find_data_entries_sparql(@uri) values += Array.new(compounds.size*features.size-values.size, "") |