OPAC Browse: Pick up authority links from 650 fields

An earlier commit related to browse functionality extended our MODS32
stylesheet to capture links to authority records, but it failed to do so
for subjects subjects.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/953.data.MODS32-xsl.sql b/Open-ILS/src/sql/Pg/953.data.MODS32-xsl.sql
index d5486c5..64da844 100644 (file)
--- a/Open-ILS/src/sql/Pg/953.data.MODS32-xsl.sql
+++ b/Open-ILS/src/sql/Pg/953.data.MODS32-xsl.sql
@@ -2772,6 +2772,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="personal">
+                               <xsl:call-template name="uri" />
                                <xsl:call-template name="termsOfAddress"></xsl:call-template>
                                <namePart>
                                        <xsl:call-template name="chopPunctuation">
@@ -2793,6 +2794,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="corporate">
+                               <xsl:call-template name="uri" />
                                <xsl:for-each select="marc:subfield[@code='a']">
                                        <namePart>
                                                <xsl:value-of select="."></xsl:value-of>
@@ -2819,6 +2821,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="conference">
+                               <xsl:call-template name="uri" />
                                <namePart>
                                        <xsl:call-template name="subfieldSelect">
                                                <xsl:with-param name="codes">abcdeqnp</xsl:with-param>
@@ -2879,6 +2882,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <topic>
+                               <xsl:call-template name="uri" />
                                <xsl:call-template name="chopPunctuation">
                                        <xsl:with-param name="chopString">
                                                <xsl:call-template name="subfieldSelect">
@@ -2895,6 +2899,7 @@ Added Log Comment
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <xsl:for-each select="marc:subfield[@code='a']">
                                <geographic>
+                                       <xsl:call-template name="uri" />
                                        <xsl:call-template name="chopPunctuation">
                                                <xsl:with-param name="chopString" select="."></xsl:with-param>
                                        </xsl:call-template>
@@ -2907,6 +2912,7 @@ Added Log Comment
                <subject>
                        <xsl:for-each select="marc:subfield[@code='a']">
                                <topic>
+                                       <xsl:call-template name="uri" />
                                        <xsl:value-of select="."></xsl:value-of>
                                </topic>
                        </xsl:for-each>
@@ -2919,8 +2925,8 @@ Added Log Comment
                                        <xsl:value-of select="marc:subfield[@code=2]"></xsl:value-of>
                                </xsl:attribute>
                        </xsl:if>
-                       <xsl:call-template name="uri" />
                        <occupation>
+                               <xsl:call-template name="uri" />
                                <xsl:call-template name="chopPunctuation">
                                        <xsl:with-param name="chopString">
                                                <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>

diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib-auth-browse.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib-auth-browse.sql
index bdd0de5..e0e3a01 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib-auth-browse.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.bib-auth-browse.sql
@@ -3060,6 +3060,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="personal">
+                               <xsl:call-template name="uri" />
                                <xsl:call-template name="termsOfAddress"></xsl:call-template>
                                <namePart>
                                        <xsl:call-template name="chopPunctuation">
@@ -3081,6 +3082,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="corporate">
+                               <xsl:call-template name="uri" />
                                <xsl:for-each select="marc:subfield[@code='a']">
                                        <namePart>
                                                <xsl:value-of select="."></xsl:value-of>
@@ -3107,6 +3109,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="conference">
+                               <xsl:call-template name="uri" />
                                <namePart>
                                        <xsl:call-template name="subfieldSelect">
                                                <xsl:with-param name="codes">abcdeqnp</xsl:with-param>
@@ -3167,6 +3170,7 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <topic>
+                               <xsl:call-template name="uri" />
                                <xsl:call-template name="chopPunctuation">
                                        <xsl:with-param name="chopString">
                                                <xsl:call-template name="subfieldSelect">
@@ -3183,6 +3187,7 @@ Added Log Comment
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <xsl:for-each select="marc:subfield[@code='a']">
                                <geographic>
+                                       <xsl:call-template name="uri" />
                                        <xsl:call-template name="chopPunctuation">
                                                <xsl:with-param name="chopString" select="."></xsl:with-param>
                                        </xsl:call-template>
@@ -3195,6 +3200,7 @@ Added Log Comment
                <subject>
                        <xsl:for-each select="marc:subfield[@code='a']">
                                <topic>
+                                       <xsl:call-template name="uri" />
                                        <xsl:value-of select="."></xsl:value-of>
                                </topic>
                        </xsl:for-each>
@@ -3207,8 +3213,8 @@ Added Log Comment
                                        <xsl:value-of select="marc:subfield[@code=2]"></xsl:value-of>
                                </xsl:attribute>
                        </xsl:if>
-                       <xsl:call-template name="uri" />
                        <occupation>
+                               <xsl:call-template name="uri" />
                                <xsl:call-template name="chopPunctuation">
                                        <xsl:with-param name="chopString">
                                                <xsl:value-of select="marc:subfield[@code='a']"></xsl:value-of>