From b6134b992fde8784c3556fbca32925e721700d32 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Mon, 20 Feb 2012 16:16:56 +0000
Subject: task catches and reports errors (some dataset tests still fail)

---
 lib/opentox.rb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'lib/opentox.rb')

diff --git a/lib/opentox.rb b/lib/opentox.rb
index ab5c95f..01de3e7 100644
--- a/lib/opentox.rb
+++ b/lib/opentox.rb
@@ -13,7 +13,8 @@ class String
   def to_object
     # TODO: fix, this is unsafe
     self =~ /dataset/ ? uri = File.join(self.chomp,"metadata") : uri = self.chomp
-    raise "#{uri} is not a valid URI." unless RDF::URI.new(uri).uri? 
+    #raise "#{uri} is not a valid URI." unless RDF::URI.new(uri).uri? 
+    raise "#{uri} is not a valid URI." unless uri.uri? 
     RDF::Reader.open(uri) do |reader|
       reader.each_statement do |statement|
         if statement.predicate == RDF.type and statement.subject == uri
@@ -82,7 +83,10 @@ module OpenTox
     if reload
       @metadata = {}
       begin
-        RDF::Reader.open(@uri) do |reader|
+        #puts self.class
+        #self.kind_of?(OpenTox::Dataset) ? uri = URI.join(@uri,"metadata") : uri = @uri
+        #$logger.debug uri
+        RDF::Reader.open(uri) do |reader|
           reader.each_statement do |statement|
             @metadata[statement.predicate] = statement.object if statement.subject == @uri
           end
@@ -151,9 +155,6 @@ module OpenTox
 
   end
 
-  class FromUri
-  end
-
   # create default classes
   SERVICES.each do |s|
     eval "class #{s}
@@ -162,7 +163,5 @@ module OpenTox
     end"
   end
 
-  private
-
 end
 
-- 
cgit v1.2.3