preserve year in drafts docidentifiers: #1259

metanorma · Feb 5, 2025 · b6b4294 · b6b4294
1 parent 11e2301
commit b6b4294
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/lib/metanorma/iso/front_id.rb b/lib/metanorma/iso/front_id.rb
@@ -187,9 +187,10 @@ def iso_id_out_non_amd(xml, params, with_prf)
 
       def iso_id_default(params)
         params_nolang = params.dup.tap { |hs| hs.delete(:language) }
-        params1 = if params[:unpublished]
-                    params_nolang.dup.tap { |hs| hs.delete(:year) }
-                  else params_nolang end
+        #params1 = if params[:unpublished]
+                    #params_nolang.dup.tap { |hs| hs.delete(:year) }
+                  #else params_nolang end
+        params1 = params_nolang
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
       end
@@ -204,9 +205,10 @@ def iso_id_undated(params)
       end
 
       def iso_id_with_lang(params)
-        params1 = if params[:unpublished]
-                    params.dup.tap { |hs| hs.delete(:year) }
-                  else params end
+        #params1 = if params[:unpublished]
+                    #params.dup.tap { |hs| hs.delete(:year) }
+                  #else params end
+        params1 = params
         params1.delete(:unpublished)
         pubid_select(params1).create(**params1)
       end

diff --git a/spec/metanorma/base_spec.rb b/spec/metanorma/base_spec.rb
@@ -89,11 +89,11 @@
         <title format="text/plain" language="fr" type="title-intro">Introduction Française</title>
         <title format="text/plain" language="fr" type="title-main">Titre Principal</title>
         <title format="text/plain" language="fr" type="title-part">Part du Titre</title>
-        <docidentifier type="ISO" primary="true">ISO/WD 1000-1.3</docidentifier>
+        <docidentifier type="ISO" primary="true">ISO/WD 1000-1.3:2000</docidentifier>
         <docidentifier type="iso-reference">ISO/WD 1000-1.3:2000(E)</docidentifier>
         <docidentifier type='URN'>urn:iso:std:iso:1000:-1:stage-20.20.v3:en</docidentifier>
         <docidentifier type='iso-undated'>ISO/WD 1000-1.3</docidentifier>
-        <docidentifier type="iso-with-lang">ISO/WD 1000-1.3(en)</docidentifier>
+        <docidentifier type="iso-with-lang">ISO/WD 1000-1.3:2000(en)</docidentifier>
         <docnumber>1000</docnumber>
                    <contributor>
            <role type="author"/>
@@ -919,11 +919,11 @@
     INPUT
     output = <<~OUTPUT
       <bibdata type='standard'>
-        <docidentifier type='ISO' primary="true">ISO/FDTS 1000-1-1</docidentifier>
+        <docidentifier type='ISO' primary="true">ISO/FDTS 1000-1-1:2001</docidentifier>
         <docidentifier type='iso-reference'>ISO/FDTS 1000-1-1:2001(E)</docidentifier>
         <docidentifier type='URN'>urn:iso:std:iso:ts:1000:-1-1:stage-50.00:en</docidentifier>
         <docidentifier type='iso-undated'>ISO/FDTS 1000-1-1</docidentifier>
-        <docidentifier type='iso-with-lang'>ISO/FDTS 1000-1-1(en)</docidentifier>
+        <docidentifier type='iso-with-lang'>ISO/FDTS 1000-1-1:2001(en)</docidentifier>
         <docnumber>1000</docnumber>
         <contributor>
           <role type='author'/>
@@ -1336,11 +1336,11 @@
     INPUT
     output = <<~OUTPUT
               <bibdata type="standard">
-              <docidentifier type='ISO' primary="true">ISO/FDIS 1000.2</docidentifier>
+              <docidentifier type='ISO' primary="true">ISO/FDIS 1000.2:#{Date.today.year}</docidentifier>
       <docidentifier type='iso-reference'>ISO/FDIS 1000.2:#{Date.today.year}(F)</docidentifier>
              <docidentifier type='URN'>urn:iso:std:iso:1000:stage-50.00.v2:fr</docidentifier>
               <docidentifier type='iso-undated'>ISO/FDIS 1000.2</docidentifier>
-      <docidentifier type='iso-with-lang'>ISO/FDIS 1000.2(fr)</docidentifier>
+      <docidentifier type='iso-with-lang'>ISO/FDIS 1000.2:#{Date.today.year}(fr)</docidentifier>
                 <docnumber>1000</docnumber>
                 <contributor>
                   <role type="author"/>