bolognese 1.6.9 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ab3b7ce79c4ab19b986230a63bd1bb5e583f257fa2281432d10e08cdec529f
-  data.tar.gz: db1f7a4704f00cefe310edba0eca9dd69181f87861d8b9693b05056347cce759
+  metadata.gz: 7587e889005dfc54745f8159ad04ee1d301dbace34b81ce46df75d3244988446
+  data.tar.gz: 49a9ecf9265f23855bbe348343e50a8ff38e87929287ec2d7af52c34d9775cdb
 SHA512:
-  metadata.gz: b795e4deddb046f5cd6acfdb1b75f8455428facc31aed10a2cb4215dbda6d7ad22344df8a470ebe18c7672f30a76476570aca151f2006dd2c3166f9984468bd5
-  data.tar.gz: a3b5aa9640cf3fdd4b3cd2c6d7eac32be36adf242acd585277a01ce2355a8c61243aae170622b113aeb0ca16c92da7cf7c80f38b2bc76acbf9bdf7e066525389
+  metadata.gz: 68575504503ab0c3ec6e38164da0c43c1a52d29a76ba048f8320cf1b0b33261c43cac64e18f49195baac0798c4baee1ea7393dbd59f05744413b42ef78e7bc39
+  data.tar.gz: ea1bc0f124b11d17bc1b941a94aef32befe128b8c8ce6ef8c1d96b5985ce1732612ec6179ef6df05808d9110fdcd5f47e4b89f91f5b314ed8a9672a908fcaf01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bolognese (1.6.9)
+    bolognese (1.6.10)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)

data/lib/bolognese/utils.rb

@@ -1177,11 +1177,11 @@ module Bolognese
     def hsh_to_fos(hsh)
       # first find subject in Fields of Science (OECD)
       fos = JSON.load(File.read(File.expand_path('../../../resources/oecd/fos-mappings.json', __FILE__))).fetch("fosFields")
-      subject = fos.find { |l| l["fosLabel"] == hsh["__content__"] || "FOS: " + l["fosLabel"] == hsh["__content__"] }
+      subject = fos.find { |l| l["fosLabel"] == hsh["__content__"] || "FOS: " + l["fosLabel"] == hsh["__content__"] || l["fosLabel"] == hsh["subject"]}
 
       if subject
         return [{ 
-          "subject" => sanitize(hsh["__content__"]), 
+          "subject" => sanitize(hsh["__content__"] || hsh["subject"]), 
           "subjectScheme" => hsh["subjectScheme"],
           "schemeUri" => hsh["schemeURI"], 
           "valueUri" => hsh["valueURI"], 
@@ -1200,19 +1200,19 @@ module Bolognese
 
       # try to extract forId
       if hsh["subjectScheme"] == "FOR"
-        for_id = hsh["__content__"].split(" ").first
+        for_id = hsh["__content__"].split(" ").first || hsh["subject"].split(" ").first
         for_id = for_id.rjust(6, "0")        
         
         subject = for_fields.find { |l| l["forId"] == for_id } ||
                   for_disciplines.find { |l| l["forId"] == for_id[0..3] }
       else
-        subject = for_fields.find { |l| l["forLabel"] == hsh["__content__"] } ||
-                  for_disciplines.find { |l| l["forLabel"] == hsh["__content__"] }
+        subject = for_fields.find { |l| l["forLabel"] == hsh["__content__"] || l["forLabel"] == hsh["subject"] } ||
+                  for_disciplines.find { |l| l["forLabel"] == hsh["__content__"] || l["forLabel"] == hsh["subject"] }
       end
 
       if subject
         [{ 
-          "subject" => sanitize(hsh["__content__"]), 
+          "subject" => sanitize(hsh["__content__"] || hsh["subject"]), 
           "subjectScheme" => hsh["subjectScheme"],
           "schemeUri" => hsh["schemeURI"], 
           "valueUri" => hsh["valueURI"], 
@@ -1224,7 +1224,7 @@ module Bolognese
         }]
       else
         [{ 
-          "subject" => sanitize(hsh["__content__"]), 
+          "subject" => sanitize(hsh["__content__"] || hsh["subject"]), 
           "subjectScheme" => hsh["subjectScheme"],
           "schemeUri" => hsh["schemeURI"], 
           "valueUri" => hsh["valueURI"], 

data/lib/bolognese/version.rb

@@ -1,3 +1,3 @@
 module Bolognese
-  VERSION = "1.6.9"
+  VERSION = "1.6.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolognese
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10
 platform: ruby
 authors:
 - Martin Fenner