diff --git a/Makefile b/Makefile
index deeadb5..01eac9c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,9 @@ MAKE_ROOT = $(shell pwd)
# (for each kres.xml file there is a kres.json file with srl tags)
SSJ_FILE = "$(MAKE_ROOT)/data/samples/ssj_example/ssj500k-sl.body.sample.xml"
KRES_FOLDER = "$(MAKE_ROOT)/data/samples/kres_example"
-KRES_SRL_FOLDER = "$(MAKE_ROOT)/data/kres_srl"
+# KRES_SRL_FOLDER = "/home/kristjan/kres_srl/final_json/" # t420
+KRES_SRL_FOLDER = "/home/voje/work_data/final_json" # work-pc
+
OUTPUT = "db"
OUTDIR = "/home/voje/workdir/test_out"
DBADDR = "0.0.0.0:27017" # don't use localhost
diff --git a/README.md b/README.md
index ae7a01d..2322cdd 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,9 @@ $ git submodule update
### Database (2 containers)
Set db admin, user, pass, etc in 'Makefile'.
Spin up the database service and create users:
+Make sure you create a folder for the data on host machine (see `mongodb-stack.yml` `volumes`.
```bash
+$ mkdir -p ${HOME}/mongo_container/data/ # default one
# $ make database-clean # opt, removes docker services, not data
$ make database-service
$ make database-users # only first time; user data persists too
diff --git a/src/frontend_vue/package-lock.json b/src/frontend_vue/package-lock.json
index 4416c52..a2a9f2f 100644
--- a/src/frontend_vue/package-lock.json
+++ b/src/frontend_vue/package-lock.json
@@ -116,7 +116,7 @@
"argparse": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
- "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
"dev": true,
"requires": {
"sprintf-js": "~1.0.2"
diff --git a/src/frontend_vue/src/components/Frame.vue b/src/frontend_vue/src/components/Frame.vue
index b4b3c94..303acf5 100644
--- a/src/frontend_vue/src/components/Frame.vue
+++ b/src/frontend_vue/src/components/Frame.vue
@@ -51,7 +51,7 @@
v-on:mouseleave="setHid()"
v-on:click="setSid(idx=null, tid=token[0])"
v-bind:title="token[1].msd"
- > {{ token[1].word }}
+ > {{ token[1].text }}
@@ -67,7 +67,7 @@
v-on:mouseleave="setHid()"
v-on:click="setSid(idx=null, tid=token[0])"
v-bind:title="token[1].msd"
- > {{ token[1].word }}
+ > {{ token[1].text }}
diff --git a/src/pkg/valency/valency/Frame.py b/src/pkg/valency/valency/Frame.py
index 9698936..970318f 100644
--- a/src/pkg/valency/valency/Frame.py
+++ b/src/pkg/valency/valency/Frame.py
@@ -28,7 +28,10 @@ def frames_from_db_entry(dbent):
tids=[_full_tid(srl["to"])]
) for srl in srlarr
],
- sentences=[(dbent["sid"], dbent["tokens"])], # [(ssj_id, {word: _, lemma: _, msd: _}), ...]
+ # sentences=[(dbent["sid"], dbent["tokens"])],
+ sentences=[
+ [(_full_tid(t["tid"]), t)for t in dbent["tokens"]],
+ ]
)]
return frames