update plugin signatures

examples/healthcare/plugins/entities/Patients/conformance/final/collector/collector.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/collector";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare option xdmp:mapping "false";
 

examples/healthcare/plugins/entities/Patients/conformance/final/content/content.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/content";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,20 +9,21 @@ declare option xdmp:mapping "false";
 (:~
  : Create Content Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
- : @param $options - a map containing options. Options are sent from Java
+ : @param $id          - the identifier returned by the collector
+ : @param $options     - a map containing options. Options are sent from Java
  :
  : @return - your transformed content
  :)
 declare function plugin:create-content(
   $id as xs:string,
-  $content as node()?,
-  $headers as node()*,
-  $triples as sem:triple*,
   $options as map:map) as node()?
 {
-  fn:doc($id)/envelope:envelope/envelope:content/node()
+  let $doc := fn:doc($id)
+  return
+    if ($doc/envelope:envelope) then
+      $doc/envelope:envelope/envelope:content/node()
+    else if ($doc/content) then
+      $doc/content
+    else
+      $doc
 };

examples/healthcare/plugins/entities/Patients/conformance/final/headers/headers.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/headers";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -11,19 +11,15 @@ declare option xdmp:mapping "false";
 (:~
  : Create Headers Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
+ : @param $id      - the identifier returned by the collector
+ : @param $content - the output of your content plugin
  : @param $options - a map containing options. Options are sent from Java
  :
  : @return - zero or more header nodes
  :)
 declare function plugin:create-headers(
   $id as xs:string,
   $content as node()?,
-  $headers as node()*,
-  $triples as sem:triple*,
   $options as map:map) as node()*
 {
   (

examples/healthcare/plugins/entities/Patients/conformance/final/triples/triples.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/triples";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,10 +9,9 @@ declare option xdmp:mapping "false";
 (:~
  : Create Triples Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
+ : @param $id      - the identifier returned by the collector
+ : @param $content - the output of your content plugin
+ : @param $headers - the output of your headers plugin
  : @param $options - a map containing options. Options are sent from Java
  :
  : @return - zero or more triples
@@ -21,7 +20,6 @@ declare function plugin:create-triples(
   $id as xs:string,
   $content as node()?,
   $headers as node()*,
-  $triples as sem:triple*,
   $options as map:map) as sem:triple*
 {
   ()

examples/healthcare/plugins/entities/Patients/input/hl7/content/content.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/content";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,20 +9,16 @@ declare option xdmp:mapping "false";
 (:~
  : Create Content Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
- : @param $options - a map containing options. Options are sent from Java
+ : @param $id          - the identifier returned by the collector
+ : @param $raw-content - the raw content being loaded.
+ : @param $options     - a map containing options. Options are sent from Java
  :
  : @return - your transformed content
  :)
 declare function plugin:create-content(
   $id as xs:string,
-  $content as node()?,
-  $headers as node()*,
-  $triples as sem:triple*,
+  $raw-content as node()?,
   $options as map:map) as node()?
 {
-  $content
+  $raw-content
 };

examples/healthcare/plugins/entities/Patients/input/hl7/headers/headers.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/headers";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,19 +9,15 @@ declare option xdmp:mapping "false";
 (:~
  : Create Headers Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
+ : @param $id      - the identifier returned by the collector
+ : @param $content - the output of your content plugin
  : @param $options - a map containing options. Options are sent from Java
  :
  : @return - zero or more header nodes
  :)
 declare function plugin:create-headers(
   $id as xs:string,
   $content as node()?,
-  $headers as node()*,
-  $triples as sem:triple*,
   $options as map:map) as node()*
 {
   ()

examples/healthcare/plugins/entities/Patients/input/hl7/triples/triples.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/triples";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,10 +9,9 @@ declare option xdmp:mapping "false";
 (:~
  : Create Triples Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
+ : @param $id      - the identifier returned by the collector
+ : @param $content - the output of your content plugin
+ : @param $headers - the output of your headers plugin
  : @param $options - a map containing options. Options are sent from Java
  :
  : @return - zero or more triples
@@ -21,7 +20,6 @@ declare function plugin:create-triples(
   $id as xs:string,
   $content as node()?,
   $headers as node()*,
-  $triples as sem:triple*,
   $options as map:map) as sem:triple*
 {
   ()

examples/healthcare/plugins/entities/Patients/input/nppes/content/content.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/content";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,20 +9,16 @@ declare option xdmp:mapping "false";
 (:~
  : Create Content Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
- : @param $options - a map containing options. Options are sent from Java
+ : @param $id          - the identifier returned by the collector
+ : @param $raw-content - the raw content being loaded.
+ : @param $options     - a map containing options. Options are sent from Java
  :
  : @return - your transformed content
  :)
 declare function plugin:create-content(
   $id as xs:string,
-  $content as node()?,
-  $headers as node()*,
-  $triples as sem:triple*,
+  $raw-content as node()?,
   $options as map:map) as node()?
 {
-  $content
+  $raw-content
 };

examples/healthcare/plugins/entities/Patients/input/nppes/headers/headers.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/headers";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,19 +9,15 @@ declare option xdmp:mapping "false";
 (:~
  : Create Headers Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
+ : @param $id      - the identifier returned by the collector
+ : @param $content - the output of your content plugin
  : @param $options - a map containing options. Options are sent from Java
  :
  : @return - zero or more header nodes
  :)
 declare function plugin:create-headers(
   $id as xs:string,
   $content as node()?,
-  $headers as node()*,
-  $triples as sem:triple*,
   $options as map:map) as node()*
 {
   ()

examples/healthcare/plugins/entities/Patients/input/nppes/triples/triples.xqy

@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-module namespace plugin = "http://marklogic.com/data-hub/plugins/triples";
+module namespace plugin = "http://marklogic.com/data-hub/plugins";
 
 declare namespace envelope = "http://marklogic.com/data-hub/envelope";
 
@@ -9,10 +9,9 @@ declare option xdmp:mapping "false";
 (:~
  : Create Triples Plugin
  :
- : @param id       - the identifier returned by the collector
- : @param content  - your final content
- : @param headers  - a sequence of header nodes
- : @param triples  - a sequence of triples
+ : @param $id      - the identifier returned by the collector
+ : @param $content - the output of your content plugin
+ : @param $headers - the output of your headers plugin
  : @param $options - a map containing options. Options are sent from Java
  :
  : @return - zero or more triples
@@ -21,7 +20,6 @@ declare function plugin:create-triples(
   $id as xs:string,
   $content as node()?,
   $headers as node()*,
-  $triples as sem:triple*,
   $options as map:map) as sem:triple*
 {
   ()

examples/hr-hub/plugins/entities/Employee/conformance/conform-acme-tech/content/content.sjs

@@ -1,25 +1,27 @@
 /*
  * Create Content Plugin
  *
- * @param id       - the identifier returned by the collector
- * @param content  - your final content
- * @param headers  - an array of header objects
- * @param triples  - an array of triples
- * @param options  - an object containing options. Options are sent from Java
+ * @param id         - the identifier returned by the collector
+ * @param options    - an object containing options. Options are sent from Java
  *
  * @return - your content
  */
-function createContent(id, content, headers, triples, options) {
-  var root = cts.doc(id).root;
+function createContent(id, options) {
+  var doc = cts.doc(id);
+  var root = doc.root;
 
   // for xml we need to use xpath
-  if (xdmp.nodeKind(root) === 'element') {
+  if (root && xdmp.nodeKind(root) === 'element') {
     return root.xpath('/*:envelope/*:content/node()');
   }
   // for json we need to return the content
-  else {
+  else if (root && root.content) {
     return root.content;
   }
+  // for everything else
+  else {
+    return doc;
+  }
 }
 
 module.exports = {

examples/hr-hub/plugins/entities/Employee/conformance/conform-acme-tech/headers/headers.sjs

@@ -2,14 +2,12 @@
  * Create Headers Plugin for Acme Tech data
  *
  * @param id       - the identifier returned by the collector
- * @param content  - your final content
- * @param headers  - an array of header objects
- * @param triples  - an array of triples
+ * @param content  - the output of your content plugin
  * @param options  - an object containing options. Options are sent from Java
  *
  * @return - an array of header objects
  */
-function createHeaders(id, content, headers, triples, options) {
+function createHeaders(id, content, options) {
   var latest = xs.date('1900-01-01');
   var salary;
 

examples/hr-hub/plugins/entities/Employee/conformance/conform-acme-tech/triples/triples.sjs

@@ -2,18 +2,16 @@
  * Create Triples Plugin
  *
  * @param id       - the identifier returned by the collector
- * @param content  - your final content
- * @param headers  - an array of header objects
- * @param triples  - an array of triples
+ * @param content  - the output of your content plugin
+ * @param headers  - the output of your heaaders plugin
  * @param options  - an object containing options. Options are sent from Java
  *
  * @return - an array of triples
  */
-function createTriples(id, content, headers, triples, options) {
+function createTriples(id, content, headers, options) {
   return [];
 }
 
 module.exports = {
   createTriples: createTriples
 };
-

examples/hr-hub/plugins/entities/Employee/conformance/conform-acme-tech/writer/writer.sjs

@@ -3,12 +3,12 @@
  *
  * @param id       - the identifier returned by the collector
  * @param envelope - the final envelope
- * @param options  - a map containing options. Options are sent from Java
+ * @param options  - an object options. Options are sent from Java
  *
- * @return - zero or more header nodes
+ * @return - nothing
  */
-function write(id, content, options) {
-  xdmp.documentInsert(id, content, [], ['json-employee']);
+function write(id, envelope, options) {
+  xdmp.documentInsert(id, envelope, [], ['json-employee']);
 }
 
 module.exports = {