Skip to content
This repository has been archived by the owner on Aug 26, 2020. It is now read-only.

Commit

Permalink
Issues #351, #349. edits to version translator
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles Greer committed Sep 20, 2017
1 parent ff827f8 commit 75b1e81
Showing 1 changed file with 63 additions and 53 deletions.
116 changes: 63 additions & 53 deletions entity-services/src/main/xdmp/entity-services/entity-services-codegen.xqy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,25 +602,6 @@ declare private function es-codegen:value-for-conversion(
let $is-reference-from-scalar-or-array :=
exists($target-ref) and empty($source-ref)

let $extract-scalar-fn :=
let $ref-namespace-prefix :=
if (contains($target-ref, "#/definitions"))
then $target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespacePrefix")
else ()
let $ref-namespace :=
if (contains($target-ref, "#/definitions"))
then $target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespace")
else ()
return
if ($ref-namespace-prefix) then
concat(
"es:init-instance(?, '", $target-ref-name, "')",
"
 =>es:with-namespace('",$ref-namespace,"','",$ref-namespace-prefix,"')")
else
concat(
"es:init-instance(?, '",
$target-ref-name,
"')")

let $comment :=
if ($is-missing-source)
Expand All @@ -631,38 +612,67 @@ declare private function es-codegen:value-for-conversion(
then es-codegen:comment("Warning: potential data loss, truncated array.")
else ""

let $extract-reference-fn :=
map:put($let-expressions, $target-ref-name,
fn:string-join(
(
concat(' let $extract-reference-',$target-ref-name,' := '),
if (contains($target-ref, "#/definitions"))
then
let $ref-namespace-prefix :=
$target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespacePrefix")
let $ref-namespace :=
$target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespace")
return
if ($ref-namespace)
then
(" function($path) { ",
" if ($path/*)",
concat(" then ", $module-prefix, ":convert-instance-", $target-ref-name, "($path)"),
concat(" else es:init-instance($path, '", $target-ref-name, "')",
"
 =>es:with-namespace('",$ref-namespace,"','",$ref-namespace-prefix,"')",
" }"))
else
(" function($path) { ",
" if ($path/*)",
concat(" then ", $module-prefix, ":convert-instance-", $target-ref-name, "($path)"),
concat(" else es:init-instance($path, '", $target-ref-name, "')"),
" }")

else
concat(" es:init-instance(?, '", $target-ref-name, "')"),
""
),
"
")
let $extract-fn :=
if ($is-reference-from-scalar-or-array)
then
map:put($let-expressions, $target-ref-name,
fn:string-join(
(
concat(' let $extract-scalar-',$target-ref-name,' := '),
if (contains($target-ref, "#/definitions"))
then
let $ref-namespace-prefix :=
$target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespacePrefix")
let $ref-namespace :=
$target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespace")
return
if ($ref-namespace)
then
(
" function($src-node) { ",
concat(" es:init-instance($src-node, '", $target-ref-name, "')"),
concat(" =>es:with-namespace('",$ref-namespace,"','",$ref-namespace-prefix,"')"),
" }"
)
else
concat( " es:init-instance(?, '", $target-ref-name, "')")
else
concat( " es:init-instance(?, '", $target-ref-name, "')"),
""
),
"
"))
else
map:put($let-expressions, $target-ref-name,
fn:string-join(
(
concat(' let $extract-reference-',$target-ref-name,' := '),
if (contains($target-ref, "#/definitions"))
then
let $ref-namespace-prefix :=
$target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespacePrefix")
let $ref-namespace :=
$target-model=>map:get("definitions")=>map:get($target-ref-name)=>map:get("namespace")
return
if ($ref-namespace)
then
(" function($path) { ",
" if ($path/*)",
concat(" then ", $module-prefix, ":convert-instance-", $target-ref-name, "($path)"),
concat(" else es:init-instance($path, '", $target-ref-name, "')",
"
 =>es:with-namespace('",$ref-namespace,"','",$ref-namespace-prefix,"')",
" }"))
else
(" function($path) { ",
" if ($path/*)",
concat(" then ", $module-prefix, ":convert-instance-", $target-ref-name, "($path)"),
concat(" else es:init-instance($path, '", $target-ref-name, "')"),
" }")

else
concat(" es:init-instance(?, '", $target-ref-name, "')"),
""
),
"
")
)


Expand All @@ -678,7 +688,7 @@ declare private function es-codegen:value-for-conversion(
else if (empty($target-ref))
then $wrap-if-array($path-to-property, $casting-function-name, true())
else if ($is-reference-from-scalar-or-array)
then $wrap-if-array($path-to-property, $extract-scalar-fn, true())
then $wrap-if-array($path-to-property, "$extract-scalar-" || $target-ref-name, false())
else $wrap-if-array($path-to-property || "/*", "$extract-reference-" || $target-ref-name, false() )

let $let-expr := map:put($let-expressions, $target-property-name,
Expand Down Expand Up @@ -881,7 +891,7 @@ map:put($target-info, $removed-entity-type-name, map:entry("", "Removed Type")),
(: If the source is an envelope or part of an envelope document,
: copies attachments to the target :)
=>es:copy-attachments($source-node)
=>map:with("$type", "', $removed-entity-type-name, '" }',
=>map:with("$type", "', $removed-entity-type-name, '" )',
'
',
fn:string-join($values)
)
Expand Down

0 comments on commit 75b1e81

Please sign in to comment.