relaton-ieee 2.0.0.pre.alpha.1 → 2.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 765f4c9699411cdd840df5690cc10b533d5ed6ae7ef85feec98b1dcbda2bb297
-  data.tar.gz: c3b231bcdd964782ee0841fabdbe8faa29f46c63abee8cda0088b47ec79d0a8e
+  metadata.gz: 635e97db814aede6788d7cbaa68b944bd126cfecee8140224445de0824a5c6f3
+  data.tar.gz: b3205c0a214ebc3d2b9ad9ad478afc3afa46c0675ed7d42aae2f0b72fe618e02
 SHA512:
-  metadata.gz: 26c1d06d839bf86ca67e63b5ca0bf61ce7ad461f1419ef2f6e48796b52f11a88f9e9ebdbc20bd49bc208ffe6f8fd572d9240f6edd690177d1e155e7fdb0eedbc
-  data.tar.gz: 868e7cdfae66dcd56935973e3a236f5b4e702fcfe67205ca3a0b57f14e9cda49a2ec02bf10ff9f84ed5c892e158c2481568b2567b21045d66682d91b64fce4e8
+  metadata.gz: d6c6d7ca58ecc976effe3fa7f13b63c7a37ebd79c0d70d5025c7519fe86d0a7131844e0653a5a90ab44b4ca4bc3875c710b93833d4fe680d89c3025f902bcce0
+  data.tar.gz: 4486082f38dc9c26beb95a567bb55dc6d93da59692b689ab2693037f61144cb01ba01a1d3f56e00ed2d5fd6f74595088705baee5921645590c1125e361fc0ee0

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/ieee/data_fetcher.rb

@@ -22,6 +22,10 @@ module Relaton
       #
       # Convert documents from `ieee-rawbib` dir (IEEE dataset) to BibYAML/BibXML
       #
+      def log_error(msg)
+        Util.error msg
+      end
+
       def fetch(_source = nil) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         Dir["ieee-rawbib/**/*.{xml,zip}"].reject { |f| f["Deleted_"] }.each do |f|
           xml = case File.extname(f)
@@ -34,6 +38,7 @@ module Relaton
         end
         # File.write "normtitles.txt", @normtitles.join("\n")
         update_relations
+        report_errors
       end
 
       # @return [Hash] list of AMSID => PubID
@@ -70,7 +75,7 @@ module Relaton
         return if RELATION_TYPES[type] == false
 
         docid = Bib::Docidentifier.new(type: "IEEE", content: fref, primary: true)
-        bib = ItemData.new formattedref: fref, docidentifier: [docid]
+        bib = ItemData.new formattedref: Bib::Formattedref.new(content: fref), docidentifier: [docid]
         description = create_relation_description type
         Bib::Relation.new(type: RELATION_TYPES[type][:type], description: description, bibitem: bib)
       end
@@ -118,7 +123,7 @@ module Relaton
         end
         return if doc.publicationinfo&.standard_id == "0"
 
-        bib = IdamsParser.new(doc, self).parse
+        bib = IdamsParser.new(doc, self, @errors).parse
         if bib.docnumber.nil?
           Util.warn "PubID parse error. Normtitle: `#{doc.normtitle}`, file: `#{filename}`"
           return

data/lib/relaton/ieee/idams_parser.rb

@@ -10,9 +10,10 @@ module Relaton
         relation source keyword ext
       ].freeze
 
-      def initialize(doc, fetcher)
+      def initialize(doc, fetcher, errors = {})
         @doc = doc
         @fetcher = fetcher
+        @errors = errors
       end
 
       #
@@ -27,7 +28,9 @@ module Relaton
       end
 
       def parse_docnumber
-        docnumber
+        result = docnumber
+        @errors[:docnumber] &&= result.nil?
+        result
       end
 
       #
@@ -58,7 +61,9 @@ module Relaton
       # @return [Array<Relaton::Bib::Title>]
       #
       def parse_title
-        @doc.btitle.map { |args| Bib::Title.new(**args) }
+        result = @doc.btitle.map { |args| Bib::Title.new(**args) }
+        @errors[:title] &&= result.empty?
+        result
       end
 
       #
@@ -67,7 +72,9 @@ module Relaton
       # @return [Array<Relaton::Bib::Date>]
       #
       def parse_date
-        @doc.bdate.map { |args| Bib::Date.new(type: args[:type], at: args[:on]) }
+        result = @doc.bdate.map { |args| Bib::Date.new(type: args[:type], at: args[:on]) }
+        @errors[:date] &&= result.empty?
+        result
       end
 
       #
@@ -81,7 +88,9 @@ module Relaton
         ids.unshift(content: pubid.to_s(trademark: true), scope: "trademark", type: "IEEE", primary: true)
         ids.unshift(content: pubid.to_s, type: "IEEE", primary: true)
 
-        ids.map { |dcid| Bib::Docidentifier.new(**dcid) }
+        result = ids.map { |dcid| Bib::Docidentifier.new(**dcid) }
+        @errors[:docidentifier] &&= result.empty?
+        result
       end
 
       #
@@ -99,7 +108,9 @@ module Relaton
         contributors << Relaton::Bib::Contributor.new(organization: org, role: [role])
 
         # Add committee contributors from editorial group
-        contributors + parse_committee_contributors
+        result = contributors + parse_committee_contributors
+        @errors[:contributor] &&= result.empty?
+        result
       end
 
       #
@@ -111,9 +122,11 @@ module Relaton
         committees = @doc.editorialgroup
         return [] unless committees
 
-        committees.map do |committee|
+        result = committees.map do |committee|
           create_committee_contributor(committee)
         end
+        @errors[:committee] &&= result.empty?
+        result
       end
 
       #
@@ -147,11 +160,13 @@ module Relaton
       # @return [Array<Relaton::Bib::LocalizedMarkedUpString>]
       #
       def parse_abstract
-        @doc.volume.article.articleinfo.abstract.each_with_object([]) do |abs, acc|
+        result = @doc.volume.article.articleinfo.abstract.each_with_object([]) do |abs, acc|
           next unless abs.abstract_type == "Standard"
 
-          acc << Bib::LocalizedMarkedUpString.new(content: abs.value, language: "en", script: "Latn")
+          acc << Bib::Abstract.new(content: abs.value, language: "en", script: "Latn")
         end
+        @errors[:abstract] &&= result.empty?
+        result
       end
 
       #
@@ -160,10 +175,12 @@ module Relaton
       # @return [Array<Relaton::Bib::Copyright>]
       #
       def parse_copyright
-        @doc.copyright.map do |owner, year|
+        result = @doc.copyright.map do |owner, year|
           contrib = owner.map { |own| Bib::ContributionInfo.new organization: create_org(own) }
           Bib::Copyright.new(owner: contrib, from: year)
         end
+        @errors[:copyright] &&= result.empty?
+        result
       end
 
       #
@@ -174,6 +191,7 @@ module Relaton
       def parse_status
         return if @doc.docstatus.nil? || @doc.docstatus.empty?
 
+        @errors[:status] &&= @doc.docstatus[:stage].nil?
         stage = Bib::Status::Stage.new content: @doc.docstatus[:stage]
         Bib::Status.new stage: stage
       end
@@ -184,7 +202,7 @@ module Relaton
       # @return [Array<Relaton::Bib::Relation>]
       #
       def parse_relation # rubocop:disable Metrics/AbcSize
-        array(@doc.publicationinfo.standard_relationship).each_with_object([]) do |relation, acc|
+        result = array(@doc.publicationinfo.standard_relationship).each_with_object([]) do |relation, acc|
           if (ref = @fetcher.backrefs[relation.date_string])
             rel = @fetcher.create_relation(relation.type, ref)
             acc << rel if rel
@@ -192,6 +210,8 @@ module Relaton
             @fetcher.add_crossref(docnumber, relation)
           end
         end
+        @errors[:relation] &&= result.empty?
+        result
       end
 
       #
@@ -200,7 +220,9 @@ module Relaton
       # @return [Array<Relaton::Bib::Uri>]
       #
       def parse_source
-        @doc.link { |url| Bib::Uri.new(content: url, type: "src") }
+        result = @doc.link { |url| Bib::Uri.new(content: url, type: "src") }
+        @errors[:source] &&= result.empty?
+        result
       end
 
       #
@@ -209,12 +231,11 @@ module Relaton
       # @return [Array<Strign>]
       #
       def parse_keyword
-        taxon = @doc.keyword.map do |kw|
-          Bib::LocalizedString.new(content: kw, language: "en", script: "Latn")
+        result = @doc.keyword.map do |kw|
+          Bib::Keyword.new(vocab: Bib::LocalizedString.new(content: kw, language: "en", script: "Latn"))
         end
-        return [] if taxon.empty?
-
-        [Bib::Keyword.new(taxon: taxon)]
+        @errors[:keyword] &&= result.empty?
+        result
       end
 
       private
@@ -247,14 +268,22 @@ module Relaton
       end
 
       def parse_ext
+        standard_status = @doc.publicationinfo.standard_status
+        standard_modified = @doc.standard_modifier
+        pubstatus = @doc.publicationinfo.pubstatus
+        holdstatus = @doc.publicationinfo.holdstatus
+        @errors[:standard_status] &&= standard_status.nil?
+        @errors[:standard_modified] &&= standard_modified.nil?
+        @errors[:pubstatus] &&= pubstatus.nil?
+        @errors[:holdstatus] &&= holdstatus.nil?
         Ext.new(
           doctype: parse_doctype,
           flavor: "ieee",
           ics: parse_ics,
-          standard_status: @doc.publicationinfo.standard_status,
-          standard_modified: @doc.standard_modifier, # @TODO check value
-          pubstatus: @doc.publicationinfo.pubstatus,
-          holdstatus: @doc.publicationinfo.holdstatus,
+          standard_status: standard_status,
+          standard_modified: standard_modified,
+          pubstatus: pubstatus,
+          holdstatus: holdstatus,
         )
       end
 
@@ -273,9 +302,11 @@ module Relaton
       # @return [Array<Relaton::Bib::ICS>]
       #
       def parse_ics
-        @doc.ics.each_with_object([]) do |ics, acc|
+        result = @doc.ics.each_with_object([]) do |ics, acc|
           acc << Bib::ICS.new(**ics) if ics[:code] && !ics[:code].empty?
         end
+        @errors[:ics] &&= result.empty?
+        result
       end
     end
   end

data/lib/relaton/ieee/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Ieee
-    VERSION = "2.0.0-alpha.1".freeze
+    VERSION = "2.0.0-alpha.2".freeze
   end
 end

data/relaton_ieee.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "ieee-idams", "~> 0.2.10"
   spec.add_dependency "mini_portile2", "~> 2.8.0"
-  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.4"
-  spec.add_dependency "relaton-core", "~> 0.0.9"
+  spec.add_dependency "relaton-bib", "~> 2.0.0-alpha.7"
+  spec.add_dependency "relaton-core", "~> 0.0.13"
   spec.add_dependency "relaton-index", "~> 0.2.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha.1
+  version: 2.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Ribose Inc.
@@ -57,28 +57,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