summaryrefslogtreecommitdiff
path: root/lib/dataset.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2012-06-28 14:29:05 +0200
committerChristoph Helma <helma@in-silico.ch>2012-06-28 14:29:05 +0200
commit5ecdec2682ac6b61912afe74123b6d3d7c15e771 (patch)
tree1b7ec4f4e11328d8691b38da2169332619ba75f6 /lib/dataset.rb
parent5f61cefdefc51a728147478820ffe04c5ec127d5 (diff)
Dataset.data_entries fixed
Diffstat (limited to 'lib/dataset.rb')
-rw-r--r--lib/dataset.rb13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb
index 8032533..1367d3f 100644
--- a/lib/dataset.rb
+++ b/lib/dataset.rb
@@ -4,13 +4,18 @@ module OpenTox
class Dataset
def data_entries
- # TODO fix for api 1.2
data_entries = []
pull
@reload = false
- metadata[RDF::OT1.dataEntry].collect{|data_entry|
- data_entries << @rdf.to_hash[data_entry]
- }
+ begin
+ metadata[RDF::OT.dataEntry].collect{|data_entry| data_entries << @rdf.to_hash[data_entry] }
+ rescue
+ end
+ begin
+ # TODO: remove API 1.1
+ metadata[RDF::OT1.dataEntry].collect{|data_entry| data_entries << @rdf.to_hash[data_entry] }
+ rescue
+ end
@reload = true
data_entries
end