diff options
author | Christoph Helma <helma@in-silico.ch> | 2013-06-19 16:31:52 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2013-06-19 16:31:52 +0200 |
commit | 308ed58dc56815317f89654a0cc4ab7fb70a9f31 (patch) | |
tree | 3d1af6d1eba03c6dc1d29966005d7bebbc4cde16 | |
parent | bc9d5b9266e18d39ab5fd83db272bffde98c4161 (diff) | |
parent | fc931b802f4e32d4d19ff37e9d1d708a39efbce9 (diff) |
Merge branch 'development' of github.com:opentox/opentox-client into development
Conflicts:
lib/opentox.rb
-rw-r--r-- | lib/dataset.rb | 2 | ||||
-rw-r--r-- | lib/opentox.rb | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb index 9efae20..5df20b4 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -221,7 +221,7 @@ module OpenTox # redefine rdf serialization methods send :define_method, "to_#{format}".to_sym do - @metadata[RDF.type] = RDF::OT.OrderedDataset + @metadata[RDF.type] = [RDF::OT.Dataset, RDF::OT.OrderedDataset] create_rdf @features.each_with_index do |feature,i| @rdf << [RDF::URI.new(feature.uri), RDF::URI.new(RDF.type), RDF::URI.new(RDF::OT.Feature)] 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 |