diff options
author | mguetlein <martin.guetlein@gmail.com> | 2011-02-21 15:44:24 +0100 |
---|---|---|
committer | mguetlein <martin.guetlein@gmail.com> | 2011-02-21 15:44:24 +0100 |
commit | 9bc9d1c5c11aa64d410200cc21d07acc39cc3019 (patch) | |
tree | f2f1f8ba9ca00b474cb7d22732d6a906e6cf58e0 | |
parent | 53dec3e3b1a59760ac9440749d159edc7ac09359 (diff) |
fix for Datset#add false values, fix for parsing compounds without values
-rw-r--r-- | lib/dataset.rb | 2 | ||||
-rw-r--r-- | lib/parser.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb index efab0a3..2c47502 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -237,7 +237,7 @@ module OpenTox @features[feature] = {} unless @features[feature] @data_entries[compound] = {} unless @data_entries[compound] @data_entries[compound][feature] = [] unless @data_entries[compound][feature] - @data_entries[compound][feature] << value if value + @data_entries[compound][feature] << value if value!=nil end # Add/modify metadata, existing entries will be overwritten diff --git a/lib/parser.rb b/lib/parser.rb index f1249ad..f33017d 100644 --- a/lib/parser.rb +++ b/lib/parser.rb @@ -171,6 +171,10 @@ module OpenTox data[triple[0]][:compound] = triple[2] when /#{OT.feature}/i feature[triple[0]] = triple[2] + when /#{RDF.type}/i + if triple[2]=~/#{OT.Compound}/i and !data[triple[0]] + data[triple[0]] = {:compound => triple[0], :values => []} + end else end end |