UBO-438 Updated templates orcid-status and orcid-publish

Author: Possommi

ubo-common/src/main/resources/config/ubo-common/mycore.properties

@@ -504,7 +504,7 @@ MCR.ContentTransformer.modsCsl-xhtml-pdf.FileExtension=html
 #                                                                    #
 ######################################################################
 MCR.ContentTransformer.mods2citation.Class             = org.mycore.csl.MCRCSLTransformer
-MCR.ContentTransformer.mods2citation.format            = xml
+MCR.ContentTransformer.mods2citation.format            = html
 MCR.ContentTransformer.mods2citation.style             = ubo-presentation
 MCR.ContentTransformer.mods2citation.ItemProviderClass = org.mycore.mods.csl.MCRModsItemDataProvider
 MCR.ContentTransformer.mods2citation.MIMEType          = text/html; charset\="UTF-8"

ubo-common/src/main/resources/config/ubo-common/solr/main/solr-config.json

@@ -11,7 +11,7 @@
 				"q.op": "AND",
 				"df": "all",
 				"rows": 10,
-				"fl": "id cite cite.de cite.en year genre host_genre oa_exact",
+				"fl": "id cite cite.de cite.en year genre host_genre oa_exact nid_connection",
 				"facet": "true",
 				"facet.mincount": "1",
 				"facet.field": [

ubo-common/src/main/resources/xsl/basket-bibentries.xsl

@@ -153,7 +153,10 @@
       <div class="col">
         <xsl:call-template name="label-year" />
         <xsl:call-template name="pubtype" />
-        <xsl:call-template name="orcid-status" />
+        <xsl:call-template name="orcid-status">
+          <xsl:with-param name="mycore-id" select="@ID"/>
+          <xsl:with-param name="publication-connection-ids" select="//mods:mods//mods:nameIdentifier[@type='connection']"/>
+        </xsl:call-template>
       </div>
       <div class="col">
         <xsl:call-template name="buttons">

ubo-common/src/main/resources/xsl/mods-display.xsl

@@ -29,8 +29,6 @@
   <xsl:param name="UBO.DESTATIS.omit.ID"/>
   <xsl:param name="UBO.Affiliation.Suppress.ConnectedIndicator"/>
 
-  <xsl:param name="current-user" select="document('notnull:user:current')/user"/>
-
   <!-- Expect one more author to be displayed as the last author is always getting displayed -->
   <xsl:param name="UBO.Initially.Visible.Authors" select="14" />
 
@@ -333,25 +331,6 @@
     </span>
   </xsl:template>
 
-  <!-- ========== ORCID status and publish button ========== -->
-  <xsl:variable name="current-user-connection-id" select="$current-user/attributes/attribute[@name='id_connection']/@value"/>
-
-  <xsl:template name="orcid-status">
-    <xsl:variable name="publication-connection-ids" select="ancestor::mycoreobject//mods:nameIdentifier[@type='connection']"/>
-
-    <xsl:if test="$publication-connection-ids = $current-user-connection-id">
-      <div class="orcid-status" data-id="{ancestor::mycoreobject/@ID}"/>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="orcid-publish">
-    <xsl:variable name="publication-connection-ids" select="ancestor::mycoreobject//mods:nameIdentifier[@type='connection']"/>
-
-    <xsl:if test="$publication-connection-ids = $current-user-connection-id">
-      <div class="orcid-publish d-inline" data-id="{ancestor::mycoreobject/@ID}"/>
-    </xsl:if>
-  </xsl:template>
-
   <!-- ========== URI bauen, um Dubletten zu finden ========== -->
 
   <xsl:template name="buildFindDuplicatesURI">

ubo-common/src/main/resources/xsl/mycoreobject.xsl

@@ -202,7 +202,10 @@
             <xsl:call-template name="pubtype" />
             <xsl:call-template name="label-kdsf-pub-doc-type" />
             <xsl:call-template name="label-oa" />
-            <xsl:call-template name="orcid-status" />
+            <xsl:call-template name="orcid-status">
+              <xsl:with-param name="mycore-id" select="@ID"/>
+              <xsl:with-param name="publication-connection-ids" select="//mods:mods//mods:nameIdentifier[@type='connection']"/>
+            </xsl:call-template>
           </div>
         </div>
         <div class="row">

ubo-common/src/main/resources/xsl/response.xsl

@@ -347,9 +347,7 @@
         </xsl:if>
 
         <xsl:if test="string-length($MCR.ORCID2.OAuth.ClientSecret) &gt; 0 and contains($MCR.ORCID2.OAuth.Scope,'update')">
-          <xsl:call-template name="orcid-status">
-          <xsl:with-param name="mcrid" select="$id"/>
-          </xsl:call-template>
+          <xsl:call-template name="orcid-status"/>
         </xsl:if>
       </div>
 

ubo-common/src/main/resources/xsl/ubo-orcid.xsl

@@ -5,16 +5,27 @@
 
   <xsl:param name="WebApplicationBaseURL"/>
   <xsl:param name="MCR.ORCID2.LinkURL"/>
+  <xsl:param name="current-user" select="document('notnull:user:current')/user"/>
 
   <!-- ========== ORCID status and publish button ========== -->
+  <xsl:variable name="current-user-connection-id" select="$current-user/attributes/attribute[@name='id_connection']/@value"/>
+
   <xsl:template name="orcid-status">
-    <xsl:param name="mcrid" select="ancestor::mycoreobject/@ID"/>
-    <div class="orcid-status" data-id="{$mcrid}"/>
+    <xsl:param name="mycore-id" select="str[@name='id']"/>
+    <xsl:param name="publication-connection-ids" select="arr[@name='nid_connection']/str/text()" />
+
+    <xsl:if test="contains($publication-connection-ids, $current-user-connection-id)">
+      <div class="orcid-status" data-id="{$mycore-id}"/>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template name="orcid-publish">
-    <xsl:param name="mcrid" select="ancestor::mycoreobject/@ID"/>
-    <div class="orcid-publish d-inline" data-id="{$mcrid}"/>
+    <xsl:param name="mycore-id" select="str[@name='id']"/>
+    <xsl:param name="publication-connection-ids" select="arr[@name='nid_connection']/str/text()" />
+
+    <xsl:if test="contains($publication-connection-ids, $current-user-connection-id)">
+      <div class="orcid-publish d-inline" data-id="{$mycore-id}"/>
+    </xsl:if>
   </xsl:template>
 
   <!-- If current user has ORCID, and we are his trusted party, display ORCID icon to indicate that -->
@@ -25,5 +36,4 @@
       </a>
     </xsl:if>
   </xsl:template>
-
 </xsl:stylesheet>