From 32b10ad30bfc361b725e0c72a10105f243d5e592 Mon Sep 17 00:00:00 2001 From: apb Date: Mon, 21 Jan 2013 22:27:25 +0000 Subject: [PATCH] dotml --- src/graphxq/app.js | 6 +- src/graphxq/dotml.xqm | 6 +- src/graphxq/graphxq.xqm | 7 +- src/graphxq/talk/BaseX-user-group-talk.odp | Bin 0 -> 838707 bytes src/graphxq/talk/page.ep | 174 +++++++++++++++++++++ src/graphxq/views/about.xml | 21 ++- src/graphxq/views/api.xml | 2 +- src/graphxq/views/dotform.xml | 10 +- src/graphxq/views/dotmlform.xml | 22 ++- src/graphxq/views/layout.xml | 12 +- src/graphxq/views/widget.svg | 7 +- 11 files changed, 230 insertions(+), 37 deletions(-) create mode 100644 src/graphxq/talk/BaseX-user-group-talk.odp create mode 100644 src/graphxq/talk/page.ep diff --git a/src/graphxq/app.js b/src/graphxq/app.js index 2b0bafe..f9a964e 100644 --- a/src/graphxq/app.js +++ b/src/graphxq/app.js @@ -65,8 +65,8 @@ $(document).ready(function(){ function getsvg(dl){ var f=$("#dotForm").serializeArray() - var d=$("#frm-defaults").serializeArray() - console.log("#frm-default",d) + //var d=$("#frm-defaults").serializeArray() + //console.log("#frm-default",d) // if(dl)f.push({"name":"dl","value":1}) $.ajax({ type:"POST", @@ -79,7 +79,7 @@ function getsvg(dl){ var data = oParser.parseFromString(str, "text/xml"); // http://stackoverflow.com/questions/3346106/accessing-a-dom-object-defined-in-an-external-svg-file var n = document.importNode(data.documentElement,true); - $("#cuthere").empty().append(n); + $("#gInsertSVG").empty().append(n); $("#svgsrc").empty().text(str); }, error:function(jqXHR, textStatus, errorThrown){ diff --git a/src/graphxq/dotml.xqm b/src/graphxq/dotml.xqm index 5aafff6..92b8fe6 100644 --- a/src/graphxq/dotml.xqm +++ b/src/graphxq/dotml.xqm @@ -10,9 +10,11 @@ import module namespace xslt="http://basex.org/modules/xslt"; (:~ : @return graphviz dot string +: note xslt:transform can not return output text so result is wrapped :) -declare function generate($dotml) as xs:string +declare function generate($dotml) as xs:string { - xslt:transform($dotml, fn:resolve-uri( "dotml/dotml2dot.xsl")) + let $d:=xslt:transform($dotml, fn:resolve-uri( "dotml/dotml2dot.xsl")) + return $d/fn:string() }; diff --git a/src/graphxq/graphxq.xqm b/src/graphxq/graphxq.xqm index dc89638..ad06eae 100644 --- a/src/graphxq/graphxq.xqm +++ b/src/graphxq/graphxq.xqm @@ -126,9 +126,10 @@ declare function api-dotml($dotml ) as node() { let $dotml:=fn:parse-xml($dotml) + let $y:=fn:trace($dotml,"ff") let $x:=dotml:generate($dotml) -(: let $svg:=dot2svg($x) :) - return $x + let $svg:=dot2svg($x) + return $svg }; @@ -161,7 +162,7 @@ declare %private function dot2svg($dot as xs:string) as node(){ :) declare function render($template as xs:string,$locals){ let $sidebar:=
- viewbox work +