summaryrefslogtreecommitdiff
path: root/lib/dataset.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-11-11 10:42:48 +0100
committerChristoph Helma <helma@in-silico.ch>2010-11-11 10:42:48 +0100
commit91c95f8dc8f60a8f0029b970ef881eecee28401b (patch)
tree405b4da936104c12a1938b25aa6766b5a526b94e /lib/dataset.rb
parentb93002b4ea50ff7e357da08abd10577347ce2d5f (diff)
Documentation and API fixes for serializer and parser
Diffstat (limited to 'lib/dataset.rb')
-rw-r--r--lib/dataset.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb
index 05b2ed3..6e270e9 100644
--- a/lib/dataset.rb
+++ b/lib/dataset.rb
@@ -77,7 +77,7 @@ module OpenTox
parser.load_csv(csv)
end
- # Load Spreadsheet book (created with roo gem http://roo.rubyforge.org/, excel format specification: http://toxcreate.org/help))
+ # Load Spreadsheet book (created with roo gem http://roo.rubyforge.org/, excel format specification: http://toxcreate.org/help)
# - loads data_entries, compounds, features
# - sets metadata (warnings) for parser errors
# - you will have to set remaining metadata manually
@@ -87,13 +87,13 @@ module OpenTox
save unless @uri # get a uri for creating features
parser = Parser::Spreadsheets.new
parser.dataset = self
- parser.load_excel(book)
+ parser.load_spreadsheet(book)
end
# Load and return only metadata of a Dataset object
# @return [Hash] Metadata of the dataset
def load_metadata
- add_metadata Parser::Owl::Dataset.new(@uri).metadata
+ add_metadata Parser::Owl::Dataset.new(@uri).load_metadata
self.uri = @uri if @uri # keep uri
@metadata
end
@@ -147,8 +147,8 @@ module OpenTox
# Get Excel representation
# @return [Spreadsheet::Workbook] Workbook which can be written with the spreadsheet gem (data_entries only, metadata will will be discarded))
- def to_xls
- Serializer::Spreadsheets.new(self).to_xls
+ def to_spreadsheet
+ Serializer::Spreadsheets.new(self).to_spreadsheet
end
# Get CSV string representation (data_entries only, metadata will be discarded)