Extract only main language

Author: fbacall

lib/tess/rdf/event_extractor.rb

@@ -36,7 +36,7 @@ def extract_params
         params[:prerequisites] = extract_course_prerequisites
         params[:learning_objectives] = markdownify_list extract_names_or_values(RDF::Vocab::SCHEMA.teaches)
         params[:target_audience] = extract_audience
-        params[:language] = extract_names_or_values(RDF::Vocab::SCHEMA.inLanguage).first
+        params[:language] = extract_language
 
         remove_blanks(params)
       end

lib/tess/rdf/extraction.rb

@@ -256,9 +256,7 @@ def extract_mentions(subject: resource)
       end
 
       def extract_language(subject: resource)
-        query(
-          [subject, RDF::Vocab::SCHEMA.inLanguage, :language],
-          [:language, RDF::Vocab::SCHEMA.name, :language, { optional: true }])
+        extract_names_or_values(RDF::Vocab::SCHEMA.inLanguage, subject: subject).first&.split('-')&.first
       end
 
       def extract_names_or_ids(predicate, subject: resource)

test/field_test.rb

@@ -263,9 +263,9 @@ class FieldTest < Test::Unit::TestCase
   "@context": "https://schema.org/",
   "@type": "CourseInstance",
   "name": "Dummy Course",
-  "inLanguage": "en"
+  "inLanguage": "en-GB"
 }])
-    assert_equal 'en', course_instance_extractor(json).extract_params[:language]
+    assert_equal 'en', course_instance_extractor(json).send(:extract_language)
 
     json = %(
 [{
@@ -277,7 +277,7 @@ class FieldTest < Test::Unit::TestCase
     "name" : "de"
   }
 }])
-    assert_equal 'de', course_instance_extractor(json).extract_params[:language]
+    assert_equal 'de', course_instance_extractor(json).send(:extract_language)
   end
 
   private