relaton-etsi 2.0.0.pre.alpha.2 → 2.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bceac3758fddfc4faeaebefed80609a5812982d623de452ce996bd7166a2e421
-  data.tar.gz: 1acf19c11ef380345872527660fbe1d70d51c506b6e22c5e5cf920b73d9ee843
+  metadata.gz: 2b8880af28706d71e1ab59caa6cac16c23ef704ec7f211a4624b68c5f6a357f8
+  data.tar.gz: 5cd61a36948a56ba288b2558b884d871efe73f74bc31151dc71110d98d44fec2
 SHA512:
-  metadata.gz: 4480249c0810e4029bb3c19fabc8a8101fc60b40974b907f643b97904f7084cd4b7a0ed55a3c2d9abb5bda652d2f54816035afe947fa0dcabb21d0a9e04eaa66
-  data.tar.gz: be4182010f9be99617786853d790bdc01137d3c141c55031359812cfbf1541caf3dbc414c5b22312731c4df0f3f6a0fc83fb17c3ef5d87ccdb1bd1e03830db2b
+  metadata.gz: 302f6e36cc7532666fed67da1c4d047e6e37ab16f3852b605f5f7125e27a2e2f17436fb7acfb3f7212d9e0108b9123e233c7b7310ca42ee31a3c6d2e58c81962
+  data.tar.gz: 27958a5aa9fed21b4e72ecbe4837a8a94b5e79642f70dc1af4b0715d20af26d32579bf8f609d33d631c1d28cb7ca5c1dc39a7b1cb3a9da3b41dbc93626ce6eaa

data/README.adoc

@@ -42,7 +42,7 @@ item = Relaton::Etsi::Bibliography.get("ETSI GS ZSM 012 V1.1.1")
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="ETSIGSZSM012V111202212" schema-version="v1.4.1">
+=> "<bibitem id="ETSIGSZSM012V111202212" schema-version="v1.5.6">
       <fetched>2026-01-24</fetched>
       <title language="en" script="Latn">Zero-touch network and Service Management (ZSM); Enablers for Artificial Intelligence-based Network and Service Automation</title>
       <uri type="src">http://webapp.etsi.org/workprogram/Report_WorkItem.asp?WKI_ID=62010</uri>
@@ -55,14 +55,14 @@ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and ad
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata schema-version="v1.4.1">
+=> "<bibdata schema-version="v1.5.6">
       <fetched>2026-01-24</fetched>
       <title language="en" script="Latn">Zero-touch network and Service Management (ZSM); Enablers for Artificial Intelligence-based Network and Service Automation</title>
       <uri type="src">http://webapp.etsi.org/workprogram/Report_WorkItem.asp?WKI_ID=62010</uri>
       <uri type="pdf">http://www.etsi.org/deliver/etsi_gs/ZSM/001_099/012/01.01.01_60/gs_ZSM012v010101p.pdf</uri>
       <docidentifier type="ETSI" primary="true">ETSI GS ZSM 012 V1.1.1 (2022-12)</docidentifier>
       ...
-      <ext schema-version="v0.0.3">
+      <ext schema-version="v0.1.2">
         <doctype abbreviation="GS">Group Specification</doctype>
       </ext>
     </bibdata>"

data/grammars/basicdoc.rng

@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
         <a:documentation>Optional caption of this block</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="position">
+        <a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
+        <choice>
+          <value>before</value>
+          <value>after</value>
+        </choice>
+      </attribute>
+    </optional>
     <optional>
       <element name="location">
         <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>
@@ -208,11 +217,15 @@ Applicable to modify and delete</a:documentation>
     </zeroOrMore>
     <optional>
       <element name="newcontent">
-        <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
+        <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or sections</a:documentation>
         <ref name="OptionalId"/>
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="section"/>
+        </zeroOrMore>
       </element>
     </optional>
     <zeroOrMore>

data/grammars/biblio.rng

@@ -466,11 +466,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
         <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="logo">
         <a:documentation>A logo for the organization</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="orgname">
     <element name="name">
@@ -502,6 +502,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
   </define>
   <define name="logo">
     <element name="logo">
+      <optional>
+        <attribute name="type">
+          <a:documentation>The type of logo</a:documentation>
+        </attribute>
+      </optional>
       <ref name="image-no-id"/>
     </element>
   </define>
@@ -513,6 +518,11 @@ Editorial and advisory groups are represented as consecutive subdivisions of the
           <a:documentation>Description of what is being depicted</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Description of what kind of depiction this</a:documentation>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="image-no-id">
           <a:documentation>A visual depiction of the bibliographic item</a:documentation>
@@ -690,7 +700,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1132,11 +1142,11 @@ NOTE: This should preferably be encoded as  a URI or short identifier, rather th
         <a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
       </ref>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction">
         <a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
       </ref>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="ReducedBibliographicItem">
     <a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
@@ -1236,9 +1246,9 @@ Refer to `BibliographicItem` for definitions</a:documentation>
     <optional>
       <ref name="validity"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="depiction"/>
-    </optional>
+    </zeroOrMore>
   </define>
   <define name="btitle">
     <a:documentation>A title of a bibliographic item, associated with a type of title</a:documentation>
@@ -1296,17 +1306,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -1929,10 +1939,10 @@ Detailed in https://www.relaton.org/model/relations/</a:documentation>
       <value>hasAnnotation</value>
       <value>draftOf</value>
       <value>hasDraft</value>
-      <value>preliminaryDraftOf</value>
-      <value>hasPreliminaryDraft</value>
-      <value>revisionDraftOf</value>
-      <value>hasRevisionDraft</value>
+      <value>predecessorDraftOf</value>
+      <value>hasPredecessorDraft</value>
+      <value>successorDraftOf</value>
+      <value>hasSuccessorDraft</value>
       <value>editionOf</value>
       <value>hasEdition</value>
       <value>updates</value>
@@ -2053,13 +2063,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
           <ref name="LocalizedString"/>
         </element>
       </optional>
-      <oneOrMore>
+      <zeroOrMore>
         <element name="taxon">
           <a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
 `pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
           <ref name="LocalizedString"/>
         </element>
-      </oneOrMore>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="vocabid">
           <a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>

data/grammars/relaton-etsi.rng

@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
   <include href="biblio-standoc.rng">
-    <define name="BibDataExtensionType">
-      <optional>
-        <attribute name="schema-version"/>
-      </optional>
-      <ref name="doctype"/>
-      <optional>
-        <ref name="docsubtype"/>
-      </optional>
-      <ref name="marker"/>
-      <zeroOrMore>
-        <ref name="frequency"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="mandate"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="custom-collection"/>
-      </optional>
-    </define>
     <define name="status">
       <element name="status">
         <ref name="stage"/>
@@ -60,6 +41,18 @@
       </choice>
     </define>
   </include>
+  <define name="BibDataExtensionType" combine="interleave">
+    <ref name="marker"/>
+    <zeroOrMore>
+      <ref name="frequency"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="mandate"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="custom-collection"/>
+    </optional>
+  </define>
   <define name="StageType">
     <choice>
       <value>EN approval</value>

data/lib/relaton/etsi/data_fetcher.rb

@@ -18,6 +18,10 @@ module Relaton
         @index ||= Relaton::Index.find_or_create :etsi, file: INDEX_FILE
       end
 
+      def log_error(msg)
+        Util.error msg
+      end
+
       #
       # Fetch all ETSI documents from the ETSI website.
       #
@@ -30,9 +34,10 @@ module Relaton
         url = format(SOURCEURL, date: date, timestamp: timestamp)
         csv = fetch_with_retry(url)
         CSV.parse(csv, headers: true, col_sep: ";", skip_lines: /sep=;/).each do |row|
-          save DataParser.new(row).parse
+          save DataParser.new(row, @errors).parse
         end
         index.save
+        report_errors
       end
 
       NETWORK_ERRORS = [
@@ -63,11 +68,6 @@ module Relaton
         index.add_or_update id, file
       end
 
-      def output_file(docid)
-        filename = docid.gsub("/", "-").gsub(/[\s.]/, "_").gsub(/[()]/, "")
-        File.join @output, "#{filename}.#{@ext}"
-      end
-
       def to_yaml(bib)
         bib.to_yaml
       end

data/lib/relaton/etsi/data_parser.rb

@@ -7,8 +7,9 @@ module Relaton
         keyword ext abstract language script
       ].freeze
 
-      def initialize(row)
+      def initialize(row, errors = {})
         @row = row
+        @errors = errors
       end
 
       def parse
@@ -19,11 +20,28 @@ module Relaton
       end
 
       def pubid
-        @pubid ||= PubId.parse(@row["ETSI deliverable"])
+        return @pubid if defined?(@pubid)
+
+        unless @row["ETSI deliverable"]
+          @errors[:pubid] &&= true
+          @pubid = nil
+          return @pubid
+        end
+
+        @errors[:pubid] &&= false
+        @pubid = PubId.parse(@row["ETSI deliverable"])
       end
 
       def title
-        [Bib::Title.new(content: @row["title"], language: "en", script: "Latn")]
+        result = if @row["title"]
+                   [Bib::Title.new(
+                     content: @row["title"], language: "en", script: "Latn",
+                   )]
+                 else
+                   []
+                 end
+        @errors[:title] &&= result.empty?
+        result
       end
 
       def docnumber
@@ -32,28 +50,57 @@ module Relaton
 
       def source
         urls = []
-        urls << Bib::Uri.new(content: @row["Details link"], type: "src")
-        urls << Bib::Uri.new(content: @row["PDF link"], type: "pdf")
+        if @row["Details link"]
+          urls << Bib::Uri.new(content: @row["Details link"], type: "src")
+        end
+        if @row["PDF link"]
+          urls << Bib::Uri.new(content: @row["PDF link"], type: "pdf")
+        end
+        @errors[:source] &&= urls.empty?
+        urls
       end
 
       def date
-        return [] unless pubid.date
-
-        [Bib::Date.new(type: "published", at: pubid.date)]
+        result = if pubid&.date
+                   [Bib::Date.new(type: "published", at: pubid.date)]
+                 else
+                   []
+                 end
+        @errors[:date] &&= result.empty?
+        result
       end
 
       def docidentifier
-        [Bib::Docidentifier.new(content: @row["ETSI deliverable"], type: "ETSI", primary: true)]
+        result = if @row["ETSI deliverable"]
+                   [Bib::Docidentifier.new(
+                     content: @row["ETSI deliverable"],
+                     type: "ETSI",
+                     primary: true,
+                   )]
+                 else
+                   []
+                 end
+        @errors[:docidentifier] &&= result.empty?
+        result
       end
 
       def version
-        return [] unless pubid.version
+        return [] unless pubid&.version
 
         [Bib::Version.new(draft: pubid.version)]
       end
 
       def status
-        stage = @row["Status"] == "On Approval" ? "#{pubid.type} approval" : @row["Status"]
+        unless @row["Status"]
+          @errors[:status] &&= true
+          return
+        end
+
+        stage = @row["Status"]
+        if stage == "On Approval"
+          stage = "#{pubid&.type} approval"
+        end
+        @errors[:status] &&= false
         Status.new(stage: stage)
       end
 
@@ -119,26 +166,36 @@ module Relaton
       end
 
       def keyword
-        taxon = @row["Keywords"].split(",").map do |kw|
-          Bib::LocalizedString.new(content: kw.strip, language: "en", script: "Latn")
+        unless @row["Keywords"]
+          @errors[:keyword] &&= true
+          return []
         end
-        return [] if taxon.empty?
 
-        [Bib::Keyword.new(taxon: taxon)]
+        result = @row["Keywords"].split(",").map do |kw|
+          Bib::Keyword.new(vocab: Bib::LocalizedString.new(content: kw.strip, language: "en", script: "Latn"))
+        end
+        @errors[:keyword] &&= result.empty?
+        result
       end
 
       def ext
-        Ext.new(doctype: doctype)
+        Ext.new(doctype: doctype, flavor: "etsi")
       end
 
       def doctype
+        return unless pubid
+
         Doctype.create_from_abbreviation pubid.type
       end
 
       def abstract
-        return [] unless @row["Scope"]
-
-        [Bib::LocalizedMarkedUpString.new(content: @row["Scope"], language: "en", script: "Latn")]
+        result = if @row["Scope"]
+                   [Bib::Abstract.new(content: @row["Scope"], language: "en", script: "Latn")]
+                 else
+                   []
+                 end
+        @errors[:abstract] &&= result.empty?
+        result
       end
 
       def language

data/lib/relaton/etsi/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Etsi
-    VERSION = "2.0.0-alpha.2"
+    VERSION = "2.0.0-alpha.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-etsi
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.2
+  version: 2.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.alpha.4
+        version: 2.0.0.pre.alpha.7
 - !ruby/object:Gem::Dependency
   name: relaton-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement