From 6ab408524b3566cb07c0a06a8abbd20c301c9685 Mon Sep 17 00:00:00 2001
From: Katrin Leinweber <kalei@posteo.de>
Date: Wed, 21 Feb 2018 08:12:43 +0100
Subject: [PATCH] Link DOIs to preferred resolver

---
 app/views/publications/_publication_preview.html.erb | 4 ++--
 app/views/publications/_resource_list_item.html.erb  | 4 ++--
 app/views/publications/feed.atom.builder             | 2 +-
 app/views/publications/show.html.erb                 | 6 +++---
 vendor/plugins/doi_query_tool/lib/doi_record.rb      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/publications/_publication_preview.html.erb b/app/views/publications/_publication_preview.html.erb
index e96af219..e2a3642e 100644
--- a/app/views/publications/_publication_preview.html.erb
+++ b/app/views/publications/_publication_preview.html.erb
@@ -2,7 +2,7 @@
       
 <%= list_item_attribute "PubMed ID", publication.pubmed_id, "http://www.ncbi.nlm.nih.gov/pubmed/#{publication.pubmed_id}", {:popup => true} unless publication.pubmed_id.nil? %>
 
-<%= list_item_attribute "DOI", publication.doi, "http://dx.doi.org/#{publication.doi}", {:popup => true} unless publication.doi.nil? %>
+<%= list_item_attribute "DOI", publication.doi, "https://doi.org/#{publication.doi}", {:popup => true} unless publication.doi.nil? %>
 
 <%= list_item_simple_list(authors, "Author") {|a| a.last_name + " " + a.first_name} -%>
 
@@ -18,4 +18,4 @@
   <%= f.hidden_field :pubmed_id %>
   <%= f.hidden_field :doi %>
   <%= submit_tag 'Register' %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/publications/_resource_list_item.html.erb b/app/views/publications/_resource_list_item.html.erb
index 0c54eb54..81fa3c3e 100644
--- a/app/views/publications/_resource_list_item.html.erb
+++ b/app/views/publications/_resource_list_item.html.erb
@@ -2,7 +2,7 @@
 
 <%= list_item_attribute "PubMed ID", item.pubmed_id, "http://www.ncbi.nlm.nih.gov/pubmed/#{item.pubmed_id}", {:popup => true} unless item.pubmed_id.nil? %>
 
-<%= list_item_attribute "DOI", item.doi, "http://dx.doi.org/#{item.doi}", {:popup => true} unless item.doi.nil? %>
+<%= list_item_attribute "DOI", item.doi, "https://doi.org/#{item.doi}", {:popup => true} unless item.doi.nil? %>
 
 <p class="list_item_attribute">
   <b>Author<%= item.asset.creators.size + item.non_seek_authors.size > 1 ? "s" : "" -%>:</b>
@@ -19,4 +19,4 @@
 
 <%= list_item_optional_attribute "Journal", h(item.journal) %>
 
-<%= list_item_attribute "Date Published", item.published_date.strftime('%d/%m/%Y') %>
\ No newline at end of file
+<%= list_item_attribute "Date Published", item.published_date.strftime('%d/%m/%Y') %>
diff --git a/app/views/publications/feed.atom.builder b/app/views/publications/feed.atom.builder
index efaeb5e1..106ee6b3 100644
--- a/app/views/publications/feed.atom.builder
+++ b/app/views/publications/feed.atom.builder
@@ -36,7 +36,7 @@ atom_feed :language => "en-GB", :root_url => "/publications",
       end
       unless item.doi.nil?
         entry.content "type" => "text/html",
-                      "src" => "http://dx.doi.org/#{item.doi}"
+                      "src" => "https://doi.org/#{item.doi}"
       end
     end
   end
diff --git a/app/views/publications/show.html.erb b/app/views/publications/show.html.erb
index b0b2bea6..256b6b8b 100644
--- a/app/views/publications/show.html.erb
+++ b/app/views/publications/show.html.erb
@@ -2,7 +2,7 @@
   <% if !@publication.pubmed_id.nil? %>
     <li><%= image_tag_for_key('visit_pubmed', "http://www.ncbi.nlm.nih.gov/pubmed/#{@publication.pubmed_id}", nil, {:popup => true}, 'View Publication On PubMed') -%></li>
   <% elsif !@publication.doi.nil? %>
-    <li><%= image_tag_for_key('visit_pubmed', "http://dx.doi.org/#{@publication.doi}", nil, {:popup => true}, 'View Publication') -%></li>
+    <li><%= image_tag_for_key('visit_pubmed', "https://doi.org/#{@publication.doi}", nil, {:popup => true}, 'View Publication') -%></li>
   <% end -%>
   <% if Authorization.is_authorized?("edit", nil, @publication, current_user) -%>
       <li><%= image_tag_for_key('manage', edit_publication_path(@publication), nil, nil, 'Manage Publication') -%></li>
@@ -25,7 +25,7 @@
         <% end %>
         <% unless @publication.doi.nil? %>
           <label>DOI:</label>
-          <%= link_to @publication.doi, "http://dx.doi.org/#{@publication.doi}",{:popup => true} %>
+          <%= link_to @publication.doi, "https://doi.org/#{@publication.doi}",{:popup => true} %>
         <% end %>
       </p>
       <!-- no projects in methodbox -->
@@ -77,4 +77,4 @@
   <!-- <div style="clear:both;padding-top:1em;">     -->
     <%#= render :partial=>"layouts/items_related_to",:object => @publication %>
   <!-- </div> -->
-</div>
\ No newline at end of file
+</div>
diff --git a/vendor/plugins/doi_query_tool/lib/doi_record.rb b/vendor/plugins/doi_query_tool/lib/doi_record.rb
index e00e0406..65201e74 100644
--- a/vendor/plugins/doi_query_tool/lib/doi_record.rb
+++ b/vendor/plugins/doi_query_tool/lib/doi_record.rb
@@ -1,7 +1,7 @@
 class DoiRecord
   attr_accessor :authors, :title, :abstract, :journal, :doi, :xml, :date_published
     
-  DOI_BASE_URL = "http://dx.doi.org/"
+  DOI_BASE_URL = "https://doi.org/"
   
   def initialize(attributes={})
     self.title = attributes[:title]
@@ -16,4 +16,4 @@ def initialize(attributes={})
   def lookup_url
     return DOI_BASE_URL + self.doi
   end
-end
\ No newline at end of file
+end