From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sat, 9 Mar 2019 23:22:47 +0000 (+0000)
Subject: lib/xslt/xml2txt.xslt
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=04bd84b7a29afbf163c6bb103c6cef2d111f1c0f;p=nb.git

lib/xslt/xml2txt.xslt
---

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index d34b3e76..4cf13d56 100755
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -780,11 +780,11 @@ html2pdf() {
 }
 
 xml2txt() {
-	xsltproc $NB_ROOT/lib/xslt/xml2txt.xslt $@
+	xsltproc $NB_ROOT/lib/xslt/xml2txt.xslt ${@:--}
 }
 
 xml2csv() {
-	xsltproc $NB_ROOT/lib/xslt/xml2csv.xslt $@
+	xsltproc $NB_ROOT/lib/xslt/xml2csv.xslt ${@:--}
 }
 
 cron_d_install() {
diff --git a/lib/xslt/xml2txt.xslt b/lib/xslt/xml2txt.xslt
index f8f5fce6..ecd9522c 100644
--- a/lib/xslt/xml2txt.xslt
+++ b/lib/xslt/xml2txt.xslt
@@ -3,7 +3,8 @@
 
   <xsl:param name="break" select="'&#xA;'" />
   <xsl:param name="quote" select="''" />
-  <xsl:param name="delim" select="'&#009;'" />
+  <xsl:param name="delim" select="'&#xA;'" />
+  <xsl:param name="delim-key" select="'&#009;'" />
 
   <xsl:template match="/">
     <xsl:apply-templates select="/*/*" />
@@ -11,14 +12,17 @@
 
   <xsl:template match="/*/*">
     <xsl:apply-templates />
+    <xsl:if test="following-sibling::*">
+      <xsl:value-of select="$break" />
+    </xsl:if>
   </xsl:template>
 
   <xsl:template match="*">
     <!-- remove normalize-space() if you want keep white-space at it is --> 
     <xsl:value-of select="concat($quote, name(), $quote)" />
-    <xsl:value-of select="$delim" />
+    <xsl:value-of select="$delim-key" />
     <xsl:value-of select="concat($quote, normalize-space(), $quote)" />
-    <xsl:value-of select="$break" />
+    <xsl:value-of select="$delim" />
   </xsl:template>
 
   <xsl:template match="text()" />