fixed #280 - clear content removing trace setting

Author: paxtonhare

marklogic-data-hub/src/main/resources/ml-config/databases/final-database.json

@@ -24,14 +24,6 @@
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "unsignedInt",
-      "namespace-uri": "http://marklogic.com/data-hub/debug",
-      "localname": "is-debugging-enabled",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
     }
   ],
   "schema-database": "%%SCHEMAS_DATABASE%%",

marklogic-data-hub/src/main/resources/ml-config/databases/staging-database.json

@@ -24,22 +24,6 @@
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "unsignedInt",
-      "namespace-uri": "http://marklogic.com/data-hub/trace",
-      "localname": "is-tracing-enabled",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
-    {
-      "scalar-type": "unsignedInt",
-      "namespace-uri": "http://marklogic.com/data-hub/debug",
-      "localname": "is-debugging-enabled",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
     }
   ],
   "schema-database": "%%SCHEMAS_DATABASE%%",

marklogic-data-hub/src/main/resources/ml-config/databases/trace-database.json

@@ -41,14 +41,6 @@
       "range-value-positions": false,
       "invalid-values": "reject"
     },
-    {
-      "scalar-type": "unsignedInt",
-      "namespace-uri": "http://marklogic.com/data-hub/debug",
-      "localname": "is-debugging-enabled",
-      "collation": "",
-      "range-value-positions": false,
-      "invalid-values": "reject"
-    },
     {
       "scalar-type": "dateTime",
       "namespace-uri": "",

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

@@ -19,11 +19,18 @@ module namespace debug = "http://marklogic.com/data-hub/debug";
 
 declare option xdmp:mapping "false";
 
-declare function debug:enable($enable as xs:boolean)
+declare function debug:enable($enabled as xs:boolean)
 {
-  xdmp:document-insert(
-    "/com.marklogic.hub/__debug_enabled__.xml",
-    element debug:is-debugging-enabled { if ($enable) then 1 else 0 })
+  xdmp:eval('
+    declare namespace debug = "http://marklogic.com/data-hub/debug";
+    declare variable $enabled external;
+
+    xdmp:document-insert(
+      "/com.marklogic.hub/settings/__debug_enabled__.xml",
+      element debug:is-debugging-enabled { if ($enabled) then 1 else 0 })
+  ',
+  map:new((map:entry("enabled", $enabled))),
+  map:new(map:entry("database", xdmp:modules-database())))
 };
 
 (:~
@@ -33,13 +40,16 @@ declare function debug:enable($enable as xs:boolean)
  :)
 declare function debug:on() as xs:boolean
 {
-  let $value := cts:element-values(xs:QName("debug:is-debugging-enabled"), (), ("type=unsignedInt","limit=1"))
-  return
-    if ($value) then
-      $value eq 1
-    else
-      fn:false()
-
+  xdmp:eval('
+    declare namespace debug = "http://marklogic.com/data-hub/debug";
+    fn:exists(
+      cts:search(
+        fn:doc("/com.marklogic.hub/settings/__debug_enabled__.xml"),
+        cts:element-value-query(xs:QName("debug:is-debugging-enabled"), "1", ("exact")),
+        ("unfiltered", "score-zero", "unchecked", "unfaceted")
+      )
+    )
+  ',(), map:new(map:entry("database", xdmp:modules-database())))
 };
 
 (:~

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

@@ -40,19 +40,29 @@ declare %private variable $current-trace := map:new((
 
 declare function trace:enable-tracing($enabled as xs:boolean)
 {
-  xdmp:document-insert(
-    "/com.marklogic.hub/__tracing_enabled__.xml",
-    element trace:is-tracing-enabled { if ($enabled) then 1 else 0 })
+  xdmp:eval('
+    declare namespace trace = "http://marklogic.com/data-hub/trace";
+    declare variable $enabled external;
+    xdmp:document-insert(
+      "/com.marklogic.hub/settings/__tracing_enabled__.xml",
+      element trace:is-tracing-enabled { if ($enabled) then 1 else 0 })
+  ',
+  map:new((map:entry("enabled", $enabled))),
+  map:new(map:entry("database", xdmp:modules-database())))
 };
 
 declare function trace:enabled() as xs:boolean
 {
-  let $value := cts:element-values(xs:QName("trace:is-tracing-enabled"), (), ("type=unsignedInt","limit=1"))
-  return
-    if ($value) then
-      $value eq 1
-    else
-      fn:false()
+  xdmp:eval('
+    declare namespace trace = "http://marklogic.com/data-hub/trace";
+    fn:exists(
+      cts:search(
+        fn:doc("/com.marklogic.hub/settings/__tracing_enabled__.xml"),
+        cts:element-value-query(xs:QName("trace:is-tracing-enabled"), "1", ("exact")),
+        ("unfiltered", "score-zero", "unchecked", "unfaceted")
+      )
+    )
+  ',(), map:new(map:entry("database", xdmp:modules-database())))
 };
 
 declare function trace:has-errors() as xs:boolean