convert xdmp:eval to xdmp:invoke-function

rest-api/ext/processmodel.xqy

@@ -69,7 +69,6 @@ function ext:put(
   let $enable := if (map:get($params,"enable") = "true") then fn:true() else fn:false()
   let $_ := xdmp:log("Enabled? : " || xs:string($enable))
 
-  let $input := xdmp:unquote(xdmp:quote($input))
   let $modelid := wfi:install-and-convert($input,map:get($params,"name"),(map:get($params,"major"),"1")[1],(map:get($params,"minor"),"0")[1], $enable )
 
   let $out := <ext:createResponse><ext:outcome>SUCCESS</ext:outcome><ext:modelId>{$modelid}</ext:modelId></ext:createResponse>

src/app/models/lib-alerts.xqy

@@ -21,42 +21,31 @@ declare function ss:add-alert($shortname as xs:string,$query as schema-element(c
 
 
 declare function ss:do-create-config($shortname as xs:string) as xs:string {
-  xdmp:eval(
-    'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/app/models/lib-alerts.xqy";' ||
-    'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
-    'declare variable $my:shortname as xs:string external;' ||
-    'ah:create-config($my:shortname)',
-    (xs:QName("my:shortname"),$shortname),
+  xdmp:invoke-function(
+    function(){
+      ss:create-config($shortname)
+    }
+    ,
     <options xmlns="xdmp:eval"><isolation>different-transaction</isolation></options>
   )
 };
 
 declare function ss:do-create-rule($alert-name as xs:string,$query as cts:query,$options as element()*) {
-  xdmp:eval(
-    'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/app/models/lib-alerts.xqy";' ||
-    'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
-    'declare variable $my:alert-name as xs:string external;' ||
-    'declare variable $my:query as cts:query external;' ||
-    'declare variable $my:options as element* external;' ||
-    'ah:create-rule($my:alert-name,$my:query,$my:options)',
-    (xs:QName("my:alert-name"),$alert-name,xs:QName("my:query"),$query,xs:QName("my:options"),$options),
+  xdmp:invoke-function(
+    function(){
+      ss:create-rule($alert-name, $query, $options)
+    }
+    ,
     <options xmlns="xdmp:eval"><isolation>different-transaction</isolation></options>
   )
 };
 
 declare function ss:do-create-action($alert-name as xs:string,$alert-module as xs:string,$db as xs:unsignedLong,$options as element()*) {
-  xdmp:eval(
-    'xquery version "1.0-ml"; declare namespace my="http://marklogic.com/alerts"; ' ||
-    'import module namespace ah = "http://marklogic.com/alerts/alerts" at "/app/models/lib-alerts.xqy";' ||
-    'import module namespace alert="http://marklogic.com/xdmp/alert" at "/MarkLogic/alert.xqy";' ||
-    'declare variable $my:alert-name as xs:string external;' ||
-    'declare variable $my:alert-module as xs:string external;' ||
-    'declare variable $my:db as xs:unsignedLong external;' ||
-    'declare variable $my:options as element* external;' ||
-    'ah:create-action($my:alert-name,$my:alert-module,$my:db,$my:options)',
-    (xs:QName("my:alert-name"),$alert-name,xs:QName("my:alert-module"),$alert-module,xs:QName("my:db"),$db,xs:QName("my:options"),$options),
+  xdmp:invoke-function(
+    function(){
+      ss:create-action($alert-name, $alert-module, $db, $options)
+    }
+    ,
     <options xmlns="xdmp:eval"><isolation>different-transaction</isolation></options>
   )
 };