git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
crawler
/
kiss
/
conf
/
kiss
/
reportToText.xsl
diff --git
a/crawler/kiss/conf/kiss/reportToText.xsl
b/crawler/kiss/conf/kiss/reportToText.xsl
index e46e4328bbe3e10b7575d51ee06373e9d7b4ce32..9d85cfaa57342269eba2366432dce46f2179caf7 100644
(file)
--- a/
crawler/kiss/conf/kiss/reportToText.xsl
+++ b/
crawler/kiss/conf/kiss/reportToText.xsl
@@
-33,6
+33,11
@@
<xsl:value-of select="$newline"/>
<xsl:value-of select="$newline"/>
</xsl:when>
<xsl:value-of select="$newline"/>
<xsl:value-of select="$newline"/>
</xsl:when>
+ <xsl:when test="@result = 'CONFLICT'">
+ <xsl:text>Conflicts with other recorded program</xsl:text>
+ <xsl:value-of select="$newline"/>
+ <xsl:value-of select="$newline"/>
+ </xsl:when>
<xsl:when test="@result='ERROR'">
<xsl:text>Programs that could not be recorded for technical reasons.</xsl:text>
<xsl:value-of select="$newline"/>
<xsl:when test="@result='ERROR'">
<xsl:text>Programs that could not be recorded for technical reasons.</xsl:text>
<xsl:value-of select="$newline"/>