From 8a2b749ccef94b229a32ec716c93388f5c7495d7 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 31 Oct 2012 15:35:34 +0100
Subject: Fixed get for dataset from RDF

---
 lib/dataset.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib/dataset.rb')

diff --git a/lib/dataset.rb b/lib/dataset.rb
index 4351dc5..288e4d3 100644
--- a/lib/dataset.rb
+++ b/lib/dataset.rb
@@ -29,17 +29,21 @@ module OpenTox
 
     def get(force_no_backend_query=false)
       have_rdf = (force_no_backend_query and @rdf.size>0)
-      super() unless have_rdf
       ordered = (have_rdf or OpenTox::Dataset.ordered?(@uri))
+      super() if (!have_rdf and !ordered)
       @features = []
       @compounds = []
       @data_entries = []
 
       # AM: read ordered dataset from RDF
       if ordered
-        @uri = s[0].uri.to_s if have_rdf # AM: must rewrite URI
-        @compounds = find_compounds_rdf
-        @features = find_features_rdf
+        # Read only some data as rdf
+        unless have_rdf
+          self.parse_rdfxml( RestClient.get([@uri,"allnde"].join("/"),{:accept => "application/rdf+xml"}), true )
+        end
+        @compounds = self.find_compounds_rdf
+        @features = self.find_features_rdf
+
         numeric_features = @features.collect{|f| 
           f.get
           f[RDF.type].include?(RDF::OT.NumericFeature) or f[RDF.type].include?(RDF::OT.Substructure)
-- 
cgit v1.2.3