stevedlawrence commented on a change in pull request #25: Commits to relicense 
Daffodil to Apache v2
URL: https://github.com/apache/incubator-daffodil/pull/25#discussion_r160298245
 
 

 ##########
 File path: 
daffodil-core/src/main/scala/org/apache/daffodil/dpath/Expression.scala
 ##########
 @@ -1303,13 +1303,22 @@ case class FunctionCallExpression(functionQNameString: 
String, expressions: List
     val FUNC = XMLUtils.XPATH_FUNCTION_NAMESPACE
     val MATH = XMLUtils.XPATH_MATH_NAMESPACE
     val XSD = XMLUtils.XSD_NAMESPACE
-    val DAF = XMLUtils.EXT_NS
+    val DAF_NCSA = XMLUtils.EXT_NS_NCSA
+    val DAF_APACHE = XMLUtils.EXT_NS_APACHE
     val funcObj = (functionQName, expressions) match {
 
-      case (RefQName(_, "trace", DAF), args) =>
+      case (RefQName(_, "trace", DAF_NCSA), args) =>
         DAFTraceExpr(functionQNameString, functionQName, args)
 
-      case (RefQName(_, "error", DAF), args) => {
+      case (RefQName(_, "trace", DAF_APACHE), args) =>
+        DAFTraceExpr(functionQNameString, functionQName, args)
+
+      case (RefQName(_, "error", DAF_NCSA), args) => {
+        SDW("Expression daf:error is deprecated. Use fn:error instead")
+        DAFErrorExpr(functionQNameString, functionQName, args)
+      }
+
+      case (RefQName(_, "error", DAF_APACHE), args) => {
 
 Review comment:
   Actual code change other than package rename.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

Reply via email to