Fix #4118: populate PDF from template with phone number

orbeon · Jul 4, 2019 · 4a1e543 · 4a1e543
1 parent e5a22fb
commit 4a1e543
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/form-runner/jvm/src/main/resources/apps/fr/print/print-pdf-template.xsl b/form-runner/jvm/src/main/resources/apps/fr/print/print-pdf-template.xsl
@@ -167,8 +167,11 @@
                                     $type
                                 )"/>
 
+                        <xsl:message select="concat('XXX component-name ', $component-name)"/>
                         <xsl:if test="$expression">
                             <xsl:variable name="value" select="$control/saxon:evaluate($expression)"/>
+                            <xsl:message select="concat('XXX expression ', $expression)"/>
+                            <xsl:message select="concat('XXX value ', $value)"/>
                             <xsl:if test="$value">
                                 <xsl:choose>
                                     <xsl:when test="$classes = $image-attachment-classes">

diff --git a/form-runner/jvm/src/main/resources/xbl/orbeon/us-phone/us-phone.xbl b/form-runner/jvm/src/main/resources/xbl/orbeon/us-phone/us-phone.xbl
@@ -20,7 +20,7 @@
          xmlns:xxbl="http://orbeon.org/oxf/xml/xbl">
 
     <xbl:binding
-        id="fr-phone-binding"
+        id="fr-us-phone"
         element="fr|us-phone"
         xxbl:container="span"
         xxbl:mode="lhha binding value"
@@ -129,9 +129,9 @@
 
         <xbl:template>
             <xf:var name="binding"
-                    value="xxf:binding('fr-phone-binding')"/>
+                    value="xxf:binding('fr-us-phone')"/>
             <xf:var name="view"
-                    value="xxf:is-control-readonly('fr-phone-binding') and property('xxf:readonly-appearance') = 'static'"/>
+                    value="xxf:is-control-readonly('fr-us-phone') and property('xxf:readonly-appearance') = 'static'"/>
 
             <!-- Edit mode -->
             <xf:group ref="$binding[not($view)]">
@@ -144,7 +144,7 @@
                         xbl:attr="navindex navindex=tabindex"
                         ref="."
                         xxf:maxlength="14"
-                        xxf:format="xxf:formatted-value('fr-phone-binding')"
+                        xxf:format="xxf:formatted-value('fr-us-phone')"
                         xxf:unformat="
                             for $t in translate(xxf:trim(), '()*-[].#/'': ', '') return
                                 if (matches($t, '^\d+$')) then
@@ -159,7 +159,7 @@
                 </xh:span>
             </xf:group>
             <!-- View mode -->
-            <xf:input ref="$binding[$view]" xxf:format="xxf:formatted-value('fr-phone-binding')"/>
+            <xf:input ref="$binding[$view]" xxf:format="xxf:formatted-value('fr-us-phone')"/>
         </xbl:template>
     </xbl:binding>
 

diff --git a/src/main/resources/config/properties-internal.xml b/src/main/resources/config/properties-internal.xml
@@ -174,7 +174,7 @@
     <!-- NOTE: In the future we don't want those to apply to XHTML, but to an intermediate representation -->
     <!-- NOTE: Can't use xxf:split() in these expressions yet (saxon:evaluate() doesn't find the functions). -->
     <property as="xs:string"  name="oxf.fr.pdf.format.input-string">
-        .//*[tokenize(@class, '\s+') = 'xforms-input-input']/@value/string()
+        (.//*[tokenize(@class, '\s+') = 'xforms-input']/input)[1]/@value/string()
     </property>
     <property as="xs:string"  name="oxf.fr.pdf.format.input-dateTime">
         string-join(.//*[tokenize(@class, '\s+') = 'xforms-input-input']/@value/string(), ' ')
@@ -235,14 +235,6 @@
             )
     </property>
 
-    <property as="xs:string"  name="oxf.fr.pdf.format.fr-number">
-        .//*[tokenize(@class, '\s+') = 'xforms-input']/input/@value/string()
-    </property>
-
-    <property as="xs:string"  name="oxf.fr.pdf.format.fr-date">
-        .//*[tokenize(@class, '\s+') = 'xforms-input']/input/@value/string()
-    </property>
-
     <property as="xs:string"  name="oxf.fr.pdf.format.fr-autocomplete">
         .//*[tokenize(@class, '\s+') = 'fr-autocomplete-external-value']/input/@value/string()
     </property>
@@ -260,9 +252,10 @@
     <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-attachment.anyURI"              value="attachment-metadata"/>
     <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-image-attachment.anyURI"        value="attachment-url"/>
     <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-wpaint.*"                       value="attachment-url"/>
-    <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-number.*"                       value="fr-number"/>
-    <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-currency.*"                     value="fr-number"/>
-    <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-date.*"                         value="fr-date"/>
+    <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-number.*"                       value="input-string"/>
+    <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-currency.*"                     value="input-string"/>
+    <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-date.*"                         value="input-string"/>
+    <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-us-phone.*"                     value="input-string"/>
     <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-dropdown-select1.*"             value="select-label"/>
     <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-yesno-input.*"                  value="select-value"/>
     <property as="xs:string"  name="oxf.fr.pdf.map.*.*.fr-autocomplete.*"                 value="fr-autocomplete"/>