digital_scriptorium 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '085e39f712849a9c7e65b62b1f9a7715830b60a87adad5d67607f42f74535304'
-  data.tar.gz: 8739348215acc0f8df17b17155df21ed641ffff4845d4d72a6ab3c9652e9cfca
+  metadata.gz: 3807e9213ad2ab1c09f54bfa69bc5e10c8f75d4e83b9d51df21c6125e368825e
+  data.tar.gz: 0cd270031c0aef720b56194996ba2e3c8784af438c1392009d9af3fc53db0dc9
 SHA512:
-  metadata.gz: f8d519fa3b4246f3c182738d4ad42567046dbf0d691a3f07958809669ace36b25d2f4697b1671f46bff0fae97c9692d389b108696c334252708377a68320906a
-  data.tar.gz: 50f9861fb347aee4fc8a556ffc013009c23b84ac631c17fc705e4466852ea63a617c06aae5718431df908035d258928615b64a2bdf45cbaa16e46efc684d90d1
+  metadata.gz: 46c0135217a0511f4fd086984be394a32951f9894b57e331b774e4e05ac52d7446c18320581dc16862af5d0abd14c2b045a8e5369113463e7284e7fbf443dc9d
+  data.tar.gz: 6571a3a471d338a9a7ea2ee5db7e01d76dd57d00abe90af68fc6eeb22c178343072e5f59144a4b6665116c7079a8a19b56e16510733688b86894bec17b3572bf

data/doc/overview.md

@@ -10,4 +10,4 @@ The conversion script [wikibase_to_solr_new.rb](../wikibase_to_solr_new.rb) proc
 
 The specific Solr fields produced for each claim are controlled by the configuration file [property_config.yml](../property_config.yml). This file also defines the prefix (representing the property name) to be attached to each field for a given property, and whether a claim based on the property might have a related authority qualifier. 
 
-The script was written so as not to rely on the structure of the export file beyond that it will be a JSON array of Wikibase entities, with records linked to manuscripts and manuscripts linked to holdings by P3 (described manuscript) and P2 (holding) claims respectively.
+The script was written so as not to rely on the structure of the export file beyond that it will be a JSON array consisting of all entities in the DS 2.0 Wikibase, with record items linked to manuscript items and manuscript items linked to holding items by P3 (described manuscript) and P2 (holding) claims respectively.

data/lib/digital_scriptorium/claim_transformer.rb

@@ -20,39 +20,49 @@ module DigitalScriptorium
       solr_props['id'] = [value] if requested_fields.include? 'id'
       solr_props["#{prefix}_meta"] = [value] if requested_fields.include? 'meta'
 
-      display_props = { 'PV' => value }
+      unless authority_property_id && claim.qualifiers_by_property_id?(authority_property_id)
+        solr_props["#{prefix}_display"] = [{ 'PV' => value }.to_json] if requested_fields.include? 'display'
+        solr_props["#{prefix}_search"] = [value] if requested_fields.include? 'search'
+        solr_props["#{prefix}_facet"] = [value] if requested_fields.include? 'facet'
 
-      if authority_property_id && claim.qualifiers_by_property_id?(authority_property_id)
-        authority_id = claim.qualifier_by_property_id(authority_property_id).entity_id_value
+        solr_props['images_facet'] = ['Yes'] if value && claim.property_id == IIIF_MANIFEST
+        solr_props["#{prefix}_link"] = [value] if requested_fields.include? 'link'
+
+        return solr_props
+      end
+
+      display_entries = []
+      search_entries = [value]
+      facets = []
+
+      claim.qualifiers_by_property_id(authority_property_id).each do |qualifier|
+        display_props = { 'PV' => value }
+
+        authority_id = qualifier.entity_id_value
         authority = export_hash[authority_id]
 
         if authority
           label = authority.label('en')
+
           display_props['QL'] = label
+          search_entries << label
+          facets << label
 
           external_uri = authority.claim_by_property_id(EXTERNAL_URI)&.data_value
-
           wikidata_id = authority.claim_by_property_id(WIKIDATA_QID)&.data_value
           wikidata_uri = wikidata_id && "https://www.wikidata.org/wiki/#{wikidata_id}"
 
           # Only one or the other of these seem to exist for a given item in practice.
           display_props['QU'] = external_uri if external_uri
           display_props['QU'] = wikidata_uri if wikidata_uri
-
-          solr_props["#{config['prefix']}_display"] = [display_props.to_json] if config['fields'].include? 'display'
-          solr_props["#{config['prefix']}_search"] = [value, label].uniq if config['fields'].include? 'search'
-          solr_props["#{config['prefix']}_facet"] = [label] if config['fields'].include? 'facet'
-
-          return solr_props
         end
-      end
 
-      solr_props["#{config['prefix']}_display"] = [display_props.to_json] if config['fields'].include? 'display'
-      solr_props["#{config['prefix']}_search"] = [value] if config['fields'].include? 'search'
-      solr_props["#{config['prefix']}_facet"] = [value] if config['fields'].include? 'facet'
+        display_entries << display_props.to_json
+      end
 
-      solr_props['images_facet'] = ['Yes'] if value && claim.property_id == IIIF_MANIFEST
-      solr_props["#{config['prefix']}_link"] = [value] if config['fields'].include? 'link'
+      solr_props["#{prefix}_display"] = display_entries.uniq if requested_fields.include? 'display'
+      solr_props["#{prefix}_search"] = search_entries.uniq if requested_fields.include? 'search'
+      solr_props["#{prefix}_facet"] = facets.uniq if requested_fields.include? 'facet'
 
       solr_props
     end

data/lib/digital_scriptorium/name_claim_transformer.rb

@@ -29,21 +29,32 @@ module DigitalScriptorium
         }
       end
 
-      name_entity_id = claim.qualifier_by_property_id(NAME_IN_AUTHORITY_FILE).entity_id_value
-      name_item = export_hash[name_entity_id]
-      name_label = name_item.label('en')
+      display_entries = []
+      facets = []
 
-      wikidata_id = name_item.claim_by_property_id(WIKIDATA_QID).data_value
-      wikidata_url = "https://www.wikidata.org/wiki/#{wikidata_id}"
+      claim.qualifiers_by_property_id(NAME_IN_AUTHORITY_FILE).each do |qualifier|
+        display_names_for_qualifier = { 'PV' => recorded_name }
+        display_names_for_qualifier['AGR'] = name_in_original_script if name_in_original_script
 
-      search_names << name_label
-      display_names['QL'] = name_label
-      display_names['QU'] = wikidata_url if wikidata_url
+        name_entity_id = qualifier.entity_id_value
+        name_item = export_hash[name_entity_id]
+        name_label = name_item.label('en')
+
+        display_names_for_qualifier['QL'] = name_label
+        search_names << name_label
+        facets << name_label
+
+        wikidata_id = name_item.claim_by_property_id(WIKIDATA_QID).data_value
+        wikidata_url = "https://www.wikidata.org/wiki/#{wikidata_id}"
+        display_names_for_qualifier['QU'] = wikidata_url if wikidata_url
+
+        display_entries << display_names_for_qualifier.to_json
+      end
 
       {
-        "#{prefix}_display" => [display_names.to_json],
-        "#{prefix}_search" => search_names,
-        "#{prefix}_facet" => [name_label]
+        "#{prefix}_display" => display_entries.uniq,
+        "#{prefix}_search" => search_names.uniq,
+        "#{prefix}_facet" => facets.uniq
       }
     end
   end

data/lib/digital_scriptorium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DigitalScriptorium
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: digital_scriptorium
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Holloway
 bindir: exe
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json