From 376c7bbd0e10498bf09df732499ccf3236efd165 Mon Sep 17 00:00:00 2001
From: Will Fyson <williamfyson89@hotmail.com>
Date: Tue, 31 Jul 2018 13:09:56 +0000
Subject: [PATCH] Add missing phrases and fix Issue #5 where existing
 institutions in the user's orcid.org profile were not being checked
 correctly.

---
 lib/lang/en/phrases/z_orcid_support_advance.xml |  3 +++
 lib/plugins/EPrints/Plugin/Event/OrcidSync.pm   | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/lang/en/phrases/z_orcid_support_advance.xml b/lib/lang/en/phrases/z_orcid_support_advance.xml
index 76c0d95..d61b6c2 100644
--- a/lib/lang/en/phrases/z_orcid_support_advance.xml
+++ b/lib/lang/en/phrases/z_orcid_support_advance.xml
@@ -11,6 +11,8 @@
 <epp:phrase id="user_fieldname_orcid_name">orcid.org Name</epp:phrase>
 <epp:phrase id="user_fieldname_orcid_token_expires">ORCID Token Expiry</epp:phrase>
 
+<epp:phrase id="eprint_fieldname_orcid_put_codes">ORCID Put Codes</epp:phrase>
+
 <!-- Authenticate ORCID -->
 <epp:phrase id="Plugin/Screen/AuthenticateOrcid:title"><img class="orcid-icon" src="/images/orcid_16x16.png"/>Create or Connect your ORCID iD</epp:phrase>
 
@@ -67,6 +69,7 @@ Upon allowing this permission, <epc:phrase ref="archive_name" /> will also attem
 <epp:phrase id="Plugin/Screen/ManageOrcid:admin_disconnect_button">Disconnect from ORCID</epp:phrase>
 <epp:phrase id="Plugin/Screen/ManageOrcid:local_user_connect_orcid_button">Create or Connect your ORCID iD</epp:phrase>
 <epp:phrase id="Plugin/Screen/ManageOrcid:disconnected">You are not currently connected to ORCID</epp:phrase>
+<epp:phrase id="Plugin/Screen/ManageOrcid:confirm_erase_dialog">Are you sure?\nOnce removed we will not be able to maintain the user&apos;s ORCID record until they reauthenticate with ORCID</epp:phrase>
 
 <!-- Name Report -->
 <epp:phrase id="Plugin/Screen/Report/Orcid/CheckName:title">orcid.org Name Mismatch</epp:phrase>
diff --git a/lib/plugins/EPrints/Plugin/Event/OrcidSync.pm b/lib/plugins/EPrints/Plugin/Event/OrcidSync.pm
index 920f36b..14bb7c4 100644
--- a/lib/plugins/EPrints/Plugin/Event/OrcidSync.pm
+++ b/lib/plugins/EPrints/Plugin/Event/OrcidSync.pm
@@ -44,10 +44,15 @@ sub update_employment
 		my $add_institution = 1;
                 foreach my $employment ( @{$json_text->{"$affiliation-summary"}} )
                 {
-                        if( $employment->{'organization'}->{'disambiguation-organization-identifier'} eq $institution->{'organization'}->{'disambiguation-organization-identifier'} )
-                        {
-                                $add_institution = 0;
-                        }
+			my $orgid1 = $institution->{'organization'}->{'disambiguated-organization'}->{'disambiguated-organization-identifier'};
+        		my $orgid2 = $employment->{'organization'}->{'disambiguated-organization'}->{'disambiguated-organization-identifier'};
+			print STDERR "id1.....$orgid1\n";
+			print STDERR "id2.....$orgid2\n";
+		        if( $orgid1 eq $orgid2 )
+			{
+				print STDERR "don't add institution\n";
+		                $add_institution = 0;
+		        }
                 }
 
 		#add the insitution if we still need to