From fa07e898dbc53f2f3cd9c5740ecbb2ebd29bd649 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Mon, 9 Aug 2010 17:37:26 +0200
Subject: configuration simplified

---
 lib/dataset.rb            |  3 +--
 lib/environment.rb        |  4 ++--
 lib/templates/config.yaml | 30 +++---------------------------
 3 files changed, 6 insertions(+), 31 deletions(-)

(limited to 'lib')

diff --git a/lib/dataset.rb b/lib/dataset.rb
index c0f54fc..ca252a1 100644
--- a/lib/dataset.rb
+++ b/lib/dataset.rb
@@ -31,8 +31,7 @@ module OpenTox
     def self.find(uri, accept_header=nil) 
     
       unless accept_header
-        #if uri.match(@@config[:services]["opentox-dataset"]) || uri=~ /188.40.32.88/ || uri =~ /informatik/
-        if (uri.match(@@config[:services]["opentox-dataset"]) || uri =~ /in-silico.ch/) && !@@config[:accept_headers]["opentox-dataset"].grep(/yaml/).empty?
+        if (@@config[:yaml_hosts].include?(URI.parse(uri).host))
           accept_header = 'application/x-yaml'
         else
           accept_header = "application/rdf+xml"
diff --git a/lib/environment.rb b/lib/environment.rb
index 1551448..80899c5 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -73,5 +73,5 @@ TRUE_REGEXP = /^(true|active|1|1.0)$/i
 FALSE_REGEXP = /^(false|inactive|0|0.0)$/i
 
 # Task durations
-DEFAULT_TASK_MAX_DURATION = @@config[:default_task_max_duration]
-EXTERNAL_TASK_MAX_DURATION = @@config[:external_task_max_duration]
+DEFAULT_TASK_MAX_DURATION = 3600
+EXTERNAL_TASK_MAX_DURATION = 3600
diff --git a/lib/templates/config.yaml b/lib/templates/config.yaml
index a833030..00c00cb 100644
--- a/lib/templates/config.yaml
+++ b/lib/templates/config.yaml
@@ -32,34 +32,10 @@
   opentox-task:          "http://localhost/task/"
   opentox-validation:    "http://localhost/validation/"
 #
-# Accept headers:
+# Yaml capable hosts (faster than OWL-DL)
 #
-:accept_headers:
-  opentox-compound:      
-    - "chemical/x-daylight-smiles"
-    - "chemical/x-inchi"
-    - "chemical/x-mdl-sdfile"
-    - "image/gif"
-    - "text/plain"
-  opentox-dataset:       
-    - "application/x-yaml"
-    - "application/rdf+xml"
-  opentox-algorithm:     
-    - "application/x-yaml"
-    - "application/rdf+xml"
-  opentox-model:         
-    - "application/x-yaml"
-    - "application/rdf+xml"
-  opentox-task:          
-    - "application/x-yaml"
-    - "application/rdf+xml"
-  opentox-validation:    
-    - "application/x-yaml"
-    - "application/rdf+xml"
-
-# Timeouts:
-:default_task_max_duration: 3600
-:external_task_max_duration: 3600
+:yaml_hosts:
+  - "localhost"
 
 # Uncomment for verbose logging
 # :logger: debug
-- 
cgit v1.2.3