From 929f7c3ea06f723b8d92c8c94a197e6f3c81240f Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 4 Dec 2017 09:25:49 +0000 Subject: [PATCH] vuetify 0.17.3 --- .settings/de.loskutov.FileSync.prefs | 2 +- README.md | 2 + src/vue-poc/core.js | 13 + src/vue-poc/data/vue-poc/namespaces.xml | 44 +- src/vue-poc/features/collection/files.vue | 11 +- src/vue-poc/features/edit/edit.vue | 62 +- src/vue-poc/features/eval/eval.vue | 99 ++- src/vue-poc/features/eval/eval.xqm | 63 +- src/vue-poc/features/images/images.vue | 126 ++- src/vue-poc/features/images/images.xqm | 31 +- src/vue-poc/features/images/ireport.vue | 30 +- src/vue-poc/features/images/keywords.vue | 10 +- .../{ => tasks}/pics-01-store-directory.xq | 2 +- .../images/{ => tasks}/pics-02-store-meta.xq | 2 +- .../images/{ => tasks}/pics-03-store-image.xq | 2 +- .../{ => tasks}/pics-04-store-thumbs.xq | 2 +- .../{ => tasks}/pics-05-set-original.xq | 2 +- .../images/{ => tasks}/pics-06-keywords.xq | 2 +- .../images/{ => tasks}/pics-07-datetaken.xq | 3 +- src/vue-poc/features/job/jobs.vue | 3 +- src/vue-poc/features/map.vue | 11 +- src/vue-poc/features/svg.vue | 3 +- src/vue-poc/features/tabs.vue | 37 +- src/vue-poc/features/xslt/transform.vue | 2 +- src/vue-poc/lib/file.xqm | 4 +- src/vue-poc/lib/pipeline.xqm | 157 ++++ src/vue-poc/lib/util.xqm | 2 +- src/vue-poc/lib/webutils.xqm | 12 +- src/vue-poc/lib/xqdoc/html-index.xsl | 6 +- src/vue-poc/lib/xqdoc/html-module.xsl | 5 +- src/vue-poc/lib/xqdoc/xqdoc-proj.xqm | 12 +- src/vue-poc/router.js | 12 + .../static/ace-workers/worker-xquery.js | 40 +- src/vue-poc/static/app-gen.js | 458 +++++++---- src/vue-poc/static/app.css | 33 +- src/vue-poc/static/app.html | 28 +- src/vue-poc/static/svg-pan-zoom.css | 15 +- src/vue-poc/static/svg-pan-zoom.js | 729 +++++++++--------- src/vue-poc/vue-poc.vue | 50 +- 39 files changed, 1320 insertions(+), 807 deletions(-) rename src/vue-poc/features/images/{ => tasks}/pics-01-store-directory.xq (96%) rename src/vue-poc/features/images/{ => tasks}/pics-02-store-meta.xq (98%) rename src/vue-poc/features/images/{ => tasks}/pics-03-store-image.xq (97%) rename src/vue-poc/features/images/{ => tasks}/pics-04-store-thumbs.xq (98%) rename src/vue-poc/features/images/{ => tasks}/pics-05-set-original.xq (92%) rename src/vue-poc/features/images/{ => tasks}/pics-06-keywords.xq (98%) rename src/vue-poc/features/images/{ => tasks}/pics-07-datetaken.xq (97%) create mode 100644 src/vue-poc/lib/pipeline.xqm diff --git a/.settings/de.loskutov.FileSync.prefs b/.settings/de.loskutov.FileSync.prefs index 57e799b..957dcbf 100644 --- a/.settings/de.loskutov.FileSync.prefs +++ b/.settings/de.loskutov.FileSync.prefs @@ -1,5 +1,5 @@ WARNING=DO NOT MODIFY THIS FILE IF YOU DON'T UNDERSTAND -defaultDestination=C\:/Users/andy/Desktop/basex.9b/webapp +defaultDestination=C\:/Users/andy/Desktop/basex.versions/webapp defaultVariables= eclipse.preferences.version=1 includeTeamPrivateFiles=false diff --git a/README.md b/README.md index 84900b8..a3407d4 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Includes: * localforage for persistence Edit via android +## Bugs +* requests not stopped after unload ## Settings Global `settings` provides `getItem(name)` and `setItem(name.value)` diff --git a/src/vue-poc/core.js b/src/vue-poc/core.js index 4099fa3..e4686c6 100644 --- a/src/vue-poc/core.js +++ b/src/vue-poc/core.js @@ -28,6 +28,19 @@ const Auth={ }; Vue.use(Auth); +//Notification Object +const Notification={ + messages:[], + add(msg){ + this.messages.unshift({text: msg, index: this.messages.length}) + }, + install(Vue){ + Object.defineProperty(Vue.prototype, '$notification', { + get () { return Notification } + }) } +}; +Vue.use(Notification); + // Mimetype info const MimeTypes={ "text/xml":"xml", diff --git a/src/vue-poc/data/vue-poc/namespaces.xml b/src/vue-poc/data/vue-poc/namespaces.xml index 774221b..9bfb222 100644 --- a/src/vue-poc/data/vue-poc/namespaces.xml +++ b/src/vue-poc/data/vue-poc/namespaces.xml @@ -22,6 +22,30 @@ + + Xpath math + + + + Xpath map + + + + Xpath array + + + + Xpath errors + + + + serialization parameters + + XML Schema Part 1: Structures namespace. @@ -38,6 +62,18 @@ + + XPath functions + + + + + Xquery functions + + + Scalable Vector Graphics namespace @@ -68,6 +104,11 @@ + + GML + + + XProc @@ -77,8 +118,9 @@ - + EXpath packaging + \ No newline at end of file diff --git a/src/vue-poc/features/collection/files.vue b/src/vue-poc/features/collection/files.vue index 4210b3e..edae9e5 100644 --- a/src/vue-poc/features/collection/files.vue +++ b/src/vue-poc/features/collection/files.vue @@ -120,7 +120,11 @@ - + + + + + {{ selection[0] && selection[0].name }} @@ -133,10 +137,8 @@ - - - + diff --git a/src/vue-poc/features/eval/eval.xqm b/src/vue-poc/features/eval/eval.xqm index 67b5737..96369e6 100644 --- a/src/vue-poc/features/eval/eval.xqm +++ b/src/vue-poc/features/eval/eval.xqm @@ -8,22 +8,58 @@ import module namespace rest = "http://exquery.org/ns/restxq"; import module namespace util = 'vue-poc/util' at "../../lib/util.xqm"; import module namespace ufile = 'vue-poc/file' at "../../lib/file.xqm"; +declare variable $vue-api:db as xs:string:="vue-poc"; +declare variable $vue-api:id as element(last-id):=db:open("vue-poc","/state.xml")/state/last-id; + (:~ : eval :) declare +%updating %rest:POST %rest:path("/vue-poc/api/eval/execute") %rest:form-param("xq", "{$xq}") %output:method("json") function vue-api:eval($xq ) { - let $x:=fn:trace($xq,"task: ") let $r:=util:query($xq,()) - return - {$r} - + return vue-api:response($r) }; +(:~ + : return id and return + :) +declare +%updating +function vue-api:response($r) +{ + let $id:=$vue-api:id + 1 + let $out:= + { $id } + {$r} + + return ( + replace value of node $vue-api:id with $id, + db:output($out) + ) +}; + +(:~ + : submit a simple job + :) +declare +%updating +%rest:POST %rest:path("/vue-poc/api/eval/submit") +%rest:form-param("xq", "{$xq}") +%output:method("json") +function vue-api:submit($xq ) +{ + let $bindings:=map{} + let $opts:=map{"cache":true()} + let $r:=jobs:eval($xq,$bindings,$opts) + return vue-api:response($r) +}; + + (:~ : query plan :) @@ -40,22 +76,6 @@ function vue-api:plan($xq ) }; -(:~ - : submit a simple job - :) -declare -%rest:POST %rest:path("/vue-poc/api/eval/submit") -%rest:form-param("xq", "{$xq}") -%output:method("json") -function vue-api:submit($xq ) -{ - let $bindings:=map{} - let $opts:=map{"cache":true()} - let $r:=jobs:eval($xq,$bindings,$opts) - return - {$r} - -}; (:~ : submit a simple job from path @@ -93,6 +113,9 @@ let $n:='import module namespace fw="quodatum:file.walker";' }; +(:~ + : get result for job with $id + :) declare %rest:POST %rest:path('/vue-poc/api/eval/result/{$id}') %output:method("json") diff --git a/src/vue-poc/features/images/images.vue b/src/vue-poc/features/images/images.vue index 303e43f..3c732b9 100644 --- a/src/vue-poc/features/images/images.vue +++ b/src/vue-poc/features/images/images.vue @@ -6,7 +6,7 @@ - diff --git a/src/vue-poc/features/images/keywords.vue b/src/vue-poc/features/images/keywords.vue index e71bdf9..2fd1a19 100644 --- a/src/vue-poc/features/images/keywords.vue +++ b/src/vue-poc/features/images/keywords.vue @@ -13,7 +13,9 @@ - + @@ -44,7 +46,8 @@ busy: false, total: 0, items: [], - elapsed: null + elapsed: null, + q:"" }), methods:{ @@ -62,6 +65,9 @@ }, show(keyword){ this.$router.push({ name: 'images', query: { keyword: keyword.text }}) + }, + setfilter(){ + alert("not yet") } }, created:function(){ diff --git a/src/vue-poc/features/images/pics-01-store-directory.xq b/src/vue-poc/features/images/tasks/pics-01-store-directory.xq similarity index 96% rename from src/vue-poc/features/images/pics-01-store-directory.xq rename to src/vue-poc/features/images/tasks/pics-01-store-directory.xq index 0ef1421..6fce9b1 100644 --- a/src/vue-poc/features/images/pics-01-store-directory.xq +++ b/src/vue-poc/features/images/tasks/pics-01-store-directory.xq @@ -1,7 +1,7 @@ (:~ : create xml file list by scanning $SRC and write to vue-poc :) -import module namespace cfg = "quodatum:media.image.configure" at "config.xqm"; +import module namespace cfg = "quodatum:media.image.configure" at "../config.xqm"; import module namespace fw="quodatum:file.walker"; declare namespace c="http://www.w3.org/ns/xproc-step"; diff --git a/src/vue-poc/features/images/pics-02-store-meta.xq b/src/vue-poc/features/images/tasks/pics-02-store-meta.xq similarity index 98% rename from src/vue-poc/features/images/pics-02-store-meta.xq rename to src/vue-poc/features/images/tasks/pics-02-store-meta.xq index 04f2f2a..c32af56 100644 --- a/src/vue-poc/features/images/pics-02-store-meta.xq +++ b/src/vue-poc/features/images/tasks/pics-02-store-meta.xq @@ -3,7 +3,7 @@ : done in batches of 1000 : @return initial number of missing docs :) -import module namespace cfg = "quodatum:media.image.configure" at "config.xqm"; +import module namespace cfg = "quodatum:media.image.configure" at "../config.xqm"; import module namespace imgmeta = "expkg-zone58:image.metadata" ; declare namespace c="http://www.w3.org/ns/xproc-step"; diff --git a/src/vue-poc/features/images/pics-03-store-image.xq b/src/vue-poc/features/images/tasks/pics-03-store-image.xq similarity index 97% rename from src/vue-poc/features/images/pics-03-store-image.xq rename to src/vue-poc/features/images/tasks/pics-03-store-image.xq index 83ec7d3..17725b5 100644 --- a/src/vue-poc/features/images/pics-03-store-image.xq +++ b/src/vue-poc/features/images/tasks/pics-03-store-image.xq @@ -3,7 +3,7 @@ : -> :) import module namespace metadata = 'expkg-zone58:image.metadata'; -import module namespace cfg = "quodatum:media.image.configure" at "config.xqm"; +import module namespace cfg = "quodatum:media.image.configure" at "../config.xqm"; for $meta in collection($cfg:DB-IMAGE || "/meta")/metadata let $loc:=db:path($meta)=>tokenize("/") let $name:=$loc[count($loc)-1] diff --git a/src/vue-poc/features/images/pics-04-store-thumbs.xq b/src/vue-poc/features/images/tasks/pics-04-store-thumbs.xq similarity index 98% rename from src/vue-poc/features/images/pics-04-store-thumbs.xq rename to src/vue-poc/features/images/tasks/pics-04-store-thumbs.xq index 7ea1d3c..9083205 100644 --- a/src/vue-poc/features/images/pics-04-store-thumbs.xq +++ b/src/vue-poc/features/images/tasks/pics-04-store-thumbs.xq @@ -3,7 +3,7 @@ : @return initial number of missing docs :) import module namespace t="expkg-zone58:image.thumbnailator"; -import module namespace cfg = "quodatum:media.image.configure" at "config.xqm"; +import module namespace cfg = "quodatum:media.image.configure" at "../config.xqm"; declare namespace c="http://www.w3.org/ns/xproc-step"; declare variable $CHUNK:=1000; diff --git a/src/vue-poc/features/images/pics-05-set-original.xq b/src/vue-poc/features/images/tasks/pics-05-set-original.xq similarity index 92% rename from src/vue-poc/features/images/pics-05-set-original.xq rename to src/vue-poc/features/images/tasks/pics-05-set-original.xq index f4aa4d0..0e1455f 100644 --- a/src/vue-poc/features/images/pics-05-set-original.xq +++ b/src/vue-poc/features/images/tasks/pics-05-set-original.xq @@ -1,5 +1,5 @@ (:~ set original:) -import module namespace cfg = "quodatum:media.image.configure" at "config.xqm"; +import module namespace cfg = "quodatum:media.image.configure" at "../config.xqm"; for $i in collection($cfg:DB-IMAGE || "/image")/image where $i[file/@path=>contains('original')] diff --git a/src/vue-poc/features/images/pics-06-keywords.xq b/src/vue-poc/features/images/tasks/pics-06-keywords.xq similarity index 98% rename from src/vue-poc/features/images/pics-06-keywords.xq rename to src/vue-poc/features/images/tasks/pics-06-keywords.xq index 2347b1e..c2fcd52 100644 --- a/src/vue-poc/features/images/pics-06-keywords.xq +++ b/src/vue-poc/features/images/tasks/pics-06-keywords.xq @@ -4,7 +4,7 @@ : 14569796 14569818 : :) -import module namespace cfg = "quodatum:media.image.configure" at "config.xqm"; +import module namespace cfg = "quodatum:media.image.configure" at "../config.xqm"; declare %updating function local:put($data,$path){ db:replace($cfg:DB-IMAGE,$path,$data) }; diff --git a/src/vue-poc/features/images/pics-07-datetaken.xq b/src/vue-poc/features/images/tasks/pics-07-datetaken.xq similarity index 97% rename from src/vue-poc/features/images/pics-07-datetaken.xq rename to src/vue-poc/features/images/tasks/pics-07-datetaken.xq index 9b473fc..3f8ca9c 100644 --- a/src/vue-poc/features/images/pics-07-datetaken.xq +++ b/src/vue-poc/features/images/tasks/pics-07-datetaken.xq @@ -4,11 +4,12 @@ : 14569796 14569818 : :) -import module namespace cfg = "quodatum:media.image.configure" at "config.xqm"; +import module namespace cfg = "quodatum:media.image.configure" at "../config.xqm"; declare %updating function local:put($data,$path){ db:replace($cfg:DB-IMAGE,$path,$data) }; declare variable $DEST:="/datetaken.xml"; + let $dates:={ for $image in collection($cfg:DB-IMAGE || "/image")/image[not(@original)] let $year:=substring($image/datetaken,1,4) diff --git a/src/vue-poc/features/job/jobs.vue b/src/vue-poc/features/job/jobs.vue index 2ba2418..1dc61ae 100644 --- a/src/vue-poc/features/job/jobs.vue +++ b/src/vue-poc/features/job/jobs.vue @@ -14,7 +14,8 @@ single-line hide-details v-model="search" - > + > + add - + @@ -22,6 +22,15 @@ marker: L.latLng(54.320498718, -2.739663708) } }, + methods:{ + onResize(){ + var el=this.$refs["page"] + console.log("top",el.offsetTop) + var h=Math.max(1,window.innerHeight - el.offsetTop)-60 + console.log("h",h) + el.style.height=h +"px" + } + }, created:function(){ console.log("map") } diff --git a/src/vue-poc/features/svg.vue b/src/vue-poc/features/svg.vue index 066b69e..1bc3edd 100644 --- a/src/vue-poc/features/svg.vue +++ b/src/vue-poc/features/svg.vue @@ -1,7 +1,8 @@ diff --git a/src/vue-poc/features/tabs.vue b/src/vue-poc/features/tabs.vue index d7bf69a..7cb87ec 100644 --- a/src/vue-poc/features/tabs.vue +++ b/src/vue-poc/features/tabs.vue @@ -1,21 +1,7 @@