cdm_migrator 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/cdm_migrator/cdm_controller.rb +4 -2
- data/app/controllers/cdm_migrator/csv_controller.rb +1 -1
- data/app/views/cdm_migrator/cdm/mappings.html.erb +2 -2
- data/app/views/cdm_migrator/csv/upload.html.erb +2 -2
- data/config/routes.rb +3 -3
- data/lib/cdm_migrator/version.rb +1 -1
- data/lib/generators/cdm_migrator/install/templates/config/cdm_migrator.yml +4 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4cb394b2b49d7e24c434c0fbe4b85f616f2e67ae
|
|
4
|
+
data.tar.gz: 91ea320ad23de3919c5483cd2b8f69720cec721e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 191849478a3d433b99b3f1a764106c1db1f4175f99c92088b4446901aa0ca214961410f6e0ab2f71fa174333be6fbba9dd737d26d8a62286180c95587b6785e2
|
|
7
|
+
data.tar.gz: 361e497329beb948aedab5a6baf7c844c4711d8e8710132cdc04611ce9d7fd548f41656cb0d3d7d36e0d3eaf07e87898cddbcedb6a8b2e7aca8e86ed5dc8d6b2
|
|
@@ -5,7 +5,7 @@ module CdmMigrator
|
|
|
5
5
|
super
|
|
6
6
|
@cdm_url = CdmMigrator::Engine.config["cdm_url"]
|
|
7
7
|
@cdm_port = CdmMigrator::Engine.config["cdm_port"]
|
|
8
|
-
@cdm_dirs = CdmMigrator::Engine.config["cdm_dirs"]
|
|
8
|
+
@cdm_dirs = CdmMigrator::Engine.config["cdm_dirs"] || false
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
before_action :set_exclusive_fields, only: [:generate, :mappings]
|
|
@@ -83,7 +83,9 @@ module CdmMigrator
|
|
|
83
83
|
def mappings
|
|
84
84
|
json = JSON.parse(Net::HTTP.get_response(URI.parse("#{@cdm_url}:#{@cdm_port}/dmwebservices/index.php?q=dmGetCollectionFieldInfo/"+params['collection']+'/json')).body)
|
|
85
85
|
@cdm_terms = json.collect { |c| [c['name'],c['nick']] }
|
|
86
|
-
|
|
86
|
+
if @cdm_dirs
|
|
87
|
+
get_dirs
|
|
88
|
+
end
|
|
87
89
|
end
|
|
88
90
|
|
|
89
91
|
def collection
|
|
@@ -24,7 +24,7 @@ module CdmMigrator
|
|
|
24
24
|
CsvUploadJob.perform_later(params[:csv_import][:csv_file].path, params[:csv_import][:mvs], @current_user)
|
|
25
25
|
#perform(params[:csv_import][:csv_file].path, params[:csv_import][:mvs], @current_user)
|
|
26
26
|
flash[:notice] = "csv successfully uploaded"
|
|
27
|
-
redirect_to
|
|
27
|
+
redirect_to csv_upload_path
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
def perform(csv, mvs, current_user)
|
|
@@ -9,7 +9,7 @@ table td{
|
|
|
9
9
|
border:1px solid black;
|
|
10
10
|
}
|
|
11
11
|
</style>
|
|
12
|
-
<%= form_tag cdm_generate_path
|
|
12
|
+
<%= form_tag cdm_generate_path.gsub("generate","generate.csv") do %>
|
|
13
13
|
<%= hidden_field_tag "collection", params[:collection] %>
|
|
14
14
|
<%= hidden_field_tag "file_system", params[:file_system] %>
|
|
15
15
|
<table>
|
|
@@ -27,7 +27,7 @@ border:1px solid black;
|
|
|
27
27
|
</tr>
|
|
28
28
|
<% end %>
|
|
29
29
|
</table>
|
|
30
|
-
<%= select_tag "mappings_url", options_for_select(@dirs) %>
|
|
30
|
+
<%= select_tag "mappings_url", options_for_select(@dirs) if @cdm_dirs %>
|
|
31
31
|
<%= hidden_field_tag "work", params[:work] %>
|
|
32
32
|
<%= submit_tag 'generate csv' %>
|
|
33
33
|
<% end %>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<%= form_for :csv_import, url:
|
|
1
|
+
<%= form_for :csv_import, url: csv_create_path do |f| %>
|
|
2
2
|
<%= f.label 'Multi-value Separator:' %>
|
|
3
3
|
<%= f.text_field 'mvs' %>
|
|
4
4
|
<br />
|
|
@@ -7,4 +7,4 @@
|
|
|
7
7
|
<%= f.submit 'Save' %>
|
|
8
8
|
<% end %>
|
|
9
9
|
<br />
|
|
10
|
-
<%= link_to "template",
|
|
10
|
+
<%= link_to "template", csv_generate_path %>
|
data/config/routes.rb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
CdmMigrator::Engine.routes.draw do
|
|
2
|
-
get '/csv/upload', to: 'csv#upload'
|
|
3
|
-
post '/csv/upload', to: 'csv#create'
|
|
4
|
-
get '/csv/generate', to: 'csv#generate'
|
|
2
|
+
get '/csv/upload', to: 'csv#upload', as: 'csv_upload'
|
|
3
|
+
post '/csv/upload', to: 'csv#create', as: 'csv_create'
|
|
4
|
+
get '/csv/generate', to: 'csv#generate', as: 'csv_generate'
|
|
5
5
|
|
|
6
6
|
get 'cdm/collection', to: 'cdm#collection'
|
|
7
7
|
get 'cdm/mappings/', to: 'cdm#mappings', as: 'cdm_mappings'
|
data/lib/cdm_migrator/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cdm_migrator
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- sephirothkod
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-11-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|