X-Git-Url: https://git.wikimedia.ca/?p=eccc_to_commons.git;a=blobdiff_plain;f=eccc_merger_almanach.xslt;fp=eccc_merger_almanach.xslt;h=a215480011e43f6e10053531b5ff584f51bf4752;hp=010a97f6e87e4c22b941ee10e0b9fbaa84377f66;hb=584d914c39231c6449e2fe226c8c5f01cbe80d30;hpb=698e18778ed5b6cd9f83ab5cfb9b758a05418d34

diff --git a/eccc_merger_almanach.xslt b/eccc_merger_almanach.xslt
index 010a97f..a215480 100644
--- a/eccc_merger_almanach.xslt
+++ b/eccc_merger_almanach.xslt
@@ -186,19 +186,31 @@
 					<xsl:value-of select="format-number(number($input-normal-mean/text() * $input-normal-mean/@values-count + $merge-normal-mean/text()) div number($input-normal-mean/@values-count + 1), '0.0')" />
 				</xsl:copy>
 			</xsl:when>
-			<xsl:when test="$input-normal-mean and (not($merge-normal-mean) or $merge-normal-mean/text() = '')">
+			<xsl:when test="$input-normal-mean != '' and (not($merge-normal-mean) or $merge-normal-mean = '')">
 				<xsl:copy>
 					<xsl:apply-templates select="$input-normal-mean/@*" />
 					<xsl:apply-templates select="$input-normal-mean/node()" />
 				</xsl:copy>
 			</xsl:when>
-			<xsl:when test="not($input-normal-mean) and $merge-normal-mean and $merge-normal-mean/text() != ''">
+			<xsl:when test="(not($input-normal-mean) or $input-normal-mean = '') and $merge-normal-mean and $merge-normal-mean != ''">
 				<xsl:copy>
 					<xsl:apply-templates select="$merge-normal-mean/@*" />
 					<xsl:attribute name="values-count">1</xsl:attribute>
 					<xsl:apply-templates select="$merge-normal-mean/node()" />
 				</xsl:copy>
 			</xsl:when>
+			<xsl:when test="$input-normal-mean = '' and $merge-normal-mean = ''">
+				<xsl:copy>
+					<xsl:apply-templates select="$input-normal-mean/@*" />
+					<xsl:apply-templates select="$input-normal-mean/node()" />
+				</xsl:copy>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:message terminate="no">
+					<xsl:value-of select="concat($month, '-', $day, ' - normalMean: ', $input-normal-mean, ' ', $merge-normal-mean)" />
+				</xsl:message>
+				<xsl:message terminate="yes">Trapping case not supposed to happend.</xsl:message>
+			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>