Following #4117: align xxf:formatted-value() with xxf:value()

orbeon · Aug 21, 2019 · f897a25 · f897a25
1 parent 68cafbd
commit f897a25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/xforms/jvm/src/main/scala/org/orbeon/oxf/xforms/function/xxforms/XXFormsValue.scala b/xforms/jvm/src/main/scala/org/orbeon/oxf/xforms/function/xxforms/XXFormsValue.scala
@@ -17,7 +17,6 @@ import org.orbeon.oxf.xforms.control.XFormsValueControl
 import org.orbeon.oxf.xforms.function.XFormsFunction
 import org.orbeon.saxon.expr.XPathContext
 import org.orbeon.saxon.om.SequenceIterator
-import org.orbeon.saxon.value.StringValue
 import org.orbeon.scaxon.Implicits._
 import shapeless.syntax.typeable._
 
@@ -33,8 +32,10 @@ class XXFormsValue extends XFormsFunction {
 
 class XXFormsFormattedValue extends XFormsFunction {
 
-  override def evaluateItem(xpathContext: XPathContext): StringValue =
-    relevantControl(0)(xpathContext) flatMap (_.narrowTo[XFormsValueControl]) flatMap (_.getFormattedValue)
+  override def iterate(xpathContext: XPathContext): SequenceIterator = {
+    implicit val ctx = xpathContext
+    relevantControls(0, booleanArgument(1, default = true)) flatMap (_.narrowTo[XFormsValueControl]) flatMap (_.getFormattedValue)
+  }
 
   // TODO: PathMap
 }
diff --git a/xforms/jvm/src/main/scala/org/orbeon/oxf/xforms/library/XXFormsEnvFunctions.scala b/xforms/jvm/src/main/scala/org/orbeon/oxf/xforms/library/XXFormsEnvFunctions.scala
@@ -122,7 +122,8 @@ trait XXFormsEnvFunctions extends OrbeonFunctionLibrary {
     )
 
     Fun("formatted-value", classOf[XXFormsFormattedValue], op = 0, min = 1, STRING, ALLOWS_ZERO_OR_MORE,
-      Arg(STRING, EXACTLY_ONE)
+      Arg(STRING, EXACTLY_ONE),
+      Arg(BOOLEAN, EXACTLY_ONE)
     )
 
     Fun("avt-value", classOf[XXFormsAVTValue], op = 0, min = 2, STRING, ALLOWS_ZERO_OR_MORE,