aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/import_task.rb
diff options
context:
space:
mode:
authorLuc Donnet2015-04-28 11:33:06 +0200
committerLuc Donnet2015-04-28 11:33:06 +0200
commit65c184fd0408f5f1d2eec6891cfdf918eb7c8b3b (patch)
tree0d051f7a1a5e6f91c6a84c1baa34edfddc9b1206 /app/models/import_task.rb
parentabdfb2c468c6267bcf3cdc335faa05132e5a6a2a (diff)
downloadchouette-core-65c184fd0408f5f1d2eec6891cfdf918eb7c8b3b.tar.bz2
refactor css and model for import
Diffstat (limited to 'app/models/import_task.rb')
-rw-r--r--app/models/import_task.rb18
1 files changed, 11 insertions, 7 deletions
diff --git a/app/models/import_task.rb b/app/models/import_task.rb
index 797085752..b454983d4 100644
--- a/app/models/import_task.rb
+++ b/app/models/import_task.rb
@@ -43,7 +43,7 @@ class ImportTask
# Call Iev Server
begin
Ievkit.create_job(referential.name, "importer", data_format, {
- :file1 => action_params_io,
+ :file1 => params_io,
:file2 => transport_data_io
}
@@ -69,11 +69,13 @@ class ImportTask
def self.data_formats
self.data_format.values
end
-
- def action_params_io
- file = StringIO.new( action_params.to_s )
+
+ def params_io
+ params = action_params.merge(validation_params)
+ puts params.inspect
+ file = StringIO.new( params.to_s )
Faraday::UploadIO.new(file, "application/json", "parameters.json")
- end
+ end
def transport_data_io
file = File.new(saved_resources_path, "r")
@@ -85,8 +87,10 @@ class ImportTask
end
# TODO : How to find RuleParameterSet
- def rule_parameter_set_io
- UploadIO.new(rule_parameter_set.parameters, "application/octet-stream", "rule_parameter_set") if rule_parameter_set.present?
+ def validation_params
+ {
+ "validation" => rule_parameter_set.parameters
+ } if rule_parameter_set.present?
end
def save_resources