From 85eace857979632bf1ab82a20f0e49f99b6fb19c Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Fri, 7 Apr 2006 14:54:23 +0000
Subject: [PATCH] Simplified XPath check for refentry "source" metadata.

---
 xsl/common/refentry.xsl                     | 13 ++++---------
 xsl/params/refentry.source.name.profile.xml |  5 ++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/xsl/common/refentry.xsl b/xsl/common/refentry.xsl
index 7301eb8e0..4862bb573 100644
--- a/xsl/common/refentry.xsl
+++ b/xsl/common/refentry.xsl
@@ -574,11 +574,6 @@
                   select="(($info[//productname])[last()]/productname)[1]"
                   mode="get.refentry.metadata"/>
             </xsl:when>
-            <xsl:when test="$info//orgname">
-              <xsl:apply-templates
-                  select="(($info[//orgname])[last()]/orgname)[1]"
-                  mode="get.refentry.metadata"/>
-            </xsl:when>
             <xsl:when test="$info//corpname">
               <xsl:apply-templates
                   select="(($info[//corpname])[last()]/corpname)[1]"
@@ -594,14 +589,14 @@
                   select="(($info[//corpauthor])[last()]/corpauthor)[1]"
                   mode="get.refentry.metadata"/>
             </xsl:when>
-            <xsl:when test="$info//author/orgname">
+            <xsl:when test="$info//orgname">
               <xsl:apply-templates
-                  select="(($info[//author/orgname])[last()]/author/orgname)[1]"
+                  select="(($info[//orgname])[last()]/orgname)[1]"
                   mode="get.refentry.metadata"/>
             </xsl:when>
-            <xsl:when test="$info//author/publishername">
+            <xsl:when test="$info//publishername">
               <xsl:apply-templates
-                  select="(($info[//author/publishername])[last()]/author/publishername)[1]"
+                  select="(($info[//publishername])[last()]/publishername)[1]"
                   mode="get.refentry.metadata"/>
             </xsl:when>
             <xsl:otherwise>
diff --git a/xsl/params/refentry.source.name.profile.xml b/xsl/params/refentry.source.name.profile.xml
index df6715c4c..22319d44b 100644
--- a/xsl/params/refentry.source.name.profile.xml
+++ b/xsl/params/refentry.source.name.profile.xml
@@ -12,12 +12,11 @@
 <src:fragment id='refentry.source.name.profile.frag'>
 <xsl:param name="refentry.source.name.profile">
   (($info[//productname])[last()]/productname)[1]|
-  (($info[//orgname])[last()]/orgname)[1]|
   (($info[//corpname])[last()]/corpname)[1]|
   (($info[//corpcredit])[last()]/corpcredit)[1]|
   (($info[//corpauthor])[last()]/corpauthor)[1]|
-  (($info[//author/orgname])[last()]/author/orgname)[1]|
-  (($info[//author/publishername])[last()]/author/publishername)[1]
+  (($info[//orgname])[last()]/orgname)[1]|
+  (($info[//publishername])[last()]/publishername)[1]
 </xsl:param>
 </src:fragment>
 </refsynopsisdiv>
-- 
2.40.0