diff options
| -rw-r--r-- | lib/dataset.rb | 2 | ||||
| -rw-r--r-- | lib/task.rb | 4 | ||||
| -rw-r--r-- | lib/validation.rb | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/dataset.rb b/lib/dataset.rb index 9304eec..e21ccce 100644 --- a/lib/dataset.rb +++ b/lib/dataset.rb @@ -15,7 +15,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/ + if uri.match(@@config[:services]["opentox-dataset"]) || uri=~ /188.40.32.88/ || uri =~ /informatik/ accept_header = 'text/x-yaml' else accept_header = "application/rdf+xml" diff --git a/lib/task.rb b/lib/task.rb index 181b895..8f87f45 100644 --- a/lib/task.rb +++ b/lib/task.rb @@ -1,7 +1,7 @@ LOGGER.progname = File.expand_path(__FILE__) -DEFAULT_TASK_MAX_DURATION = 360 -EXTERNAL_TASK_MAX_DURATION = 120 +DEFAULT_TASK_MAX_DURATION = 3600 +EXTERNAL_TASK_MAX_DURATION = 1200 $self_task=nil diff --git a/lib/validation.rb b/lib/validation.rb index 97aafc4..bd38488 100644 --- a/lib/validation.rb +++ b/lib/validation.rb @@ -5,13 +5,15 @@ module OpenTox def initialize(params) #resource = RestClient::Resource.new(params[:uri], :user => @@users[:users].keys[0], :password => @@users[:users].values[0]) - #@uri = resource.post(params).to_s + #@uri = resource.post(params).body + #LOGGER.debug "VALIDATION URI: " + @uri.to_s call = "curl -X POST " params.each do |k,v| - call += " -d "+k.to_s+"=\""+v.to_s+"\"" unless k == :uri + call += " -d "+k.to_s+"=\""+URI.encode(v.to_s)+"\"" unless k == :uri end call += " "+params[:uri] LOGGER.debug call + @uri = `#{call}` end def self.crossvalidation(params) |