Improve handling of subjects which start with '&#1;' etc

Jmcleodfoss · Jun 20, 2020 · 159196d · 159196d
1 parent f1748f3
commit 159196d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/extras/make_contacts_xslt.sh b/extras/make_contacts_xslt.sh
@@ -26,7 +26,10 @@ cat << END_HEADER > "$outfile"
 
 	<xsl:template match="//folder/object[MessageClassW = '$message_class']">
 		<h2>
-			<xsl:if test="$entry_title"><xsl:value-of select="substring-after(./$entry_title,'&amp;#01;&amp;#01;')"/></xsl:if>
+			<xsl:if test="$entry_title">
+				<xsl:if test="starts-with(./$entry_title,'&amp;#01;&amp;#01;')"><xsl:value-of select="substring-after(./$entry_title,'&amp;#01;&amp;#01;')"/></xsl:if>
+				<xsl:if test="not(starts-with(./$entry_title,'&amp;'))"><xsl:value-of select="$entry_title"/></xsl:if>
+			</xsl:if>
 		</h2>
 		<ul>
 		<xsl:for-each select="./*">

diff --git a/extras/make_tasks_xslt.sh b/extras/make_tasks_xslt.sh
@@ -26,7 +26,10 @@ cat << END_HEADER > "$outfile"
 
 	<xsl:template match="//folder/object[MessageClassW = '$message_class']">
 		<h2>
-			<xsl:if test="$entry_title"><xsl:value-of select="substring-after(./$entry_title,'&amp;#01;&amp;#01;')"/></xsl:if>
+			<xsl:if test="$entry_title">
+				<xsl:if test="starts-with(./$entry_title,'&amp;#01;&amp;#01;')"><xsl:value-of select="substring-after(./$entry_title,'&amp;#01;&amp;#01;')"/></xsl:if>
+				<xsl:if test="not(starts-with(./$entry_title,'&amp;'))"><xsl:value-of select="$entry_title"/></xsl:if>
+			</xsl:if>
 		</h2>
 		<ul>
 		<xsl:for-each select="./*">