From c2504d89c04a0b92440398a9ecc0f740bf1d534f Mon Sep 17 00:00:00 2001
From: Shelly Shaver <shelly.shaver@rtspecialty.com>
Date: Tue, 19 Jun 2018 10:06:19 -0400
Subject: [PATCH 1/3] add support for escape-param attr

---
 src/current/c1map/c1nodes.xsl  | 73 ++++++++++++++++++++++++++++--
 src/current/c1map/render.xsl   | 83 ++++++++++++++++++++++++++++++++++
 src/current/c1map/valparse.xsl |  9 +++-
 3 files changed, 159 insertions(+), 6 deletions(-)

diff --git a/src/current/c1map/c1nodes.xsl b/src/current/c1map/c1nodes.xsl
index a712bca1..2fb8fbd3 100644
--- a/src/current/c1map/c1nodes.xsl
+++ b/src/current/c1map/c1nodes.xsl
@@ -39,18 +39,43 @@
   form:
     '>Name' => array( <recurse> )
 -->
+<!--
+<xsl:template match="c1:*[
+                       node()
+                       or ( @* and not( count( @* ) = count( @lvm:* )))]" priority="5">
+<xsl:template match="c1:*[(*) or ( @* and not( count( @* ) = count( @lvm:* )))]" priority="5">
+-->
 <xsl:template match="c1:*[*|@*]" priority="5">
   <!-- make the output a little bit sane -->
   <xsl:value-of select="$lvmp:nl" />
 
   <!-- defer node rendering; allows us to easily determine if there are
        siblings of the same name within a node boundary -->
-  <lvmp:node name="{name()}" />
+  <lvmp:node name="{name()}"/>
+<!--
+  <xsl:if test="not(@lvm:escape-param)">
+    <lvmp:node name="{name()}"/>
+  </xsl:if>
+  <xsl:if test="@lvm:escape-param">
+    <lvmp:node name="{name()}" escape-param="{@lvm:escape-param}"/>
+  </xsl:if>
+-->
   <xsl:text> => </xsl:text>
 
-  <lvmp:node-boundary>
-    <xsl:apply-templates select="." mode="lvmp:c1-node-result" />
-  </lvmp:node-boundary>
+<!--
+  <xsl:if test="not(@lvm:escape-param)">
+      <lvmp:node-boundary>
+        <xsl:apply-templates select="." mode="lvmp:c1-node-result" />
+      </lvmp:node-boundary>
+  </xsl:if>
+  <xsl:if test="@lvm:escape-param)">
+-->
+      <lvmp:node-boundary escape-param="{@lvm:escape-param}">
+        <xsl:apply-templates select="." mode="lvmp:c1-node-result" />
+      </lvmp:node-boundary>
+<!--
+  </xsl:if>
+-->
 </xsl:template>
 
 
@@ -61,6 +86,11 @@
 <xsl:template match="c1:*" mode="lvmp:c1-node-result" priority="1">
   <xsl:text>array( </xsl:text>
     <xsl:apply-templates select="@*|*" />
+    <xsl:if test="text() != '' and not(.[*])">
+        <xsl:text>'text()' => </xsl:text>
+        <xsl:apply-templates select="text()" mode="lvm:valparse" />
+        <xsl:text></xsl:text>
+    </xsl:if>
   <xsl:text>) </xsl:text>
 </xsl:template>
 
@@ -72,11 +102,22 @@
 <xsl:template match="c1:*[text()]" priority="4">
   <!-- defer node rendering; allows us to easily determine if there are
        siblings of the same name within a node boundary -->
-  <lvmp:node name="{name()}" />
+<!--
+-->
+<xsl:message select="'text-only node:'"/>
+<xsl:message select="."/>
+  <lvmp:node name="{name()}" escape-param="{@lvm:escape-param}"/>
   <xsl:text> => </xsl:text>
 
   <xsl:text></xsl:text>
     <!-- TODO: escape single quotes -->
+<!--
+<xsl:message select="'{{{'"/>
+<xsl:message>
+  <xsl:apply-templates select="text()" mode="lvm:valparse"/>
+</xsl:message>
+<xsl:message select="'}}}'"/>
+-->
     <xsl:apply-templates select="text()" mode="lvm:valparse" />
   <xsl:text>, </xsl:text>
 </xsl:template>
@@ -105,9 +146,31 @@
 </xsl:template>
 
 
+
 <xsl:template match="c1:*/@lvm:*" priority="6">
   <!-- discard all system attributes -->
+  <xsl:message select="'\ndiscarding:'"/>
+  <xsl:message select="."/>
   <!-- TODO: error once everything is properly implemented -->
+<!--
+  <xsl:text>'</xsl:text><xsl:value-of select="name()" />
+  <xsl:text>' => '[BLORT</xsl:text>
+  <xsl:apply-templates select="." mode="lvm:valparse"/>
+  <xsl:text>BLORT]' </xsl:text>
+-->
 </xsl:template>
 
+
+<!--
+<xsl:template match="c1:*[text()][ @lvm:escape-param ]" priority="7">
+  <lvmp:node name="{name()}" />
+  <xsl:text> => </xsl:text>
+
+  <xsl:text></xsl:text>
+    <xsl:apply-templates select="text()" mode="lvm:valparse" />
+  <xsl:text>, BLORT</xsl:text>
+
+</xsl:template>
+-->
+
 </xsl:stylesheet>
diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index 2e8046c1..01de88d9 100644
--- a/src/current/c1map/render.xsl
+++ b/src/current/c1map/render.xsl
@@ -133,6 +133,11 @@
   <xsl:param name="value" select="$var/@value" />
   <xsl:param name="default" select="$var/lvmp:default" />
 
+  <xsl:param name="escape-param" select="ancestor-or-self::*[@escape-param][ 1 ]/@escape-param" />
+  <xsl:param name="parent-value" select="parent::lvmp:value[1]"/>
+  <xsl:if test="$escape-param and $escape-param != '' and not($parent-value)">
+      <xsl:text>$contract-&gt;escapeValue(</xsl:text>
+  </xsl:if>
   <xsl:text>$contract-&gt;getValueByContext( </xsl:text>
     <!-- recursive process contexts -->
     <xsl:apply-templates select="lvmp:value" mode="lvmp:render">
@@ -145,6 +150,9 @@
   <xsl:text>' </xsl:text>
 
   <xsl:text> )</xsl:text>
+  <xsl:if test="$escape-param and $escape-param != '' and not($parent-value)">
+      <xsl:text> )</xsl:text>
+  </xsl:if>
 </xsl:template>
 
 
@@ -177,11 +185,82 @@
     </xsl:choose>
   </xsl:param>
 
+
+  <!--<xsl:param name="escape-param" select="$scope/lvmp:var-escape[ @escape-param ]" />-->
+  <xsl:param name="escape-param" select="ancestor-or-self::*[@escape-param][ 1 ]/@escape-param" />
+  <xsl:param name="parent-value" select="parent::lvmp:value[1]"/>
+  <!--
+  <xsl:message select="'====================='" />
+  <xsl:message select="$var/@name" />
+  <xsl:message select="ancestor-or-self::*[@escape-param]"/>
+  <xsl:message select="ancestor-or-self::*"/>
+  <xsl:message select="'\\\'"/>
+  <xsl:message select="$escape-param" />
+  <xsl:message select="'\\\\\\\\\\\\\\\\\\\\'"/>
+  -->
+<!--
+  <xsl:message select="parent::*/preceding-sibling::*"/>
+  <xsl:message select="'\\\\\\\\\\\\\\\\\\\\'"/>
+  <xsl:message select="parent::*"/>
+  <xsl:param name="escape-param" select="ancestor-or-self::*[ @escape-param ][ 1 ]" />
+  <xsl:message select="'====================='" />
+  <xsl:message select="ancestor-or-self::*" />
+  <xsl:text>*****</xsl:text>
+  <xsl:choose>
+    <xsl:when test="$escape-param">
+      <xsl:text>$contract-&gt;escapeValue( $contract-&gt;getValue( '</xsl:text>
+      <xsl:value-of select="$from" />
+      <xsl:text>', $contract->getValueIndex( '</xsl:text>
+      <xsl:value-of select="$index-name" />
+      <xsl:text>' ) )</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>$contract-&gt;getValue( '</xsl:text>
+      <xsl:value-of select="$from" />
+      <xsl:text>', $contract->getValueIndex( '</xsl:text>
+      <xsl:value-of select="$index-name" />
+      <xsl:text>' )</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+
+  <xsl:message select="'======================'" />
+  <xsl:text>ooooooooooooo:</xsl:text>
+
+  <xsl:message select="$scope" />
+<xsl:message select="'==========================='"/>
+<xsl:message select="$scope"/>
+
   <xsl:text>$contract-&gt;getValue( '</xsl:text>
     <xsl:value-of select="$from" />
   <xsl:text>', $contract->getValueIndex( '</xsl:text>
     <xsl:value-of select="$index-name" />
   <xsl:text>' )</xsl:text>
+-->
+<!--
+<xsl:message>===========</xsl:message>
+<xsl:message select=".[1]"/>
+<xsl:message select="$escape-param"/>
+<xsl:message select="parent::lvmp:value[1]"/>
+<xsl:message>===========</xsl:message>
+-->
+  <xsl:choose>
+    <xsl:when test="$escape-param and $escape-param != '' and not($parent-value)">
+<xsl:message select="'(escaping)'"/>
+      <xsl:text>$contract-&gt;escapeValue( $contract-&gt;getValue( '</xsl:text>
+      <xsl:value-of select="$from" />
+      <xsl:text>', $contract->getValueIndex( '</xsl:text>
+      <xsl:value-of select="$index-name" />
+      <xsl:text>' ) )</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+<xsl:message select="'(not escaping)'"/>
+      <xsl:text>$contract-&gt;getValue( '</xsl:text>
+      <xsl:value-of select="$from" />
+      <xsl:text>', $contract->getValueIndex( '</xsl:text>
+      <xsl:value-of select="$index-name" />
+      <xsl:text>' )</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
 
   <xsl:if test="$default">
     <xsl:text>, </xsl:text>
@@ -241,6 +320,10 @@
   <!-- no longer needed -->
 </xsl:template>
 
+<xsl:template match="lvmp:var-escape" mode="lvmp:render" priority="5">
+  <!-- no longer needed -->
+</xsl:template>
+
 <xsl:template match="lvmp:var/lvmp:default" mode="lvmp:render" priority="5">
   <!-- render contents -->
   <xsl:apply-templates mode="lvmp:render" />
diff --git a/src/current/c1map/valparse.xsl b/src/current/c1map/valparse.xsl
index e84b25dc..e06de78b 100644
--- a/src/current/c1map/valparse.xsl
+++ b/src/current/c1map/valparse.xsl
@@ -36,7 +36,6 @@
   </xsl:call-template>
 </xsl:template>
 
-
 <xsl:template name="lvm:valparse">
   <xsl:param name="str" />
 
@@ -143,6 +142,14 @@
           ) )
         " />
 
+
+      <!--
+      <xsl:message select="$name,parent::c1:*" />
+      -->
+
+      <!--
+      <xsl:variable name="escape-param" select="ancestor::" />
+      -->
       <lvmp:value ref="{$rightmost}" index-key="{$context}">
         <xsl:call-template name="lvmp:gen-val">
           <xsl:with-param name="name" select="$context" />

From 5cbffa9c1098e6eb358c5376b62ad2ae17e31d2f Mon Sep 17 00:00:00 2001
From: Greg Torbenson <gregory.torbenson@ryansg.com>
Date: Fri, 29 Jun 2018 16:04:24 -0400
Subject: [PATCH 2/3] remove debug code

---
 src/current/c1map/c1nodes.xsl  | 65 +++-------------------------------
 src/current/c1map/render.xsl   | 58 ------------------------------
 src/current/c1map/valparse.xsl |  9 +----
 3 files changed, 5 insertions(+), 127 deletions(-)

diff --git a/src/current/c1map/c1nodes.xsl b/src/current/c1map/c1nodes.xsl
index 2fb8fbd3..02c287cb 100644
--- a/src/current/c1map/c1nodes.xsl
+++ b/src/current/c1map/c1nodes.xsl
@@ -39,43 +39,18 @@
   form:
     '>Name' => array( <recurse> )
 -->
-<!--
-<xsl:template match="c1:*[
-                       node()
-                       or ( @* and not( count( @* ) = count( @lvm:* )))]" priority="5">
-<xsl:template match="c1:*[(*) or ( @* and not( count( @* ) = count( @lvm:* )))]" priority="5">
--->
 <xsl:template match="c1:*[*|@*]" priority="5">
   <!-- make the output a little bit sane -->
   <xsl:value-of select="$lvmp:nl" />
 
   <!-- defer node rendering; allows us to easily determine if there are
        siblings of the same name within a node boundary -->
-  <lvmp:node name="{name()}"/>
-<!--
-  <xsl:if test="not(@lvm:escape-param)">
-    <lvmp:node name="{name()}"/>
-  </xsl:if>
-  <xsl:if test="@lvm:escape-param">
-    <lvmp:node name="{name()}" escape-param="{@lvm:escape-param}"/>
-  </xsl:if>
--->
+  <lvmp:node name="{name()}" />
   <xsl:text> => </xsl:text>
 
-<!--
-  <xsl:if test="not(@lvm:escape-param)">
-      <lvmp:node-boundary>
-        <xsl:apply-templates select="." mode="lvmp:c1-node-result" />
-      </lvmp:node-boundary>
-  </xsl:if>
-  <xsl:if test="@lvm:escape-param)">
--->
-      <lvmp:node-boundary escape-param="{@lvm:escape-param}">
-        <xsl:apply-templates select="." mode="lvmp:c1-node-result" />
-      </lvmp:node-boundary>
-<!--
-  </xsl:if>
--->
+  <lvmp:node-boundary escape-param="{@lvm:escape-param}">
+    <xsl:apply-templates select="." mode="lvmp:c1-node-result" />
+  </lvmp:node-boundary>
 </xsl:template>
 
 
@@ -102,22 +77,11 @@
 <xsl:template match="c1:*[text()]" priority="4">
   <!-- defer node rendering; allows us to easily determine if there are
        siblings of the same name within a node boundary -->
-<!--
--->
-<xsl:message select="'text-only node:'"/>
-<xsl:message select="."/>
   <lvmp:node name="{name()}" escape-param="{@lvm:escape-param}"/>
   <xsl:text> => </xsl:text>
 
   <xsl:text></xsl:text>
     <!-- TODO: escape single quotes -->
-<!--
-<xsl:message select="'{{{'"/>
-<xsl:message>
-  <xsl:apply-templates select="text()" mode="lvm:valparse"/>
-</xsl:message>
-<xsl:message select="'}}}'"/>
--->
     <xsl:apply-templates select="text()" mode="lvm:valparse" />
   <xsl:text>, </xsl:text>
 </xsl:template>
@@ -149,28 +113,7 @@
 
 <xsl:template match="c1:*/@lvm:*" priority="6">
   <!-- discard all system attributes -->
-  <xsl:message select="'\ndiscarding:'"/>
-  <xsl:message select="."/>
   <!-- TODO: error once everything is properly implemented -->
-<!--
-  <xsl:text>'</xsl:text><xsl:value-of select="name()" />
-  <xsl:text>' => '[BLORT</xsl:text>
-  <xsl:apply-templates select="." mode="lvm:valparse"/>
-  <xsl:text>BLORT]' </xsl:text>
--->
 </xsl:template>
 
-
-<!--
-<xsl:template match="c1:*[text()][ @lvm:escape-param ]" priority="7">
-  <lvmp:node name="{name()}" />
-  <xsl:text> => </xsl:text>
-
-  <xsl:text></xsl:text>
-    <xsl:apply-templates select="text()" mode="lvm:valparse" />
-  <xsl:text>, BLORT</xsl:text>
-
-</xsl:template>
--->
-
 </xsl:stylesheet>
diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index 01de88d9..cbce1345 100644
--- a/src/current/c1map/render.xsl
+++ b/src/current/c1map/render.xsl
@@ -185,67 +185,10 @@
     </xsl:choose>
   </xsl:param>
 
-
-  <!--<xsl:param name="escape-param" select="$scope/lvmp:var-escape[ @escape-param ]" />-->
   <xsl:param name="escape-param" select="ancestor-or-self::*[@escape-param][ 1 ]/@escape-param" />
   <xsl:param name="parent-value" select="parent::lvmp:value[1]"/>
-  <!--
-  <xsl:message select="'====================='" />
-  <xsl:message select="$var/@name" />
-  <xsl:message select="ancestor-or-self::*[@escape-param]"/>
-  <xsl:message select="ancestor-or-self::*"/>
-  <xsl:message select="'\\\'"/>
-  <xsl:message select="$escape-param" />
-  <xsl:message select="'\\\\\\\\\\\\\\\\\\\\'"/>
-  -->
-<!--
-  <xsl:message select="parent::*/preceding-sibling::*"/>
-  <xsl:message select="'\\\\\\\\\\\\\\\\\\\\'"/>
-  <xsl:message select="parent::*"/>
-  <xsl:param name="escape-param" select="ancestor-or-self::*[ @escape-param ][ 1 ]" />
-  <xsl:message select="'====================='" />
-  <xsl:message select="ancestor-or-self::*" />
-  <xsl:text>*****</xsl:text>
-  <xsl:choose>
-    <xsl:when test="$escape-param">
-      <xsl:text>$contract-&gt;escapeValue( $contract-&gt;getValue( '</xsl:text>
-      <xsl:value-of select="$from" />
-      <xsl:text>', $contract->getValueIndex( '</xsl:text>
-      <xsl:value-of select="$index-name" />
-      <xsl:text>' ) )</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>$contract-&gt;getValue( '</xsl:text>
-      <xsl:value-of select="$from" />
-      <xsl:text>', $contract->getValueIndex( '</xsl:text>
-      <xsl:value-of select="$index-name" />
-      <xsl:text>' )</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:message select="'======================'" />
-  <xsl:text>ooooooooooooo:</xsl:text>
-
-  <xsl:message select="$scope" />
-<xsl:message select="'==========================='"/>
-<xsl:message select="$scope"/>
-
-  <xsl:text>$contract-&gt;getValue( '</xsl:text>
-    <xsl:value-of select="$from" />
-  <xsl:text>', $contract->getValueIndex( '</xsl:text>
-    <xsl:value-of select="$index-name" />
-  <xsl:text>' )</xsl:text>
--->
-<!--
-<xsl:message>===========</xsl:message>
-<xsl:message select=".[1]"/>
-<xsl:message select="$escape-param"/>
-<xsl:message select="parent::lvmp:value[1]"/>
-<xsl:message>===========</xsl:message>
--->
   <xsl:choose>
     <xsl:when test="$escape-param and $escape-param != '' and not($parent-value)">
-<xsl:message select="'(escaping)'"/>
       <xsl:text>$contract-&gt;escapeValue( $contract-&gt;getValue( '</xsl:text>
       <xsl:value-of select="$from" />
       <xsl:text>', $contract->getValueIndex( '</xsl:text>
@@ -253,7 +196,6 @@
       <xsl:text>' ) )</xsl:text>
     </xsl:when>
     <xsl:otherwise>
-<xsl:message select="'(not escaping)'"/>
       <xsl:text>$contract-&gt;getValue( '</xsl:text>
       <xsl:value-of select="$from" />
       <xsl:text>', $contract->getValueIndex( '</xsl:text>
diff --git a/src/current/c1map/valparse.xsl b/src/current/c1map/valparse.xsl
index e06de78b..e84b25dc 100644
--- a/src/current/c1map/valparse.xsl
+++ b/src/current/c1map/valparse.xsl
@@ -36,6 +36,7 @@
   </xsl:call-template>
 </xsl:template>
 
+
 <xsl:template name="lvm:valparse">
   <xsl:param name="str" />
 
@@ -142,14 +143,6 @@
           ) )
         " />
 
-
-      <!--
-      <xsl:message select="$name,parent::c1:*" />
-      -->
-
-      <!--
-      <xsl:variable name="escape-param" select="ancestor::" />
-      -->
       <lvmp:value ref="{$rightmost}" index-key="{$context}">
         <xsl:call-template name="lvmp:gen-val">
           <xsl:with-param name="name" select="$context" />

From 84f9321a4d4bc0ee476ca729de362db1f655e61e Mon Sep 17 00:00:00 2001
From: Greg Torbenson <gregory.torbenson@ryansg.com>
Date: Mon, 2 Jul 2018 10:27:53 -0400
Subject: [PATCH 3/3] [DEV-3251] factor escape check out to a function, and
 also fix a bug.

---
 src/current/c1map/c1nodes.xsl |  2 +-
 src/current/c1map/render.xsl  | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/current/c1map/c1nodes.xsl b/src/current/c1map/c1nodes.xsl
index 02c287cb..23dfafcc 100644
--- a/src/current/c1map/c1nodes.xsl
+++ b/src/current/c1map/c1nodes.xsl
@@ -61,7 +61,7 @@
 <xsl:template match="c1:*" mode="lvmp:c1-node-result" priority="1">
   <xsl:text>array( </xsl:text>
     <xsl:apply-templates select="@*|*" />
-    <xsl:if test="text() != '' and not(.[*])">
+    <xsl:if test="text() and not( element() )">
         <xsl:text>'text()' => </xsl:text>
         <xsl:apply-templates select="text()" mode="lvm:valparse" />
         <xsl:text></xsl:text>
diff --git a/src/current/c1map/render.xsl b/src/current/c1map/render.xsl
index cbce1345..7675621d 100644
--- a/src/current/c1map/render.xsl
+++ b/src/current/c1map/render.xsl
@@ -22,6 +22,7 @@
 -->
 <xsl:stylesheet version="2.0"
   xmlns:c1="http://www.epic-premier.com/XMLSchema"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:lvm="http://www.lovullo.com/rater/map/c1"
   xmlns:lvmp="http://www.lovullo.com/rater/map/c1/pp">
@@ -29,6 +30,16 @@
 
 <xsl:import href="transform.xsl" />
 
+<xsl:function name="lvm:is-escaped-param" as="xs:boolean">
+    <xsl:param name="value" as="element( lvmp:value )"/>
+
+    <xsl:variable name="escape-param" as="xs:string?"
+                  select="$value/ancestor-or-self::lvmp:node-boundary[1]/@escape-param[ 1 ]" />
+    <xsl:variable name="parent-value" as="element( lvmp:value )?"
+                  select="$value/parent::lvmp:value[ 1 ]"/>
+
+    <xsl:sequence select="$escape-param and boolean($escape-param) and not( $parent-value )" />
+</xsl:function>
 
 <xsl:template match="lvmp:root" mode="lvmp:render" priority="5">
   <xsl:text>&lt;?php </xsl:text>
@@ -133,9 +144,8 @@
   <xsl:param name="value" select="$var/@value" />
   <xsl:param name="default" select="$var/lvmp:default" />
 
-  <xsl:param name="escape-param" select="ancestor-or-self::*[@escape-param][ 1 ]/@escape-param" />
-  <xsl:param name="parent-value" select="parent::lvmp:value[1]"/>
-  <xsl:if test="$escape-param and $escape-param != '' and not($parent-value)">
+  <xsl:variable name="needs-escape" as="xs:boolean" select="lvm:is-escaped-param( . )"/>
+  <xsl:if test="$needs-escape">
       <xsl:text>$contract-&gt;escapeValue(</xsl:text>
   </xsl:if>
   <xsl:text>$contract-&gt;getValueByContext( </xsl:text>
@@ -150,7 +160,7 @@
   <xsl:text>' </xsl:text>
 
   <xsl:text> )</xsl:text>
-  <xsl:if test="$escape-param and $escape-param != '' and not($parent-value)">
+  <xsl:if test="$needs-escape">
       <xsl:text> )</xsl:text>
   </xsl:if>
 </xsl:template>
@@ -185,10 +195,9 @@
     </xsl:choose>
   </xsl:param>
 
-  <xsl:param name="escape-param" select="ancestor-or-self::*[@escape-param][ 1 ]/@escape-param" />
-  <xsl:param name="parent-value" select="parent::lvmp:value[1]"/>
+  <xsl:variable name="needs-escape" as="xs:boolean" select="lvm:is-escaped-param( . )"/>
   <xsl:choose>
-    <xsl:when test="$escape-param and $escape-param != '' and not($parent-value)">
+    <xsl:when test="$needs-escape">
       <xsl:text>$contract-&gt;escapeValue( $contract-&gt;getValue( '</xsl:text>
       <xsl:value-of select="$from" />
       <xsl:text>', $contract->getValueIndex( '</xsl:text>