From 1652bc3f3e635948fc3a73817f407adc6dee071a Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Wed, 14 Mar 2012 11:44:53 +0000
Subject: metadata methods fixed

---
 lib/opentox.rb |  8 ++++----
 lib/task.rb    | 22 ++++------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

(limited to 'lib')

diff --git a/lib/opentox.rb b/lib/opentox.rb
index 0d88eaa..9493362 100644
--- a/lib/opentox.rb
+++ b/lib/opentox.rb
@@ -31,10 +31,10 @@ module OpenTox
     pull if @rdf.empty?
     metadata = {}
     @rdf.query([RDF::URI.new(@uri),nil,nil]).collect do |statement|
-      metadata[statement.predicate.to_s] ||= []
-      metadata[statement.predicate.to_s] << statement.object.to_s
+      metadata[statement.predicate] ||= []
+      metadata[statement.predicate] << statement.object
     end
-    metadata
+    metadata.each{|k,v| metadata[k] = v.first if v.size == 1}
   end
 
   # Get metadata values 
@@ -42,7 +42,7 @@ module OpenTox
   # @return [Array] Values for supplied key
   def [](key)
     pull if @rdf.empty?
-    result = @rdf.query([RDF::URI.new(@uri),key,nil]).collect{|statement| statement.object.to_s}
+    result = @rdf.query([RDF::URI.new(@uri),key,nil]).collect{|statement| statement.object}
     result.size == 1 ? result.first : result
   end
 
diff --git a/lib/task.rb b/lib/task.rb
index be02deb..9921c4c 100644
--- a/lib/task.rb
+++ b/lib/task.rb
@@ -97,24 +97,10 @@ module OpenTox
 
   def method_missing(method,*args)
     method = method.to_s
-    begin
-      case method
-      when /=/
-        res = RestClientWrapper.put(File.join(@uri,method.sub(/=/,'')),{})
-        super unless res.code == 200
-      else
-        pull
-        response = self.[](RDF::OT[method])
-        response = self.[](RDF::OT1[method]) if response.empty?  # API 1.1 compatibility
-        internal_server_error "No #{method} metadata for #{@uri} " if response.empty?
-        return response.uniq.first.to_s
-      end
-    rescue OpenTox::Error
-      raise $!
-    rescue
-      $logger.error "Unknown #{self.class} method #{method}"
-      super
-    end
+    response = self.[](RDF::OT[method])
+    response = self.[](RDF::OT1[method]) if response.empty?  # API 1.1 compatibility
+    internal_server_error "Unknown #{self.class} method #{method} for #{@uri}" if response.is_a? Array and response.empty?
+    return response.to_s
   end
 
   #TODO: subtasks
-- 
cgit v1.2.3