From 5a064b4e07381f06af3ee8f005ea930487aad9b2 Mon Sep 17 00:00:00 2001
From: voje <kristjan.voje@gmail.com>
Date: Fri, 5 Apr 2019 00:46:19 +0200
Subject: [PATCH] bring up your old project... you need the api structure!

---
 README.md                              | 4 ++--
 dockerfiles/database/mongodb-stack.yml | 2 +-
 src/pkg/valency/valency/Frame.py       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1d0b87d..ae7a01d 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ $ git submodule update
 Set db admin, user, pass, etc in 'Makefile'.  
 Spin up the database service and create users:  
 ```bash
-# $ make database-clean  # opt
+# $ make database-clean  # opt, removes docker services, not data
 $ make database-service
-$ make database-users
+$ make database-users  # only first time; user data persists too
 ```
 
 Populate the database with data form files:  
diff --git a/dockerfiles/database/mongodb-stack.yml b/dockerfiles/database/mongodb-stack.yml
index f16ddef..38ee183 100644
--- a/dockerfiles/database/mongodb-stack.yml
+++ b/dockerfiles/database/mongodb-stack.yml
@@ -11,7 +11,7 @@ services:
       MONGO_INITDB_ROOT_USERNAME: ${DB_ADM_USER}
       MONGO_INITDB_ROOT_PASSWORD: ${DB_ADM_PASS}
     volumes:
-      - ${HOME}/mongo_container/data/:/data/
+      - ${HOME}/mongo_container/data/:/data/db
 
   mongo-express:
     image: mongo-express
diff --git a/src/pkg/valency/valency/Frame.py b/src/pkg/valency/valency/Frame.py
index bc73801..9698936 100644
--- a/src/pkg/valency/valency/Frame.py
+++ b/src/pkg/valency/valency/Frame.py
@@ -28,7 +28,7 @@ def frames_from_db_entry(dbent):
                     tids=[_full_tid(srl["to"])]
                 ) for srl in srlarr
             ],
-            sentences=[dbent["tokens"]],
+            sentences=[(dbent["sid"], dbent["tokens"])], # [(ssj_id, {word: _, lemma: _, msd: _}), ...]
         )]
     return frames