summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2013-02-11 16:12:06 +0100
committerChristoph Helma <helma@in-silico.ch>2013-02-11 16:12:06 +0100
commit49c0dcc7617b83a467d44c77e3164f8d87f63844 (patch)
tree0c042e08d8dc1c85502bf68ea3e01d2de31c1b5b
parenta5df97ffcc5dea6b6bd79ba18f38fae390685c7a (diff)
roo version set to 1.10.1 (1.10.2 is defunct)
-rw-r--r--application.rb3
-rw-r--r--dataset.gemspec2
2 files changed, 2 insertions, 3 deletions
diff --git a/application.rb b/application.rb
index f106aef..a2c8747 100644
--- a/application.rb
+++ b/application.rb
@@ -35,6 +35,7 @@ module OpenTox
def from_spreadsheet spreadsheet
extensions = { Excel => ".xls", Excelx => ".xlsx", Openoffice => ".ods" }
+ puts params[:file][:tempfile].path
input = params[:file][:tempfile].path + ".xls"
csv_file = params[:file][:tempfile].path + ".csv"
File.rename params[:file][:tempfile].path, input # roo needs "correct" extensions
@@ -355,8 +356,6 @@ module OpenTox
end
end
table
-=begin
-=end
end
def feature_type(value)
diff --git a/dataset.gemspec b/dataset.gemspec
index d82e8b3..99569a9 100644
--- a/dataset.gemspec
+++ b/dataset.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
# specify any dependencies here; for example:
s.add_runtime_dependency "opentox-server"
- s.add_runtime_dependency 'roo', "~>1.10.1"
+ s.add_runtime_dependency 'roo', "=1.10.1" # 1.10.2 is defunct
s.add_runtime_dependency "openbabel", "~>2.3.1.5"
s.post_install_message = "Please configure your service in ~/.opentox/config/dataset.rb"
end