fixed #345

Author: paxtonhare

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/error-lib.xqy

@@ -23,7 +23,7 @@ declare function err:error-to-json($error as element(error:error))
   let $_ :=
     for $e in $error/*[fn:not(self::error:stack or self::error:data)]
     return
-      map:put($o, err:to-camel(fn:local-name($e)), fn:data($e))
+      map:put($o, err:to-camel(fn:local-name($e)), fn:string($e))
   let $_ :=
     let $data := json:array()
     let $_ :=
@@ -40,7 +40,7 @@ declare function err:error-to-json($error as element(error:error))
       let $_ :=
         for $e in $frame/*[fn:not(self::error:variables)]
         return
-          map:put($f, err:to-camel(fn:local-name($e)), fn:data($e))
+          map:put($f, err:to-camel(fn:local-name($e)), fn:string($e))
       let $_ :=
         let $variables := json:object()
         let $_ :=

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/flow-lib.xqy

@@ -562,15 +562,15 @@ declare function flow:make-envelope(
         map:put($o, "headers", $headers),
         map:put($o, "triples", $triples),
         map:put($o, "instance",
-          if ($content castable as map:map) then
+          if ($content instance of map:map and map:keys($content) = "$type") then
             flow:instance-to-canonical-json($content)
           else
             $content
         ),
         map:put($o, "attachments",
           let $content := map:get($map, "content")
           return
-            if ($content castable as map:map) then
+            if ($content instance of map:map and map:keys($content) = "$attachments") then
               map:get($content, "$attachments")
             else
               ()
@@ -591,7 +591,7 @@ declare function flow:make-envelope(
         {
           let $content := map:get($map, "content")
           return
-            if ($content castable as map:map) then
+            if ($content instance of map:map and map:keys($content) = "$type") then
               flow:instance-to-canonical-xml($content)
             else
               $content
@@ -601,7 +601,7 @@ declare function flow:make-envelope(
         {
           let $content := map:get($map, "content")
           return
-            if ($content castable as map:map) then
+            if ($content instance of map:map and map:keys($content) = "$attachments") then
               map:get($content, "$attachments")
             else
               ()
@@ -844,12 +844,11 @@ declare function flow:run-plugin(
     let $resp :=
       typeswitch($resp)
         case object-node() | json:object return
-          (: map:map lands here too :)
-          (: map:map is ES response type :)
-          if ($resp castable as map:map) then
+          (: object with $type key is ES response type :)
+          if ($resp instance of map:map and map:keys($resp) = "$type") then
             $resp
           else if ($data-format = $XML) then
-            json:transform-from-json($resp, json:config("custom"))
+            json:transform-from-json($resp)
           else
             $resp
         case json:array return

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/trace-lib.xqy

@@ -231,7 +231,12 @@ declare function trace:error-trace(
   let $plugin-map := map:new((
     map:entry("pluginModuleUri", $module-uri),
     map:entry("input", $input),
-    map:entry("error", $error),
+    map:entry("error",
+      if (map:get($current-trace-settings, "data-format") eq $FORMAT-JSON) then
+        $error/err:error-to-json(.)
+      else
+        $error
+    ),
     map:entry("duration", $duration)
   ))
   let $_ := map:put($current-trace, $plugin-type || "Plugin", $plugin-map)
@@ -295,6 +300,8 @@ declare function trace:_walk_json($nodes as node()* ,$o)
                 $n
             return
               map:put($o, $name, $unquoted)
+          else if ($name = "error") then
+            map:put($o, $name, $n)
           else
             let $_ := trace:_walk_json($n/node(), $oo)
             return

marklogic-data-hub/src/main/resources/ml-modules/services/scaffold-content.xqy

@@ -458,8 +458,8 @@ function createContent(id, options) {{
     source = root.xpath('/*:envelope/*:instance/node()');
   }}
   // for json we need to return the instance
-  else if (root && root.instance) {{
-    source = root.instance;
+  else if (root && root.envelope && root.envelope.instance) {{
+    source = root.envelope.instance;
   }}
   // for everything else
   else {{

marklogic-data-hub/src/main/resources/scaffolding/harmonize/sjs/content.sjs

@@ -15,7 +15,7 @@ function createContent(id, options) {
     return root.xpath('/*:envelope/*:instance/node()');
   }
   // for json we need to return the instance
-  else if (root && root.envelope.instance) {
+  else if (root && root.envelope && root.envelope.instance) {
     return root.envelope.instance;
   }
   // for everything else

marklogic-data-hub/src/main/resources/scaffolding/harmonize/xqy/headers.xqy

@@ -17,7 +17,7 @@ declare option xdmp:mapping "false";
  :)
 declare function plugin:create-headers(
   $id as xs:string,
-  $content as node()?,
+  $content as item()?,
   $options as map:map) as node()*
 {
   ()

marklogic-data-hub/src/main/resources/scaffolding/harmonize/xqy/triples.xqy

@@ -19,7 +19,7 @@ declare option xdmp:mapping "false";
 declare function plugin:create-triples(
   $id as xs:string,
   $content as node()?,
-  $headers as node()*,
+  $headers as item()*,
   $options as map:map) as sem:triple*
 {
   ()