Skip to content

Commit

Permalink
Merge pull request #879 from metanorma/fix/primary-docidentifier
Browse files Browse the repository at this point in the history
Fix/primary docidentifier
  • Loading branch information
opoudjis authored Mar 18, 2024
2 parents d392fdd + 000a6d7 commit aa516e4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion lib/metanorma/standoc/front.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module Standoc
module Front
def metadata_id(node, xml)
id = node.attr("docidentifier") || metadata_id_build(node)
xml.docidentifier id
xml.docidentifier id, primary: "true"
end

def metadata_id_build(node)
Expand Down
6 changes: 3 additions & 3 deletions spec/metanorma/base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
<standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
<bibdata type="standard">
<title language="en" format="text/plain">Main Title — Title</title>
<docidentifier>1000-1</docidentifier>
<docidentifier primary="true">1000-1</docidentifier>
<docidentifier type='ISBN'>ISBN-13</docidentifier>
<docidentifier type='ISBN10'>ISBN-10</docidentifier>
<docidentifier type="ABC">x 1</docidentifier>
Expand Down Expand Up @@ -614,7 +614,7 @@
<uri type="pdf">D</uri>
<uri type="doc">E</uri>
<uri type="relaton">F</uri>
<docidentifier>1000-1-1</docidentifier>
<docidentifier primary="true">1000-1-1</docidentifier>
<docnumber>1000</docnumber>
<date type='published'>
<on>1000-01</on>
Expand Down Expand Up @@ -1176,7 +1176,7 @@
<standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
<bibdata type="standard">
<title language="en" format="text/plain">Document title</title>
<docidentifier>OVERRIDE-DOCIDENTIFIER</docidentifier>
<docidentifier primary="true">OVERRIDE-DOCIDENTIFIER</docidentifier>
<docnumber>1000</docnumber>
<date type="published">
<on>1000-01</on>
Expand Down
4 changes: 2 additions & 2 deletions spec/metanorma/macros_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@
<relation type='derivedFrom'>
<bibitem>
<title language='en' format='text/plain'>X</title>
<docidentifier>DOCIDENTIFIER-1</docidentifier>
<docidentifier primary="true">DOCIDENTIFIER-1</docidentifier>
<language>en</language>
<script>Latn</script>
<status>
Expand All @@ -918,7 +918,7 @@
<relation type='derivedFrom'>
<bibitem>
<title language='en' format='text/plain'>A2</title>
<docidentifier>DOCIDENTIFIER-2</docidentifier>
<docidentifier primary="true">DOCIDENTIFIER-2</docidentifier>
<language>en</language>
<script>Latn</script>
<status>
Expand Down

0 comments on commit aa516e4

Please sign in to comment.