From 0b197567dcfaf2400ce064b68c633496d730aff2 Mon Sep 17 00:00:00 2001 From: andy Date: Sun, 8 Mar 2015 22:27:09 +0000 Subject: [PATCH] fixes --- src/graphxq/graphxq.xqm | 7 +++++-- src/graphxq/views/dotform.xq | 2 ++ src/graphxq/views/item1.xq | 2 +- src/graphxq/views/layout.xq | 4 ++-- src/static/graphxq/ace-worker/worker-css.js | 1 - src/static/graphxq/ace-worker/worker-javascript.js | 1 - src/static/graphxq/ace-worker/worker-json.js | 1 - src/static/graphxq/ace-worker/worker-xquery.js | 1 - src/static/graphxq/app.js | 2 +- src/static/graphxq/logo.svg | 12 ++++++++++++ 10 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 src/static/graphxq/ace-worker/worker-css.js delete mode 100644 src/static/graphxq/ace-worker/worker-javascript.js delete mode 100644 src/static/graphxq/ace-worker/worker-json.js delete mode 100644 src/static/graphxq/ace-worker/worker-xquery.js create mode 100644 src/static/graphxq/logo.svg diff --git a/src/graphxq/graphxq.xqm b/src/graphxq/graphxq.xqm index 3cb7124..a47c77f 100644 --- a/src/graphxq/graphxq.xqm +++ b/src/graphxq/graphxq.xqm @@ -63,8 +63,9 @@ function graphxq-svg($dot,$url,$dl,$dotopt) { declare %restxq:GET %restxq:path("graphxq/dot") %output:method("html") %output:version("5.0") -%restxq:form-param("src","{$src}") +%restxq:query-param("src","{$src}") function dotform($src){ + let $_:=fn:trace($src,"SRC") let $dot:= getdot("digraph {a -> b}",$src) let $svgwidget:=fn:doc("views/widget.svg") let $toolbar:=fn:doc("views/toolbar.xml") @@ -80,12 +81,14 @@ function dotform($src){ declare %restxq:GET %restxq:path("graphxq/dotml") %output:method("html") %output:version("5.0") -%restxq:form-param("src","{$src}") +%restxq:query-param("src","{$src}") function dotmlform($src){ + let $svgwidget:=fn:doc("views/widget.svg") let $toolbar:=fn:doc("views/toolbar.xml") let $default:= let $dotml:= getdotml($default ,$src) + let $_:=fn:trace($dotml) let $dotml:= fn:serialize($dotml) let $v:=map{ "svgwidget": $svgwidget, "toolbar": $toolbar, diff --git a/src/graphxq/views/dotform.xq b/src/graphxq/views/dotform.xq index 13c6723..e0a4d0f 100644 --- a/src/graphxq/views/dotform.xq +++ b/src/graphxq/views/dotform.xq @@ -1,6 +1,8 @@ + declare variable $toolbar external :="{tooolbar}"; declare variable $dot external :="{dot}"; declare variable $svgwidget external :="{svg}"; +
diff --git a/src/graphxq/views/item1.xq b/src/graphxq/views/item1.xq index 8529633..93d24d9 100644 --- a/src/graphxq/views/item1.xq +++ b/src/graphxq/views/item1.xq @@ -11,7 +11,7 @@ declare variable $url external;

- + {$item/title/fn:string()}

{$item/description/node()} diff --git a/src/graphxq/views/layout.xq b/src/graphxq/views/layout.xq index f5a144e..4ef7466 100644 --- a/src/graphxq/views/layout.xq +++ b/src/graphxq/views/layout.xq @@ -23,7 +23,7 @@ declare variable $active-link external :=function($_){$_}; - +