moved wikidata_links to more general lod_links

Author: MartinHinz

app/controllers/wikidata_links_controller.rb renamed to app/controllers/lod_links_controller.rb

@@ -1,15 +1,15 @@
-class WikidataLinksController < ApplicationController
+class LodLinksController < ApplicationController
   load_and_authorize_resource
 
-  before_action :set_wikidata_link, only: [:show, :edit, :update, :destroy]
+  before_action :set_lod_link, only: [:show, :edit, :update, :destroy]
 
   def show
     @wikidata_link.request_item
     if @wikidata_link.item.sitelink_title("enwiki").present?
       @wikidata_link.item.request_wikipedia_extract
     end
 
-    render partial: "wikidata_link"
+    render partial: "lod_link"
   end
 
   def new
@@ -19,27 +19,27 @@ def edit
   end
 
   def create
-    @wikidata_link = WikidataLink.new(wikidata_link_params)
+    @lod_link = LodLink.new(lod_link_params)
 
     respond_to do |format|
-      if @wikidata_link.save
+      if @lod_link.save
         format.html { redirect_back fallback_location: root_path, notice: success_notice }
-        format.json { render :show, status: :created, location: @wikidata_link }
+        format.json { render :show, status: :created, location: @lod_link }
       else
         format.html { render :new, status: :unprocessable_entity }
-        format.json { render json: @wikidata_link.errors, status: :unprocessable_entity }
+        format.json { render json: @lod_link.errors, status: :unprocessable_entity }
       end
     end
   end
 
   def update
     respond_to do |format|
-      if @wikidata_link.update(wikidata_link_params)
+      if @lod_link.update(lod_link_params)
         format.html { redirect_back fallback_location: root_path, notice: success_notice }
-        format.json { render :show, status: :ok, location: @wikidata_link }
+        format.json { render :show, status: :ok, location: @lod_link }
       else
         format.html { render :edit, status: :unprocessable_entity }
-        format.json { render json: @wikidata_link.errors, status: :unprocessable_entity }
+        format.json { render json: @lod_link.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -49,24 +49,26 @@ def destroy
 
   private
 
-  def set_wikidata_link
-    @wikidata_link = WikidataLink.find(params[:id])
+  def set_lod_link
+    @lod_link = LodLink.find(params[:id])
+    @wikidata_link = LodLink.where(source: "Wikidata").find(params[:id])
   end
 
-  def wikidata_link_params
-    params.require(:wikidata_link).permit([
-      :qid, 
-      :wikidata_linkable_type,
-      :wikidata_linkable_id,
+  def lod_link_params
+    params.require(:lod_link).permit([
+      :external_id,
+      :source, 
+      :linkable_type,
+      :linkable_id,
       :revision_comment
     ])
   end
 
   def success_notice
-    @wikidata_link.wikidata_linkable_type +
+    @lod_link.linkable_type +
       ":" +
-      @wikidata_link.wikidata_linkable_id.to_s +
+      @lod_link.linkable_id.to_s +
       " is now linked to Wikidata item Q" +
-      @wikidata_link.qid.to_s
+      @lod_link.external_id.to_s
   end
 end

app/models/wikidata_link.rb renamed to app/models/lod_link.rb

@@ -15,7 +15,7 @@
 #  index_wikidata_links_on_qid                            (qid)
 #  index_wikidata_links_on_wikidata_linkable              (wikidata_linkable_type,wikidata_linkable_id)
 #
-class WikidataLink < ApplicationRecord
+class LodLink < ApplicationRecord
   include Turbo::Broadcastable
   include Versioned
 
@@ -27,20 +27,21 @@ class WikidataLink < ApplicationRecord
 
   attr_reader :item
 
-  validates :qid, presence: true, numericality: { only_integer: true }
+  validates :external_id, presence: true, numericality: { only_integer: true }
+  validates :source, presence: true
 
-  belongs_to :wikidata_linkable, polymorphic: true
+  belongs_to :linkable, polymorphic: true
 
   def qcode
-    "Q#{qid}"
+    "Q#{external_id}"
   end
 
   def url
     BASE_URL + qcode
   end
 
   def request_item
-    @item = WikidataItem.new(qid)
+    @item = WikidataItem.new(external_id)
   end
 
   def title

app/models/site.rb

@@ -29,8 +29,7 @@ class Site < ApplicationRecord
   has_many :typos, through: :contexts
   has_many :citations, as: :citing
   has_many :references, through: :citations
-  has_one :wikidata_link, as: :wikidata_linkable
-  has_one :wikidata_item, as: :wikidata_link
+  has_many :lod_links, as: :linkable, dependent: :destroy
 
   has_and_belongs_to_many :site_types, optional: true
 
@@ -95,6 +94,10 @@ def country
     ISO3166::Country[country_code] || 
       ISO3166::Country.find_country_by_any_name(country_code)
   end
+  
+  def wikidata_link
+    lod_links.where(source: "Wikidata").first
+  end
 
   def country_from_coordinates
     return nil if lat.blank? || lng.blank?
@@ -117,10 +120,9 @@ def country_code_from_coordinates
       return nil
     end
   end
-  
-
 
   def self.wikidata_match_candidates_batch(sites)
+    
     # Filter for sites without a wikidata_link
     sites_without_wikidata_link = sites.select { |site| site.wikidata_link.nil? }
 
@@ -183,18 +185,47 @@ def missing_country_code?
     country_code.blank?
   end
 
+  # LODs
   scope :needs_wikidata_link, -> {
-    where.not(id: WikidataLink.where(wikidata_linkable_type: "Site").select(:wikidata_linkable_id).distinct)
+    where.not(id: LodLink.where(linkable_type: "Site", source: "Wikidata").select(:linkable_id).distinct)
   }
   def needs_wikidata_link?
     wikidata_link.blank?
   end
+  
+#  scope :with_potential_wikidata_match, -> {
+#    cache_keys = Rails.cache.instance_variable_get(:@data).keys # Inspect cached keys
+#    
+#    matched_ids = []
+#
+#    cache_keys.each do |key|
+#      cached_data = Rails.cache.read(key)
+#      next if cached_data.blank?
+#
+#      logger.debug "*******************"
+#      logger.debug cached_data.to_yaml      
+#      logger.debug "*******************"
+#
+#      # Find sites matching cached names but exclude those with existing wikidata_links
+#      matched_ids += Site.where(name: cached_data.keys).where.not(id: LodLink.where(linkable_type: "Site", source: "Wikidata").select(:linkable_id)).pluck(:id)
+#    end
+#
+#    where(id: matched_ids.uniq)
+#  }
+#  def with_potential_wikidata_match?
+#    return false if wikidata_link.present? # Exclude if a Wikidata link already exists
+#
+#    cache_key = Site.generate_cache_key([self])
+#    cached_matches = Rails.cache.read(cache_key) || {}
+#    cached_matches.key?(self.name)
+#  end
 
   private
 
   # Generate a unique cache key for the batch of sites
   def self.generate_cache_key(sites)
-    "wikidata_match_batch/#{Digest::MD5.hexdigest(sites.pluck(:name).sort.join(','))}"
+    site_names = sites.pluck(:name).compact.reject(&:blank?) # Remove nil and blank names
+    "wikidata_match_batch/#{Digest::MD5.hexdigest(site_names.sort.join(','))}"
   end
 
   # Extracts names from the sites

app/views/lod_links/_fields.html.erb

@@ -0,0 +1,24 @@
+  <!-- Hidden Fields -->
+  <%= f.hidden_field :linkable_type %>
+  <%= f.hidden_field :linkable_id %>
+  <%= f.hidden_field :source, value: "Wikidata" %>
+
+  <!-- QID Input Field -->
+  <div class="input-group">
+    <%= f.text_field :external_id, prepend: "Q", hide_label: true, placeholder: "Enter QID" %>
+  </div>
+
+  <!-- Suggestions from Lod Match -->
+  <p>Suggestion from Name:</p>
+  <ul>
+    <% if wikidata_matches_for(f.object.linkable).present? %>
+      <% wikidata_matches_for(f.object.linkable)[f.object.linkable.name]&.each do |match| %>
+        <li>
+          <%= match.qid %>: 
+          <%= link_to "#{match.label} (#{match.description})", match.url, target: "_blank" %>
+        </li>
+      <% end %>
+    <% else %>
+      <li>No suggestions available</li>
+    <% end %>
+  </ul>

app/views/wikidata_links/_form.html.erb renamed to app/views/lod_links/_form.html.erb

@@ -1,11 +1,11 @@
-<%= bootstrap_form_with(model: @wikidata_link, id: "wikidataLinkForm") do |f| %>
+<%= bootstrap_form_with(model: @lod_link, id: "lodLinkForm") do |f| %>
   <%= render  "fields", f: f %>
 
   <%= render "application/paper_trail/revision_comment_field", f: f %>
 
   <%= content_for :buttons do %>
     <%= button_tag "Cancel", type: "reset", class: "btn btn-outline-danger", 
-      form: "wikidataLinkForm", data: { "bs-dismiss": "modal" } %>
-    <%= button_tag "Save", class: "btn btn-primary", form: "wikidataLinkForm" %>
+      form: "lodLinkForm", data: { "bs-dismiss": "modal" } %>
+    <%= button_tag "Save", class: "btn btn-primary", form: "lodLinkForm" %>
   <% end %>
 <% end %>

app/views/wikidata_links/_wikidata_link.html.erb renamed to app/views/lod_links/_lod_link.html.erb

@@ -51,7 +51,7 @@
         <td class="font-monospace text-end"><%= site.typos_count %></td>
         <td class="font-monospace text-end">
           <% if site.wikidata_link %>
-            <%= link_to site.wikidata_link.qid, site.wikidata_link.url %>
+            <%= link_to site.wikidata_link.external_id, site.wikidata_link.url %>
           <% elsif @wikidata_matches.key?(site.name) && @wikidata_matches[site.name].present? %>
             <% suggested_match = @wikidata_matches[site.name].first %>
             <i>Suggestion: <%= suggested_match.qid %>: 
@@ -71,13 +71,14 @@
           <td>
             <div class="btn-toolbar justify-content-end">
               <div class="btn-group me-2">
-                <%= bootstrap_form_for WikidataLink.new, url: wikidata_links_path, method: :post do |f| %>
-                  <%= f.hidden_field :wikidata_linkable_type, value: "Site" %>
-                  <%= f.hidden_field :wikidata_linkable_id, value: site.id %>
+                <%= bootstrap_form_for LodLink.new, url: lod_links_path, method: :post do |f| %>
+                  <%= f.hidden_field :linkable_type, value: "Site" %>
+                  <%= f.hidden_field :linkable_id, value: site.id %>
+                  <%= f.hidden_field :source, value: "Wikidata" %>
 
                   <% if @wikidata_matches.key?(site.name) && @wikidata_matches[site.name].present? %>
                     <% suggested_match = @wikidata_matches[site.name].first %>
-                    <%= f.hidden_field :qid, value: suggested_match.qid %>
+                    <%= f.hidden_field :external_id, value: suggested_match.qid %>
                     <%= f.hidden_field :revision_comment, value: "Matched to Wikidata" %>
                     <%= f.primary class: "btn btn-sm btn-primary", title: "Use suggested Wikidata match" do %>
                       <%= bs_icon "check-lg" %>

app/views/wikidata_links/edit.html.erb renamed to app/views/lod_links/edit.html.erb

@@ -72,19 +72,19 @@
           <h3 class="mb-0">
             <i class="bi-link-45deg"></i> Linked Data</h3>
       <% if @site.wikidata_link.present? %>
-        <% if can? :manage, WikidataLink %>
-          <%= floating_button edit_wikidata_link_path(@site.wikidata_link),
+        <% if can? :manage, LodLink %>
+          <%= floating_button edit_lod_link_path(@site.wikidata_link),
             data: { turbo_frame: "remote_modal" } %>
         <% end %>
         <%= turbo_frame_tag @site.wikidata_link, src: @site.wikidata_link %>
       <% else %>
         <p>There is no linked data available for this record.</p>
-        <% if can? :manage, WikidataLink %>
+        <% if can? :manage, LodLink %>
           <ul>
             <li><%= link_to "Add Wikidata link", 
-              new_wikidata_link_path(wikidata_link: { 
-                  wikidata_linkable_type: "Site", 
-                  wikidata_linkable_id: @site
+              new_lod_link_path(lod_link: { 
+                  linkable_type: "Site", 
+                  linkable_id: @site
                 }),
                 data: { turbo_frame: "remote_modal" } %>
             </li>