summaryrefslogtreecommitdiff
path: root/import.rb
diff options
context:
space:
mode:
Diffstat (limited to 'import.rb')
-rw-r--r--import.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/import.rb b/import.rb
index de6f60b..86b5480 100644
--- a/import.rb
+++ b/import.rb
@@ -2,15 +2,17 @@ post '/dataset/*/import/?' do
find
halt 404, "Compound format #{params[:compound_format]} not (yet) supported" unless params[:compound_format] =~ /smiles|inchi|name/
@compounds_set = Dataset.find File.join(@set.uri, "compounds")
+ @features_set = Dataset.find File.join(@set.uri, "features")
case params[:file][:type]
when "text/csv"
File.open(params[:file][:tempfile].path).each_line do |line|
record = line.chomp.split(/,\s*/)
compound_uri = OpenTox::Compound.new(:smiles => record[0]).uri
feature_uri = OpenTox::Feature.new(:name => @set.name.sub(/dataset\//,''), :values => {:classification => record[1]}).uri
- @compounds_set.add compound_uri unless @compounds_set.member? compound_uri
- # key: /dataset/:dataset/compound/:inchi/:feature_type
- @compound_features = Dataset.find_or_create File.join(@set.uri,'compound',OpenTox::Compound.new(:uri => compound_uri).inchi,URI.escape(params[:feature_type]))
+ @compounds_set.add compound_uri #unless @compounds_set.member? compound_uri
+ @features_set.add feature_uri #unless @features_set.member? feature_uri
+ # key: /dataset/:dataset/compound/:inchi
+ @compound_features = Dataset.find_or_create File.join(@set.uri,'compound',OpenTox::Compound.new(:uri => compound_uri).inchi)
@compound_features.add feature_uri
end
else