relaton-bipm 2.0.0.pre.alpha.3 → 2.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28e812b274f936f9499e5e3499dfd4aa1dbdf6eefb5e9faee499bc77b76e4b32
-  data.tar.gz: cb3d30c7d029c7ab1934867f164baaab2bc13363f07921bdd969225bfce4a63c
+  metadata.gz: 9be07b442d7fb5c0abcb1fca8c2beffc61253b1722905d2d98e6fdec7652646f
+  data.tar.gz: 001f747904436a23b994399cf2879425f0537f9ceb4e93b2db44df33a187f488
 SHA512:
-  metadata.gz: 747287435b174e1102b6a21e99db6703b432b022bd04c4a5dc66d2a7e437902493e01510cb084e068773ecb0c28cc54b530a2efdd0c9187cbbbfeb973e686d40
-  data.tar.gz: 98eb1a4b7fd46adc7cefdc65238ff57fd90b30454cdd4a46f7a3a2cc814bda6522416a984c7bf8c453ad32500bf8a4ce069e058b52e66c48921c9430f93f5070
+  metadata.gz: badf68210731ae52ff277e813a5ebe89ca43a90deae861f9d036fa7f861b2ee2683713d4803a6b08fc1b68aa04faa4645182ffcbd4be869228ef105c75994c30
+  data.tar.gz: d66a7a99a3ae2d9634c501a7afdcd461ad48858e32f2c2d0bed5c55d22c3b567fc24ec51ca21960a87df5eceb052ea8726867f2b2f3df9a92c83b65b48236f5d

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

@@ -1142,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
@@ -1939,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>
@@ -2063,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/lib/relaton/bipm/data_fetcher.rb

@@ -6,12 +6,16 @@ require_relative "rawdata_bipm_metrologia/fetcher"
 
 module Relaton::Bipm
   class DataFetcher < Relaton::Core::DataFetcher
-    attr_reader :output, :format, :ext, :files, :index
+    attr_reader :output, :format, :ext, :files, :index, :errors
 
     def index
       @index ||= Relaton::Index.find_or_create :bipm, file: INDEXFILE
     end
 
+    def log_error(msg)
+      Util.error msg
+    end
+
     #
     # Fetch bipm-data-outcomes or si-brochure
     #
@@ -24,6 +28,7 @@ module Relaton::Bipm
       when "rawdata-bipm-metrologia" then RawdataBipmMetrologia::Fetcher.fetch(self)
       end
       index.save
+      report_errors
     end
 
     #

data/lib/relaton/bipm/data_outcomes_parser.rb

@@ -167,6 +167,7 @@ module Relaton::Bipm
       args[:en]["resolutions"].each.with_index do |r, i| # rubocop:disable Metrics/BlockLength
         num = r["identifier"].to_s # .split("-").last
         date = r["dates"].first.to_s
+        @data_fetcher.errors[:resolution_date] &&= date.nil? || date.empty?
         year = date.split("-").first
         num = "0" if num == year
 
@@ -179,8 +180,8 @@ module Relaton::Bipm
 
         fr_r = args.dig(:fr, "resolutions", i) # @TODO: create a GH issue when fr is missing
         hash[:title] = resolution_title r, fr_r
-        hash[:source] = resolution_link r, fr_r, args[:src]
-        hash[:date] = [Relaton::Bib::Date.new(type: "published", at: date)]
+        hash[:source] = resolution_source r, fr_r, args[:src]
+        hash[:date] = create_date(type: "published", at: date)
         num_justed = num.rjust 2, "0"
         type = r["type"].capitalize
         docnum = create_resolution_docnum args[:body], type, num, date
@@ -190,6 +191,7 @@ module Relaton::Bipm
         hash[:language] = %w[en fr]
         hash[:script] = ["Latn"]
         hash[:contributor] = contributors date, args[:body]
+        @data_fetcher.errors[:resolution_contributor] &&= hash[:contributor].size < 2 # BIPM + committee
         item = ItemData.new(**hash)
         file = "#{year}-#{num_justed}.#{@data_fetcher.ext}"
         out_dir = File.join args[:dir], r["type"].downcase
@@ -225,6 +227,7 @@ module Relaton::Bipm
       title = []
       title << create_title(en_r["title"], "en") if en_r["title"] && !en_r["title"].empty?
       title << create_title(fr_r["title"], "fr") if fr_r && fr_r["title"] && !fr_r["title"].empty?
+      @data_fetcher.errors[:resolution_title] &&= title.empty?
       title
     end
 
@@ -237,14 +240,28 @@ module Relaton::Bipm
     #
     # @return [Array<Hash>] links
     #
-    def resolution_link(en_r, fr_r, src)
-      link = [Relaton::Bib::Uri.new(type: "citation", content: en_r["url"], language: "en", script: "Latn")]
-      if fr_r
-        link << Relaton::Bib::Uri.new(type: "citation", content: fr_r["url"], language: "fr", script: "Latn")
+    def resolution_source(en_r, fr_r, src)
+      source = []
+      if en_r["url"] && !en_r["url"].empty?
+        source << Relaton::Bib::Uri.new(type: "citation", content: en_r["url"], language: "en", script: "Latn")
+        @data_fetcher.errors[:resolution_source_citation_en] = false
+      else
+        @data_fetcher.errors[:resolution_source_citation] &&= true
+      end
+      if fr_r && fr_r["url"] && !fr_r["url"].empty?
+        source << Relaton::Bib::Uri.new(type: "citation", content: fr_r["url"], language: "fr", script: "Latn")
+        @data_fetcher.errors[:resolution_source_citation_fr] = false
+      else
+        @data_fetcher.errors[:resolution_source_citation_fr] &&= true
+      end
+      source += src if src
+      if en_r["reference"]
+        source << Relaton::Bib::Uri.new(type: "pdf", content: en_r["reference"])
+        @data_fetcher.errors[:resolution_source_pdf] = false
+      else
+        @data_fetcher.errors[:resolution_source_pdf] &&= true
       end
-      link += src
-      link << Relaton::Bib::Uri.new(type: "pdf", content: en_r["reference"]) if en_r["reference"]
-      link
+      source
     end
 
     #
@@ -446,21 +463,32 @@ module Relaton::Bipm
         ext: create_ext(args[:type], args[:num]),
       }
       hash[:title] = create_titles args.slice(:en, :fr)
-      hash[:date] = [Relaton::Bib::Date.new(type: "published", at: args[:en]["date"])]
+      hash[:date] = create_date(type: "published", at: args[:en]["date"])
+      @data_fetcher.errors[:meeting_date] &&= hash[:date].empty?
       hash[:docidentifier] = create_meeting_docids docnum
       hash[:docnumber] = docnum # .sub(" --", "").sub(/\s\(\d{4}\)/, "")
       hash[:id] = create_id(body: args[:body], type: args[:type], num: args[:num], date: args[:en]["date"])
       hash[:source] = create_links(**args)
+      @data_fetcher.errors[:meeting_source] &&= hash[:source].empty?
       hash[:language] = %w[en fr]
       hash[:script] = ["Latn"]
       hash[:contributor] = contributors args[:en]["date"], args[:body]
+      @data_fetcher.errors[:meeting_contributor] &&= hash[:contributor].size < 2 # BIPM + committee
       hash
     end
 
+    def create_date(**args)
+      return [] if args[:at].nil? || args[:at].empty?
+
+      [Relaton::Bib::Date.new(**args)]
+    end
+
     def create_titles(data)
-      data.each_with_object([]) do |(lang, md), mem|
+      result = data.each_with_object([]) do |(lang, md), mem|
         mem << create_title(md["title"], lang.to_s) if md && md["title"]
       end
+      @data_fetcher.errors[:meeting_title] &&= result.empty?
+      result
     end
 
     #
@@ -555,6 +583,8 @@ module Relaton::Bipm
       ids = []
       resolution_short_ids(body, type, num, year) { |id| ids << id }
       resolution_long_ids(body, type, num, year) { |id| ids << id }
+      @data_fetcher.errors[:resolution_docidentifier] &&= ids.empty?
+      ids
     end
 
     def resolution_short_ids(body, type, num, year, &_block)
@@ -600,11 +630,13 @@ module Relaton::Bipm
     def create_meeting_docids(en_id)
       fr_id = en_id.sub(/(\d+)(?:st|nd|rd|th)/, '\1e').sub("Meeting", "réunion")
       fr_id_sup = fr_id.sub(/(\d+)(e)/, '\1<sup>\2</sup>')
-      [
+      result = [
         make_docid(content: en_id, type: "BIPM", primary: true, language: "en", script: "Latn"),
         make_docid(content: fr_id_sup, type: "BIPM", primary: true, language: "fr", script: "Latn"),
         make_docid(content: "#{en_id} / #{fr_id_sup}", type: "BIPM", primary: true),
       ]
+      @data_fetcher.errors[:meeting_docidentifier] &&= result.empty?
+      result
     end
 
     #

data/lib/relaton/bipm/rawdata_bipm_metrologia/article_parser.rb

@@ -10,10 +10,10 @@ module Relaton::Bipm
       #
       # @return [Relaton::Bipm::ItemDate] document
       #
-      def self.parse(path)
+      def self.parse(path, errors = {})
         doc = Nokogiri::XML(File.read(path, encoding: "UTF-8"))
         journal, volume, article = path.split("/")[-2].split("_")[1..]
-        new(doc, journal, volume, article).parse
+        new(doc, journal, volume, article, errors).parse
       end
 
       #
@@ -23,13 +23,15 @@ module Relaton::Bipm
       # @param [String] journal journal
       # @param [String] volume volume
       # @param [String] article article
+      # @param [Hash] errors errors hash
       #
-      def initialize(doc, journal, volume, article)
+      def initialize(doc, journal, volume, article, errors = {})
         @doc = doc.at "/article"
         @journal = journal
         @volume = volume
         @article = article
         @meta = doc.at("/article/front/article-meta")
+        @errors = errors
       end
 
       #
@@ -50,9 +52,11 @@ module Relaton::Bipm
       def parse_docidentifier
         pubid = "#{journal_title} #{volume_issue_article}"
         primary_id = create_docidentifier pubid, "BIPM", true
-        @meta.xpath("./article-id[@pub-id-type='doi']").each_with_object([primary_id]) do |id, m|
+        result = @meta.xpath("./article-id[@pub-id-type='doi']").each_with_object([primary_id]) do |id, m|
           m << create_docidentifier(id.text, id["pub-id-type"])
         end
+        @errors[:article_docidentifier] &&= result.empty?
+        result
       end
 
       #
@@ -74,7 +78,11 @@ module Relaton::Bipm
       # @return [String] journal title
       #
       def journal_title
-        @doc.at("./front/journal-meta/journal-title-group/journal-title").text
+        return @journal_title if defined? @journal_title
+
+        @journal_title = @doc.at("./front/journal-meta/journal-title-group/journal-title")&.text
+        @errors[:journal_title] &&= @journal_title.nil? || @journal_title.empty?
+        @journal_title
       end
 
       #
@@ -96,11 +104,13 @@ module Relaton::Bipm
       # @return [Array<Relaton::Bib::TypedTitleString>] array of title strings
       #
       def parse_title
-        @meta.xpath("./title-group/article-title").map do |t|
+        result = @meta.xpath("./title-group/article-title").map do |t|
           next if t.text.empty?
 
           Relaton::Bib::Title.new(content: t.inner_html, language: t[:"xml:lang"], script: "Latn")
         end.compact
+        @errors[:article_title] &&= result.empty?
+        result
       end
 
       #
@@ -109,23 +119,27 @@ module Relaton::Bipm
       # @return [Array<Relaton::Bib::Contributor>] array of contributors
       #
       def parse_contributor
-        @meta.xpath("./contrib-group/contrib").map do |c|
+        result = @meta.xpath("./contrib-group/contrib").map do |c|
           role = Relaton::Bib::Contributor::Role.new(type: c[:"contrib-type"])
           attrs = { person: create_person(c), organization: create_organization(c), role: [role] }
           Relaton::Bib::Contributor.new(**attrs)
         end
+        @errors[:article_contributor] &&= result.empty?
+        result
       end
 
       def create_person(contrib)
         name = contrib.at("./name")
-        return unless name
+        @errors[:article_contributor_person] &&= name.nil? || name.text.empty?
+        return if name.nil? || name.text.empty?
 
         Relaton::Bib::Person.new name: fullname(name), affiliation: affiliation(contrib)
       end
 
       def create_organization(contrib)
         org = contrib.at("./collab")
-        return unless org
+        @errors[:article_contributor_organization] &&= org.nil? || org.text.empty?
+        return if org.nil? || org.text.empty?
 
         name = Relaton::Bib::TypedLocalizedString.new(content: org.text)
         Relaton::Bib::Organization.new name: [name]
@@ -139,10 +153,12 @@ module Relaton::Bipm
       # @return [Array<Relaton::Bib::Affiliation>] array of affiliations
       #
       def affiliation(contrib)
-        contrib.xpath("./xref[@ref-type='aff']").map do |x|
+        aff = contrib.xpath("./xref[@ref-type='aff']").map do |x|
           a = @meta.at("./contrib-group/aff[@id='#{x[:rid]}']") # /label/following-sibling::node()")
             parse_affiliation a
         end.compact
+        @errors[:article_affiliation] &&= aff.empty?
+        aff
       end
 
       def parse_affiliation(aff)
@@ -170,6 +186,7 @@ module Relaton::Bipm
 
       def parse_division(aff)
         div = aff.xpath("text()[following-sibling::institution]").text.gsub(/^\W*|\W*$/, "")
+        @errors[:article_affiliation_division] &&= div.empty?
         return [] if div.empty?
 
         name = Relaton::Bib::TypedLocalizedString.new(content: div, language: "en", script: "Latn")
@@ -183,6 +200,7 @@ module Relaton::Bipm
         country = aff.at('country')
         address << country.text if country && !country.text.empty?
         address = address.join(", ")
+        @errors[:article_affiliation_address] &&= address.empty?
         return [] if address.empty?
 
         [Relaton::Bib::Address.new(formatted_address: address)]
@@ -197,6 +215,9 @@ module Relaton::Bipm
       #
       def fullname(name)
         cname = [name.at("./given-names"), name.at("./surname")].compact.map(&:text).join(" ")
+        @errors[:article_fullname] &&= cname.empty?
+        return if cname.empty?
+
         completename = Relaton::Bib::LocalizedString.new content: cname, language: "en", script: "Latn"
         Relaton::Bib::FullName.new completename: completename
       end
@@ -230,6 +251,9 @@ module Relaton::Bipm
       #
       def parse_date
         at = dates.min
+        @errors[:article_date] &&= at.nil?
+        return [] unless at
+
         [Relaton::Bib::Date.new(type: "published", at: at)]
       end
 
@@ -262,7 +286,7 @@ module Relaton::Bipm
       # @return [Array<Relaton::Bib::Copyright>] array of copyright associations
       #
       def parse_copyright
-        @meta.xpath("./permissions").each_with_object([]) do |l, m|
+        result = @meta.xpath("./permissions").each_with_object([]) do |l, m|
           from = l.at("./copyright-year")
           next unless from
 
@@ -274,6 +298,8 @@ module Relaton::Bipm
           end
           m << Relaton::Bib::Copyright.new(owner: owner, from: from.text)
         end
+        @errors[:article_copyright] &&= result.empty?
+        result
       end
 
       #
@@ -282,11 +308,13 @@ module Relaton::Bipm
       # @return [Array<Relaton::Bib::LocalizedMarkedUpString>] array of abstracts
       #
       def parse_abstract
-        @meta.xpath("./abstract").map do |a|
-          Relaton::Bib::LocalizedMarkedUpString.new(
+        result = @meta.xpath("./abstract").map do |a|
+          Relaton::Bib::Abstract.new(
             content: a.inner_html, language: a[:"xml:lang"], script: "Latn",
           )
         end
+        @errors[:article_abstract] &&= result.empty?
+        result
       end
 
       #
@@ -298,6 +326,7 @@ module Relaton::Bipm
         rels = dates do |d, t|
           Relaton::Bib::Relation.new(type: "hasManifestation", bibitem: bibitem(d, t))
         end
+        @errors[:article_relation] &&= refs.empty?
         rels + parse_references
       end
 
@@ -307,12 +336,14 @@ module Relaton::Bipm
       # @return [Array<Relaton::Bib::Relation>] array of "cites" relations
       #
       def parse_references
-        @doc.xpath("./back/ref-list/ref").filter_map do |ref|
+        refs = @doc.xpath("./back/ref-list/ref").filter_map do |ref|
           citation = ref.at("./element-citation")
           next unless citation
 
           Relaton::Bib::Relation.new(type: "cites", bibitem: citation_bibitem(citation))
         end
+        @errors[:article_references] &&= refs.empty?
+        refs
       end
 
       #
@@ -324,18 +355,27 @@ module Relaton::Bipm
       #
       def citation_bibitem(citation)
         attrs = {}
-        doi = citation.at("./pub-id[@pub-id-type='doi']")
-        if doi
-          attrs[:docidentifier] = [Relaton::Bib::Docidentifier.new(content: doi.text, type: "doi")]
-          attrs[:source] = [Relaton::Bib::Uri.new(content: "https://doi.org/#{doi.text}", type: "doi")]
+        doi = citation.at("./pub-id[@pub-id-type='doi']")&.text
+        if doi && !doi.empty?
+          @errors[:article_citation_doi] &&= false
+          attrs[:docidentifier] = [Relaton::Bib::Docidentifier.new(content: doi, type: "doi")]
+          attrs[:source] = [Relaton::Bib::Uri.new(content: "https://doi.org/#{doi}", type: "doi")]
+        else
+          @errors[:article_citation_doi] &&= true
         end
-        source = citation.at("./source")
-        if source
-          attrs[:title] = [Relaton::Bib::Title.new(content: source.text)]
+        source = citation.at("./source")&.text
+        if source && !source.empty?
+          @errors[:article_citation_title] &&= false
+          attrs[:title] = [Relaton::Bib::Title.new(content: source)]
+        else
+          @errors[:article_citation_title] &&= true
         end
-        year = citation.at("./year")
-        if year
-          attrs[:date] = [Relaton::Bib::Date.new(type: "published", at: year.text)]
+        year = citation.at("./year")&.text
+        if year && !year.empty?
+          @errors[:article_citation_date] &&= false
+          attrs[:date] = [Relaton::Bib::Date.new(type: "published", at: year)]
+        else
+          @errors[:article_citation_date] &&= true
         end
         ItemData.new(**attrs)
       end
@@ -380,31 +420,27 @@ module Relaton::Bipm
           end
           Relaton::Bib::Locality.new type: type, reference_from: e.text, reference_to: to
         end
-        [Relaton::Bib::Extent.new(locality: locs)]
-        # %w[volume issue page].map.with_index do |t, i|
-        #   Relaton::Bib::Locality.new t, volume_issue_page[i]
-        # end
-      end
+        @errors[:article_extent] &&= locs.empty?
+        return [] if locs.empty?
 
-      def parse_type
-        "article"
+        [Relaton::Bib::Extent.new(locality: locs)]
       end
 
-      def parse_doctype
-        Doctype.new content: "article"
-      end
+      def parse_type = "article"
 
       def parse_source
-        @meta.xpath("./article-id[@pub-id-type='doi']").each_with_object([]) do |l, a|
+        result = @meta.xpath("./article-id[@pub-id-type='doi']").each_with_object([]) do |l, a|
           url = "https://doi.org/#{l.text}"
           a << Relaton::Bib::Uri.new(content: url, type: "src")
           a << Relaton::Bib::Uri.new(content: url, type: "doi")
         end
+        @errors[:article_source] &&= result.empty?
+        result
       end
 
-      def parse_ext
-        Ext.new doctype: parse_doctype
-      end
+      def parse_ext = Ext.new(doctype: parse_doctype)
+
+      def parse_doctype = Doctype.new(content: "article")
     end
   end
 end

data/lib/relaton/bipm/rawdata_bipm_metrologia/fetcher.rb

@@ -34,7 +34,7 @@ module Relaton::Bipm
       def fetch_articles # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         # aff = Affiliations.parse DIR
         Dir["#{DIR}/**/*.xml"].sort_by { |p| archive_date(p) }.each do |path|
-          item = ArticleParser.parse path # , aff
+          item = ArticleParser.parse path, @data_fetcher.errors
           file = "#{item.docidentifier.first.content.downcase.tr(' ', '-')}.#{@data_fetcher.ext}"
           out_path = File.join(@data_fetcher.output, file)
           key = Relaton::Bipm::Id.new.parse(item.docidentifier.first.content).to_hash
@@ -74,7 +74,7 @@ module Relaton::Bipm
       def fetch_metrologia(*args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         id = identifier(*args)
         item = ItemData.new(
-          type: "article", formattedref: id, docidentifier: docidentifier(id),
+          type: "article", formattedref: Relaton::Bib::Formattedref.new(content: id), docidentifier: docidentifier(id),
           language: ["en"], script: ["Latn"], relation: relation(*args),
           source: typed_uri(*args)
         )
@@ -143,7 +143,7 @@ module Relaton::Bipm
       # @return [Relaton::Bipm::Item] bibitem
       #
       def rel_bibitem(id)
-        Relaton::Bib::ItemData.new(formattedref: id, docidentifier: docidentifier(id))
+        Relaton::Bib::ItemData.new(formattedref: Relaton::Bib::Formattedref.new(content: id), docidentifier: docidentifier(id))
       end
 
       def typed_uri(*args)

data/lib/relaton/bipm/si_brochure_parser.rb

@@ -35,8 +35,11 @@ module Relaton::Bipm
         xml = File.read(f, encoding: "UTF-8")
         xml = xml.force_encoding("UTF-8") if xml.encoding != Encoding::UTF_8
         item1 = Bibdata.from_xml(xml)
+        @data_fetcher.errors[:si_brochure_title] &&= item1.title.empty?
+        @data_fetcher.errors[:si_brochure_docidentifier] &&= item1.docidentifier.empty?
         unless has_committee_contributor?(item1)
-          extract_editorialgroup(xml).each { |c| item1.contributor << c }
+          contribs = extract_editorialgroup(xml)
+          contribs.each { |c| item1.contributor << c }
         end
         fix_si_brochure_id item1
         basename = File.join @data_fetcher.output, File.basename(f).sub(/(?:-(?:en|fr))?\.rxl$/, "")

data/lib/relaton/bipm/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Bipm
-    VERSION = "2.0.0-alpha.3".freeze
+    VERSION = "2.0.0-alpha.4".freeze
   end
 end

data/relaton_bipm.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "mechanize", "~> 2.10"
   spec.add_dependency "parslet", "~> 2.0.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
   spec.add_dependency "relaton-index", "~> 0.2.2"
-  spec.add_dependency "relaton-core", "~> 0.0.8"
+  spec.add_dependency "relaton-core", "~> 0.0.12"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bipm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.3
+  version: 2.0.0.pre.alpha.4
 platform: ruby
 authors:
 - Ribose Inc.
@@ -57,14 +57,14 @@ 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-index
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement