fixing code editor bugs

Author: paxtonhare

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

@@ -281,7 +281,7 @@ declare function trace:error-trace(
   $duration as xs:dayTimeDuration)
 {
   let $_ := trace:increment-error-count()
-  let $_ := trace:add-failed-item($identifier)
+  let $_ := $identifier ! trace:add-failed-item(.)
   let $format :=
     let $o :=
       if ($input instance of document-node()) then

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

@@ -6,8 +6,8 @@
  * @return - an array of ids or uris
  */
 function collect(options) {
-  // by default we return the URIs in the same collection as the Flow name
-  return cts.uris(null, null, cts.collectionQuery(options.flow));
+  // by default we return the URIs in the same collection as the Entity name
+  return cts.uris(null, null, cts.collectionQuery(options.entity));
 }
 
 module.exports = {

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

@@ -8,7 +8,7 @@
  * @return - nothing
  */
 function write(id, envelope, options) {
-  xdmp.documentInsert(id, envelope);
+  xdmp.documentInsert(id, envelope, xdmp.defaultPermissions(), options.entity);
 }
 
 module.exports = {

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

@@ -14,7 +14,7 @@ declare option xdmp:mapping "false";
 declare function plugin:collect(
   $options as map:map) as xs:string*
 {
-  (: by default we return the URIs in the same collection as the Flow name :)
-  cts:uris((), (), cts:collection-query(map:get($options, "flow")))
+  (: by default we return the URIs in the same collection as the Entity name :)
+  cts:uris((), (), cts:collection-query(map:get($options, "entity")))
 };
 

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

@@ -18,5 +18,5 @@ declare function plugin:write(
   $envelope as node(),
   $options as map:map) as empty-sequence()
 {
-  xdmp:document-insert($id, $envelope)
+  xdmp:document-insert($id, $envelope, xdmp:default-permissions(), map:get($options, "entity"))
 };

quick-start/src/main/java/com/marklogic/quickstart/ApplicationRunListener.java

@@ -15,24 +15,16 @@ public class ApplicationRunListener implements SpringApplicationRunListener {
     public ApplicationRunListener(SpringApplication application, String[] args) { }
 
     @Override
-    public void starting() {
-        System.out.println("Starting up the QuickStart UI...");
-    }
+    public void starting() {}
 
     @Override
-    public void environmentPrepared(ConfigurableEnvironment environment) {
-
-    }
+    public void environmentPrepared(ConfigurableEnvironment environment) {}
 
     @Override
-    public void contextPrepared(ConfigurableApplicationContext context) {
-
-    }
+    public void contextPrepared(ConfigurableApplicationContext context) {}
 
     @Override
-    public void contextLoaded(ConfigurableApplicationContext context) {
-
-    }
+    public void contextLoaded(ConfigurableApplicationContext context) {}
 
     @Override
     public void finished(ConfigurableApplicationContext context, Throwable exception) {

quick-start/src/main/java/com/marklogic/quickstart/service/FileSystemWatcherService.java

@@ -194,24 +194,25 @@ public void run() {
 
                 for (WatchEvent<?> event: key.pollEvents()) {
                     Kind<?> kind = event.kind();
-                    if (kind == StandardWatchEventKinds.OVERFLOW) {
-                        continue;
-                    }
-
-                    // Context for directory entry event is the file name of entry
-                    @SuppressWarnings("unchecked")
-                    WatchEvent<Path> ev = (WatchEvent<Path>)event;
-                    Path context = ev.context();
-                    Path child = dir.resolve(context);
+//                    if (kind == StandardWatchEventKinds.OVERFLOW) {
+//                        continue;
+//                    }
 
-                    // print out event
-                    logger.debug("Event received: {} for: {}", event.kind().name(), child);
                     queueReload();
 
                     // if directory is created, then register it and its sub-directories
                     // we are always listening recursively
                     if (kind == StandardWatchEventKinds.ENTRY_CREATE) {
+                        // Context for directory entry event is the file name of entry
+                        @SuppressWarnings("unchecked")
+                        WatchEvent<Path> ev = (WatchEvent<Path>)event;
+                        Path context = ev.context();
+                        Path child = dir.resolve(context);
+
                         try {
+                            // print out event
+                            logger.debug("Event received: {} for: {}", event.kind().name(), child);
+
                             if (Files.isDirectory(child, LinkOption.NOFOLLOW_LINKS)) {
                                 registerAll(child);
                             }

quick-start/src/main/java/com/marklogic/quickstart/service/SearchService.java

@@ -67,8 +67,8 @@ public StringHandle search(SearchQuery searchQuery) {
             sb = queryMgr.newStructuredQueryBuilder("entity-options");
             queries.add(
                 sb.or(
-                    sb.containerQuery(sb.element(new QName("http://marklogic.com/entity-services", "instance")), sb.and(null)),
-                    sb.containerQuery(sb.jsonProperty("instance"), sb.and(null))
+                    sb.containerQuery(sb.element(new QName("http://marklogic.com/entity-services", "instance")), sb.and()),
+                    sb.containerQuery(sb.jsonProperty("instance"), sb.and())
                 )
             );
         }

quick-start/src/main/resources/application.properties

@@ -2,8 +2,9 @@
 server.port=${port:8080}
 server.contextPath=/
 # server.error.whitelabel.enabled=false
-logging.level.com.marklogic.hub: INFO
-logging.level.org.apache.catalina.webresources.Cache: ERROR
+logging.level.com.marklogic.hub=INFO
+logging.level.org.apache.catalina.webresources.Cache=ERROR
+logging.level.java.util.prefs=OFF
 spring.mvc.favicon.enabled=false
 
 # By default, enable the dev profile

quick-start/src/main/resources/banner.txt

@@ -19,3 +19,5 @@
 | |  | | | (_| | | | | | |  __/\ V  V / (_) | |  |   <
 |_|  |_|  \__,_|_| |_| |_|\___| \_/\_/ \___/|_|  |_|\_\
 
+
+Starting. Please wait...