From 3c629012452d81594845dafb59d1cea1bb273754 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Mon, 21 Oct 2013 10:13:04 -0400
Subject: [PATCH] VIVO-384 and VIVO-387 orcid id update

---
 productMods/config/listViewConfig-orcidId.xml                  | 3 +--
 .../partials/individual/propStatement-issuedCredential.ftl     | 2 +-
 .../body/partials/individual/propStatement-orcidId.ftl         | 2 +-
 .../templates/freemarker/edit/forms/addOrcidIdToPerson.ftl     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/productMods/config/listViewConfig-orcidId.xml b/productMods/config/listViewConfig-orcidId.xml
index dbbee33a..fe93bba2 100644
--- a/productMods/config/listViewConfig-orcidId.xml
+++ b/productMods/config/listViewConfig-orcidId.xml
@@ -8,10 +8,9 @@
 <list-view-config>
     <query-select>    
         PREFIX afn:  &lt;http://jena.hpl.hp.com/ARQ/function#&gt;  
-        SELECT ?value ?localName
+        SELECT ?value
         WHERE {
                 ?subject ?property ?value 
-                LET (?localName := afn:localname(?value))
         } LIMIT 1
     </query-select>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
index 555ebda8..5f6ba2c4 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl
@@ -17,7 +17,7 @@
         <#if statement.credential??>
             <a href="${profileUrl(statement.uri("credential"))}" title="${i18n().credential_name}">${statement.credentialLabel!statement.localName!}</a>
         <#else>
-            <a href="${profileUrl(statement.uri("issuedCredential"))}" title="${i18n().credential_receipt_name}">${statement.issuedCredential!}</a>
+            <a href="${profileUrl(statement.uri("issuedCredential"))}" title="${i18n().credential_name}">${statement.issuedCredential!}</a>
         </#if>
     </#local>
 
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
index 58a68936..2a433a3e 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-orcidId.ftl
@@ -8,7 +8,7 @@
 <@showStatement statement />
 
 <#macro showStatement statement>
-    <a href="${statement.value!}" title="ORCID iD" target="_blank">${statement.localName!statement.value!}</a>
+    <a href="${statement.value!}" title="ORCID iD" target="_blank">${statement.value!"ORCID iD not found"}</a>
 </#macro>
 
 
diff --git a/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl b/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
index d4d5d4f2..eca559a1 100644
--- a/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
@@ -17,7 +17,7 @@
 
 <#--Retrieve variables needed-->
 <#assign orcidIdFromConf = lvf.getFormFieldValue(editSubmission, editConfiguration, "orcidId") />
-<#assign orcidIdValue = orcidIdFromConf?replace("http://www.orcid.org/","") />
+<#assign orcidIdValue = orcidIdFromConf?replace("http://orcid.org/","") />
 <#--If edit submission exists, then retrieve validation errors if they exist-->
 <#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
 	<#assign submissionErrors = editSubmission.validationErrors/>