dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4589
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: dhis2
timestamp: Thu 2011-09-15 10:10:05 +0100
message:
  [mydatamart] Fixed bug: tick marks in group names were not being properly encoded causing trouble on metadata import.
modified:
  tools/datamart/mydatamart.vfs/resource/xslt/dataelement.xsl
  tools/datamart/mydatamart.vfs/resource/xslt/indicator.xsl
  tools/datamart/mydatamart.vfs/resource/xslt/orgunit.xsl


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'tools/datamart/mydatamart.vfs/resource/xslt/dataelement.xsl'
--- tools/datamart/mydatamart.vfs/resource/xslt/dataelement.xsl	2011-08-02 19:21:56 +0000
+++ tools/datamart/mydatamart.vfs/resource/xslt/dataelement.xsl	2011-09-15 09:10:05 +0000
@@ -65,7 +65,7 @@
                 <!-- [1] ensures that only the first is returned if there are multiple nodes matching -->
                 <xsl:variable name="group" select="set:intersection($degroups,$groupsetgroups)[1]"/>
                 <xsl:choose>
-                    <xsl:when test="count($group)=1">'<xsl:value-of select="$group/dxf:name"/>',</xsl:when>
+                    <xsl:when test="count($group)=1">'<xsl:value-of select="dhis:dbescape($group/dxf:name)"/>',</xsl:when>
                     <xsl:otherwise>NULL,</xsl:otherwise>
                 </xsl:choose>
             </xsl:for-each>

=== modified file 'tools/datamart/mydatamart.vfs/resource/xslt/indicator.xsl'
--- tools/datamart/mydatamart.vfs/resource/xslt/indicator.xsl	2011-08-02 19:21:56 +0000
+++ tools/datamart/mydatamart.vfs/resource/xslt/indicator.xsl	2011-09-15 09:10:05 +0000
@@ -67,7 +67,7 @@
                 <!-- [1] ensures that only the first is returned if there are multiple nodes matching -->
                 <xsl:variable name="group" select="set:intersection($indgroups,$groupsetgroups)[1]"/>
                 <xsl:choose>
-                    <xsl:when test="count($group)=1">'<xsl:value-of select="$group/dxf:name"/>',</xsl:when>
+                    <xsl:when test="count($group)=1">'<xsl:value-of select="dhis:dbescape($group/dxf:name)"/>',</xsl:when>
                     <xsl:otherwise>NULL,</xsl:otherwise>
                 </xsl:choose>
             </xsl:for-each>

=== modified file 'tools/datamart/mydatamart.vfs/resource/xslt/orgunit.xsl'
--- tools/datamart/mydatamart.vfs/resource/xslt/orgunit.xsl	2011-08-02 19:21:56 +0000
+++ tools/datamart/mydatamart.vfs/resource/xslt/orgunit.xsl	2011-09-15 09:10:05 +0000
@@ -109,7 +109,7 @@
             <!-- [1] ensures that only the first is returned if there are multiple nodes matching -->
             <xsl:variable name="group" select="set:intersection($ougroups,$groupsetgroups)[1]"/>
             <xsl:choose>
-                <xsl:when test="count($group)=1">'<xsl:value-of select="$group/dxf:name"/>',</xsl:when>
+                <xsl:when test="count($group)=1">'<xsl:value-of select="dhis:dbescape($group/dxf:name)"/>',</xsl:when>
                 <xsl:otherwise>NULL,</xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>