resolved conflicts, replace text/x-yaml with application/x-yaml, acceess classification values w/o confidence

1 files changed, 61 insertions, 13 deletions

diff --git a/lib/templates/config.yaml b/lib/templates/config.yaml
index ad7c4ab..3b97983 100644
--- a/lib/templates/config.yaml
+++ b/lib/templates/config.yaml
@@ -1,20 +1,68 @@
 # Example configuration for OpenTox, please adjust to your settings
 # 
+# Database setup:
+#
+# Example MySql:
+#
+ :database: 
+   :adapter:  mysql
+   :database: production
+   :username: root
+   :password: opentox
+   :host:     localhost
+#
 # Example 1: Using external test services
 #
 # :services:
-#  opentox-compound:      "http://webservices.in-silico.ch/test/compound/"
-#  opentox-dataset:       "http://webservices.in-silico.ch/test/dataset/"
-#  opentox-algorithm:     "http://webservices.in-silico.ch/test/algorithm/"
-#  opentox-model:         "http://webservices.in-silico.ch/test/model/"
-#  opentox-task:         "http://webservices.in-silico.ch/test/task/"
+#  opentox-compound:      "http://webservices.in-silico.ch/compound/"
+#  opentox-dataset:       "http://webservices.in-silico.ch/dataset/"
+#  opentox-algorithm:     "http://webservices.in-silico.ch/algorithm/"
+#  opentox-model:         "http://webservices.in-silico.ch/model/"
+#  opentox-task:          "http://webservices.in-silico.ch/task/"
+#  opentox-validation:    "http://opentox.informatik.uni-freiburg.de/validation/"
 #
 # Example 2: Using local services
-# :base_dir: /home/ch/webservices
-# :webserver: thin
-# :services:
-#   opentox-compound:      "http://localhost:4000/"
-#   opentox-dataset:       "http://localhost:4001/"
-#   opentox-algorithm:     "http://localhost:4002/"
-#   opentox-model:         "http://localhost:4003/"
-#   opentox-task:          "http://localhost:4004/"
+ :base_dir: /home/ist/webservices
+ :webserver: passenger
+ :services:
+   opentox-compound:      "http://localhost/compound/"
+   opentox-dataset:       "http://localhost/dataset/"
+   opentox-algorithm:     "http://localhost/algorithm/"
+   opentox-model:         "http://localhost/model/"
+   opentox-task:          "http://localhost/task/"
+   opentox-validation:    "http://opentox.informatik.uni-freiburg.de/validation/"
+#
+# Accept headers:
+#
+ :accept_headers:
+   opentox-compound:      
+     - "chemical/x-daylight-smiles"
+     - "chemical/x-inchi"
+     - "chemical/x-mdl-sdfile"
+     - "image/gif"
+     - "text/plain"
+   opentox-dataset:       
+     - "application/x-yaml"
+     - "text/x-yaml"
+     - "application/rdf+xml"
+   opentox-algorithm:     
+     - "application/x-yaml"
+     - "text/x-yaml"
+     - "application/rdf+xml"
+   opentox-model:         
+     - "application/x-yaml"
+     - "text/x-yaml"
+     - "application/rdf+xml"
+   opentox-task:          
+     - "application/x-yaml"
+     - "text/x-yaml"
+     - "application/rdf+xml"
+   opentox-validation:    
+     - "application/x-yaml"
+     - "text/x-yaml"
+     - "application/rdf+xml"
+
+# Timeouts:
+# 
+ :default_task_max_duration: 3600
+ :external_task_max_duration: 3600