Merge branch 'development' of github.com:opentox/opentox-client into development

Conflicts:
	lib/opentox.rb

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/opentox.rb b/lib/opentox.rb
index 95dca04..52f705c 100644
--- a/lib/opentox.rb
+++ b/lib/opentox.rb
@@ -121,7 +121,7 @@ module OpenTox
   end
 
   # Delete object at webservice
-  def delete 
+  def delete subjectid=nil
     RestClientWrapper.delete(@uri.to_s,nil,{:subjectid => @subjectid})
     Authorization.delete_policies_from_uri(@uri, @subjectid) if $aa[:uri]
   end
@@ -131,13 +131,11 @@ module OpenTox
   end
   
   def create_rdf
-    @rdf = RDF::Graph.new #if @rdf.empty? or URI.task?(@uri)
-    @metadata[RDF.type] ||= eval("RDF::OT."+self.class.to_s.split('::').last)
+    @rdf = RDF::Graph.new
+    @metadata[RDF.type] ||= RDF::URI.new(eval("RDF::OT."+self.class.to_s.split('::').last))
     @metadata[RDF::DC.date] ||= DateTime.now
     @metadata.each do |predicate,values|
-      [values].flatten.each do |value|
-        predicate =~ /#{RDF::DC.date}|#{RDF::DC.title}|#{RDF::DC.description}/ ? @rdf.update([RDF::URI.new(@uri), predicate, value]) : @rdf << [RDF::URI.new(@uri), predicate, value]
-      end
+      [values].flatten.each{ |value| @rdf << [RDF::URI.new(@uri), predicate, (value == eval("RDF::OT."+self.class.to_s.split('::').last)) ? RDF::URI.new(value) : value] }
     end
     @parameters.each do |parameter|
       p_node = RDF::Node.new