summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.de>2010-02-16 16:22:46 +0100
committerChristoph Helma <helma@in-silico.de>2010-02-16 16:22:46 +0100
commit6fd9a778573582a414318f20bbe95a7c5606b98d (patch)
tree7d537c711deb46689d30833e5d631fc3a51626b9
parent34fe4a160ca7002e2b166925c6721e9ba9871b3e (diff)
length for uri and file entries extended to 255 characters
-rw-r--r--application.rb6
-rw-r--r--views/compound.xml.builder11
-rw-r--r--views/dataset.xml.builder7
-rw-r--r--views/feature.xml.builder11
4 files changed, 3 insertions, 32 deletions
diff --git a/application.rb b/application.rb
index 8464e89..20f6185 100644
--- a/application.rb
+++ b/application.rb
@@ -5,8 +5,8 @@ require 'opentox-ruby-api-wrapper'
class Dataset
include DataMapper::Resource
property :id, Serial
- property :uri, String, :length => 100
- property :file, String
+ property :uri, String, :length => 255
+ property :file, String, :length => 255
#property :owl, Text, :length => 1000000
property :created_at, DateTime
@@ -42,7 +42,7 @@ get '/:id/?' do
when /rdf/ # redland sends text/rdf instead of application/rdf+xml
dataset.owl
when /yaml/
- OpenTox::Dataset.find(uri).to_yaml
+ OpenTox::Dataset.find(dataset.uri).to_yaml
else
halt 400, "Unsupported MIME type '#{accept}'"
end
diff --git a/views/compound.xml.builder b/views/compound.xml.builder
deleted file mode 100644
index b4f6cfa..0000000
--- a/views/compound.xml.builder
+++ /dev/null
@@ -1,11 +0,0 @@
-xml.instruct!
-xml.dataset do
- @compounds.each do |compound,features|
- xml.compound do
- xml.uri compound
- features.each do |f|
- xml.feature_uri f
- end
- end
- end
-end
diff --git a/views/dataset.xml.builder b/views/dataset.xml.builder
deleted file mode 100644
index f540d24..0000000
--- a/views/dataset.xml.builder
+++ /dev/null
@@ -1,7 +0,0 @@
-xml.instruct!
-xml.dataset do
- xml.uri url_for("/", :full) + @dataset.id.to_s
- xml.name @dataset.name
- xml.finished @dataset.finished
-end
-
diff --git a/views/feature.xml.builder b/views/feature.xml.builder
deleted file mode 100644
index f9d9881..0000000
--- a/views/feature.xml.builder
+++ /dev/null
@@ -1,11 +0,0 @@
-xml.instruct!
-xml.dataset do
- @features.each do |feature,compounds|
- xml.feature do
- xml.uri feature
- compounds.each do |c|
- xml.compound_uri c
- end
- end
- end
-end