Fix LP1118245, where Name Subject facet shows subfields in order "cad"

and Personal Author shows subfields in order "acd".  This change makes
the Name Subject show the subfields in the same order as in record view
and the Personal Author facet.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>

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 e775b66..f787f2a 100644 (file)
--- a/Open-ILS/src/sql/Pg/953.data.MODS32-xsl.sql
+++ b/Open-ILS/src/sql/Pg/953.data.MODS32-xsl.sql
@@ -2608,7 +2608,6 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="personal">
-                               <xsl:call-template name="termsOfAddress"></xsl:call-template>
                                <namePart>
                                        <xsl:call-template name="chopPunctuation">
                                                <xsl:with-param name="chopString">
@@ -2618,6 +2617,7 @@ Added Log Comment
                                                </xsl:with-param>
                                        </xsl:call-template>
                                </namePart>
+                               <xsl:call-template name="termsOfAddress"></xsl:call-template>
                                <xsl:call-template name="nameDate"></xsl:call-template>
                                <xsl:call-template name="affiliation"></xsl:call-template>
                                <xsl:call-template name="role"></xsl:call-template>

diff --git a/Open-ILS/xsl/MARC21slim2MODS32.xsl b/Open-ILS/xsl/MARC21slim2MODS32.xsl
index 303c378..3302213 100644 (file)
--- a/Open-ILS/xsl/MARC21slim2MODS32.xsl
+++ b/Open-ILS/xsl/MARC21slim2MODS32.xsl
@@ -2608,7 +2608,6 @@ Added Log Comment
                <subject>
                        <xsl:call-template name="subjectAuthority"></xsl:call-template>
                        <name type="personal">
-                               <xsl:call-template name="termsOfAddress"></xsl:call-template>
                                <namePart>
                                        <xsl:call-template name="chopPunctuation">
                                                <xsl:with-param name="chopString">
@@ -2618,6 +2617,7 @@ Added Log Comment
                                                </xsl:with-param>
                                        </xsl:call-template>
                                </namePart>
+                               <xsl:call-template name="termsOfAddress"></xsl:call-template>
                                <xsl:call-template name="nameDate"></xsl:call-template>
                                <xsl:call-template name="affiliation"></xsl:call-template>
                                <xsl:call-template name="role"></xsl:call-template>