relaton-3gpp 1.19.0 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ff1174543dfbd48b4d626209d606068d47ae500cd7b9bbf5cd76fa349286d04
-  data.tar.gz: df03d0d8c121fdf64838e5d4d4c5ee763d7e44296a25d028203284dbd5fccd87
+  metadata.gz: 45004cd52d3255e9882f17e3c4331025aaf389c21ad1c756ba3aeccd5953f5b0
+  data.tar.gz: d87bbfcdbdd04d17726554e7bcbd7438b8edc5f31dcc7030553522f292ea9ec2
 SHA512:
-  metadata.gz: f7c829da8ad2a8c9cadba2293d87e0f8cf90db08ce35f91b411d00f3c261d990c6b3d2a105ac81bc9112e726acf913e471b364c8bc5c44af762e36c1b89cf5ea
-  data.tar.gz: 1e6d5b9679d1ea1c59aee4a43c807772bfadb0a28943d56930f0295cd75aa1bddfbfdc958406616b3622d54afa8d427a26b08d476d505130dd5585ede977cef4
+  metadata.gz: 9e11c551066552effe3e897850210ba5b7e06f033b5ddc2798f1ec74b68534cd3b87772b6175f506af4909e376f55c078701035a2a4353399ab8f88f4ffc1d76
+  data.tar.gz: 2303de76da8eebe06ac967b54fe08b4e2cb78215f66cf8a789182f8c81d89286ca97034e1617dee50b0efb0e92a90c7aa75914903c0e79a336b830daa613e2d4

data/lib/relaton_3gpp/bibliographic_item.rb

@@ -80,7 +80,7 @@ module Relaton3gpp
     #
     # @return [Hash
     #
-    def to_hash
+    def to_hash(embedded: false)
       hash = super
       hash["radiotechnology"] = @radiotechnology if @radiotechnology
       hash["common-ims-spec"] = @common_ims_spec if @common_ims_spec

data/lib/relaton_3gpp/data_fetcher.rb

@@ -52,7 +52,7 @@ module Relaton3gpp
         FileUtils.rm_f File.join(@output, "/*") # if renewal && dbs["2001-04-25_schedule"].any?
         index.remove_all # if renewal
       end
-      CSV.open(file, "r:bom|utf-8", headers: true, col_sep: ";").each do |row|
+      CSV.open(file, "r:bom|utf-8", headers: true).each do |row|
         save_doc Parser.parse(row)
       end
       File.write CURRENT, @current.to_yaml, encoding: "UTF-8"
@@ -125,19 +125,147 @@ module Relaton3gpp
     def save_doc(bib) # rubocop:disable Metrics/MethodLength
       return unless bib
 
-      c = case @format
-          when "xml" then bib.to_xml(bibdata: true)
-          when "yaml" then bib.to_hash.to_yaml
-          else bib.send("to_#{@format}")
-          end
-      file = file_name(bib)
+      bib1 = bib
+      file = file_name(bib1)
       if @files.include? file
-        Util.warn "File #{file} already exists. Document: #{bib.docnumber}"
+        bib1 = merge_duplication bib1, file
+        Util.warn "File #{file} already exists. Document: #{bib.docnumber}" if bib1.nil?
       else
         @files << file
+        index.add_or_update bib1.docnumber, file
+      end
+      File.write file, serialise(bib1), encoding: "UTF-8" unless bib1.nil?
+    end
+
+    #
+    # Merge duplication
+    #
+    # @param [Relaton3gpp::BibliographicItem] bib new bibliographic item
+    # @param [String] file file name of existing bibliographic item
+    #
+    # @return [Relaton3gpp::BibliographicItem, nil] merged bibliographic item or nil if no merge has been done
+    #
+    def merge_duplication(bib, file)
+      hash = YAML.load_file file
+      existed = BibliographicItem.from_hash hash
+      changed = update_link bib, existed
+      bib1, bib2, chng = transposed_relation bib, existed
+      changed ||= chng
+      chng = add_contributor(bib1, bib2)
+      changed ||= chng
+      bib1 if changed
+    end
+
+    #
+    # Update link in case one of bibliographic items has no link
+    #
+    # @param [Relaton3gpp::BibliographicItem] bib1
+    # @param [Relaton3gpp::BibliographicItem] bib2
+    #
+    # @return [Boolean] true if link has been updated
+    #
+    def update_link(bib1, bib2)
+      if bib1.link.any? && bib2.link.empty?
+        bib2.instance_variable_set(:@link, bib1.link)
+        true
+      elsif bib1.link.empty? && bib2.link.any?
+        bib1.instance_variable_set(:@link, bib2.link)
+        true
+      else false
+      end
+    end
+
+    #
+    # If one of bibliographic items has date gereater than anotherm=, make it relation
+    #
+    # @param [Relaton3gpp::BibliographicItem] bib new bibliographic item
+    # @param [Relaton3gpp::BibliographicItem] existed existing bibliographic item
+    #
+    # @return [Array<Relaton3gpp::BibliographicItem, Boolean>] main bibliographic item,
+    #   related bibliographic item, true if relation has been added
+    #
+    def transposed_relation(bib, existed) # rubocop:disable Metrics/CyclomaticComplexity
+      return [bib, existed, false] if bib.date.none? && existed.date.none? ||
+        bib.date.any? && existed.date.none?
+      return [existed, bib, true] if bib.date.none? && existed.date.any?
+
+      check_transposed_date bib, existed
+    end
+
+    #
+    # Check if date of one bibliographic item is transposed to another
+    #
+    # @param [Relaton3gpp::BibliographicItem] bib new bibliographic item
+    # @param [Relaton3gpp::BibliographicItem] existed existing bibliographic item
+    #
+    # @return [Array<Relaton3gpp::BibliographicItem, Boolean>] main bibliographic item,
+    #   related bibliographic item, true if relation has been added
+    #
+    def check_transposed_date(bib, existed)
+      if bib.date[0].on < existed.date[0].on
+        add_transposed_relation bib, existed
+        [bib, existed, true]
+      elsif bib.date[0].on > existed.date[0].on
+        add_transposed_relation existed, bib
+        [existed, bib, true]
+      else [bib, existed, false]
+      end
+    end
+
+    #
+    # Add transposed relation
+    #
+    # @param [Relaton3gpp::BibliographicItem] bib1 the main bibliographic item
+    # @param [Relaton3gpp::BibliographicItem] bib2 the transposed bibliographic item
+    #
+    # @return [Relaton3gpp::BibliographicItem]
+    #
+    def add_transposed_relation(bib1, bib2)
+      bib2.relation.each { |r| bib1.relation << r }
+      bib2.instance_variable_set :@relation, RelatonBib::DocRelationCollection.new([])
+      dec = RelatonBib::FormattedString.new content: "equivalent"
+      rel = RelatonBib::DocumentRelation.new(type: "adoptedAs", bibitem: bib2, description: dec)
+      bib1.relation << rel
+    end
+
+    def add_contributor(bib1, bib2) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      changed = false
+
+      bib2.contributor.each do |bc|
+        next if bc.entity.is_a? RelatonBib::Organization
+
+        existed = bib1.contributor.find { |ic| ic.entity.name == bc.entity.name }
+        if existed
+          chng = add_affiliation existed, bc.entity.affiliation
+          changed ||= chng
+        else
+          bib1.contributor << bc
+          changed = true
+        end
+      end
+
+      changed
+    end
+
+    def add_affiliation(contrib, affiliation)
+      changed = false
+
+      affiliation.each do |a|
+        unless contrib.entity.affiliation.include? a
+          contrib.entity.affiliation << a
+          changed = true
+        end
+      end
+
+      changed
+    end
+
+    def serialise(bib)
+      case @format
+      when "xml" then bib.to_xml(bibdata: true)
+      when "yaml" then bib.to_hash.to_yaml
+      else bib.send("to_#{@format}")
       end
-      index.add_or_update bib.docnumber, file
-      File.write file, c, encoding: "UTF-8"
     end
 
     #

data/lib/relaton_3gpp/parser.rb

@@ -109,7 +109,7 @@ module Relaton3gpp
 
     def release
       @release ||=  case @row["WPM Code 2G"]
-                    when /Release_(\d+)/ then "R#{$1}"
+                    when /Release_(\d+)/ then "REL-#{$1}"
                     when /PH(\d+)/ then "Ph#{$1}"
                     else @row["Release"]
                     end
@@ -254,7 +254,7 @@ module Relaton3gpp
         aff << RelatonBib::Affiliation.new(organization: org)
       end
       surname = RelatonBib::LocalizedString.new @row["Last Name"], "en", "Latn"
-      forename = RelatonBib::LocalizedString.new @row["First Name"], "en", "Latn"
+      forename = RelatonBib::Forename.new content: @row["First Name"], language: ["en"], script: ["Latn"]
       name = RelatonBib::FullName.new(surname: surname, forename: [forename])
       person = RelatonBib::Person.new(name: name, affiliation: aff)
       role = { type: "author" }

data/lib/relaton_3gpp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Relaton3gpp
-  VERSION = "1.19.0"
+  VERSION = "1.19.1"
 end

data/relaton_3gpp.gemspec

@@ -36,7 +36,8 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 
+  spec.add_dependency "csv"
   spec.add_dependency "net-ftp", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 1.19.0"
+  spec.add_dependency "relaton-bib", "~> 1.19.1"
   spec.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.19.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ftp
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.19.1
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement