cirneco 0.6.8 → 0.6.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/cirneco/utils.rb +4 -4
- data/lib/cirneco/version.rb +1 -1
- data/lib/cirneco/work.rb +8 -10
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 340962d18c91ee11a3722511c861fc49e0bb6e4e
|
4
|
+
data.tar.gz: 91f07300e1859bbb79ca161c8305d133530c2cf1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9a6c516820e7ceadd04e6cbc62667e21c978e02a9f0d2479658905062296fcd15156911086fee8b8adb985b5bb3369d2aa6f8a15236496192ec78c28b7e58991
|
7
|
+
data.tar.gz: 71e05301cc30f995cc2843edde2390aa909f1d23f443d067de7f49c498180cd17aba2f29a5b465753b6df474081eb859b6194007d336c1d0f5966391a2273f59
|
data/Gemfile.lock
CHANGED
data/lib/cirneco/utils.rb
CHANGED
@@ -38,6 +38,8 @@ module Cirneco
|
|
38
38
|
metadata = generate_metadata_for_work(filepath, options)
|
39
39
|
work = register_work_for_metadata(metadata)
|
40
40
|
|
41
|
+
return "Errors for DOI #{metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
|
42
|
+
|
41
43
|
# datapath = options[:datapath] || ENV['DATAPATH'] || "data/doi.yml"
|
42
44
|
# data = Bergamasco::Markdown.read_yaml(datapath) || []
|
43
45
|
# data = [data] if data.is_a?(Hash)
|
@@ -60,6 +62,8 @@ module Cirneco
|
|
60
62
|
metadata = generate_metadata_for_work(filepath, options)
|
61
63
|
work = unregister_work_for_metadata(metadata)
|
62
64
|
|
65
|
+
return "Errors for DOI #{old_metadata["doi"]}:\n#{work.validation_errors}" if work.validation_errors.present?
|
66
|
+
|
63
67
|
# datapath = options[:datapath] || ENV['DATAPATH'] || "data/doi.yml"
|
64
68
|
# data = Bergamasco::Markdown.read_yaml(datapath) || []
|
65
69
|
# data = [data] if data.is_a?(Hash)
|
@@ -195,8 +199,6 @@ module Cirneco
|
|
195
199
|
filename = metadata["doi"].split("/", 2).last + ".xml"
|
196
200
|
IO.write(filename, work.data)
|
197
201
|
|
198
|
-
puts work.validation_errors if work.validation_errors.present?
|
199
|
-
|
200
202
|
work
|
201
203
|
end
|
202
204
|
|
@@ -206,8 +208,6 @@ module Cirneco
|
|
206
208
|
filename = metadata["doi"].split("/", 2).last + ".xml"
|
207
209
|
File.delete(filename) if File.exist?(filename)
|
208
210
|
|
209
|
-
puts work.validation_errors if work.validation_errors.present?
|
210
|
-
|
211
211
|
work
|
212
212
|
end
|
213
213
|
end
|
data/lib/cirneco/version.rb
CHANGED
data/lib/cirneco/work.rb
CHANGED
@@ -38,7 +38,7 @@ module Cirneco
|
|
38
38
|
|
39
39
|
def data
|
40
40
|
Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
|
41
|
-
xml.
|
41
|
+
xml.resource(root_attributes) do
|
42
42
|
insert_work(xml)
|
43
43
|
end
|
44
44
|
end.to_xml
|
@@ -64,10 +64,8 @@ module Cirneco
|
|
64
64
|
end
|
65
65
|
|
66
66
|
def insert_creators(xml)
|
67
|
-
return nil unless creators.present?
|
68
|
-
|
69
67
|
xml.creators do
|
70
|
-
creators.each do |creator|
|
68
|
+
Array(creators).each do |creator|
|
71
69
|
xml.creator do
|
72
70
|
insert_person(xml, creator, "creator")
|
73
71
|
end
|
@@ -76,7 +74,7 @@ module Cirneco
|
|
76
74
|
end
|
77
75
|
|
78
76
|
def insert_contributors(xml)
|
79
|
-
return
|
77
|
+
return xml unless contributors.present?
|
80
78
|
|
81
79
|
xml.contributors do
|
82
80
|
contributors.each do |contributor|
|
@@ -98,7 +96,7 @@ module Cirneco
|
|
98
96
|
end
|
99
97
|
|
100
98
|
def insert_titles(xml)
|
101
|
-
xml.
|
99
|
+
xml.titles do
|
102
100
|
insert_title(xml)
|
103
101
|
end
|
104
102
|
end
|
@@ -115,6 +113,10 @@ module Cirneco
|
|
115
113
|
xml.publicationYear(publication_year)
|
116
114
|
end
|
117
115
|
|
116
|
+
def insert_resource_type(xml)
|
117
|
+
xml.resourceType(resource_type[:value], 'resourceTypeGeneral' => resource_type[:resource_type_general])
|
118
|
+
end
|
119
|
+
|
118
120
|
def insert_subjects(xml)
|
119
121
|
return xml unless subjects.present?
|
120
122
|
|
@@ -125,10 +127,6 @@ module Cirneco
|
|
125
127
|
end
|
126
128
|
end
|
127
129
|
|
128
|
-
def insert_resource_type(xml)
|
129
|
-
xml.resourceType(resource_type[:value], 'resourceTypeGeneral' => resource_type[:resource_type_general])
|
130
|
-
end
|
131
|
-
|
132
130
|
def insert_version(xml)
|
133
131
|
return xml unless version.present?
|
134
132
|
|