lib/metanorma/modspec/cleanup.rb in mn-requirements-0.1.7 vs lib/metanorma/modspec/cleanup.rb in mn-requirements-0.1.8
- old
+ new
@@ -47,12 +47,20 @@
val.name = tag
val.xpath("./dl").each do |d|
requirement_metadata1(val, d, d)
d.remove
end
- requirement_metadata_requirement_tags.include?(term.text) &&
- !val.text.empty? and
+ requirement_metadata_requirement_tags.include?(term.text) or
+ return val
+ requirement_metadata1_component_val2id(val)
+ end
+
+ def requirement_metadata1_component_val2id(val)
+ if val.at(".//link") && val.text.strip.empty?
+ val.children = "<identifier>#{val.at('.//link')['target']}</identifier>"
+ elsif !val.text.strip.empty?
val.children = "<identifier>#{val.text.strip}</identifier>"
+ end
val
end
# separate from default model requirement_metadata_cleanup,
# which extracts model:: ogc into reqt["model"]