From c1e2c06bac35d6916269c0f8cccce63ef7e016eb Mon Sep 17 00:00:00 2001
From: Valentin Rigal <rigal@teklia.com>
Date: Mon, 23 Nov 2020 11:20:31 +0100
Subject: [PATCH] Update tests and fixture
---
arkindex/documents/fixtures/data.json | 922 +++++++++---------
.../management/commands/build_fixtures.py | 15 +-
arkindex/users/api.py | 2 +-
arkindex/users/tests/test_membership.py | 15 +-
4 files changed, 480 insertions(+), 474 deletions(-)
diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json
index 5f772eec55..66ca52c088 100644
--- a/arkindex/documents/fixtures/data.json
+++ b/arkindex/documents/fixtures/data.json
@@ -1,33 +1,33 @@
[
{
"model": "dataimport.repository",
- "pk": "5a2c23dd-508c-4b0d-8ce7-211d87754538",
+ "pk": "6ebe4309-aa8d-4e40-af8f-6db4a0b086f7",
"fields": {
"url": "http://my_repo.fake/workers/worker",
"type": "worker",
"hook_token": "worker-hook-token",
- "credentials": "6abe974b-3544-45e9-86d6-1feb20da0db1",
+ "credentials": "9fb76b0e-6529-4c2c-acc4-02d616554102",
"provider_name": "GitLabProvider"
}
},
{
"model": "dataimport.repository",
- "pk": "74dd2cd8-e60d-4975-8f95-990f31bafe68",
+ "pk": "7a51c052-445a-4b37-80d1-2ffa8ca293b9",
"fields": {
"url": "http://gitlab/repo",
"type": "iiif",
"hook_token": "hook-token",
- "credentials": "6abe974b-3544-45e9-86d6-1feb20da0db1",
+ "credentials": "9fb76b0e-6529-4c2c-acc4-02d616554102",
"provider_name": "GitLabProvider"
}
},
{
"model": "dataimport.revision",
- "pk": "4e59a209-2043-4cf2-954f-b60ca4d74d5d",
+ "pk": "7a7a1e1d-d1e3-4ea8-a2bb-60ba4af7cab9",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "repo": "74dd2cd8-e60d-4975-8f95-990f31bafe68",
+ "repo": "7a51c052-445a-4b37-80d1-2ffa8ca293b9",
"hash": "42",
"message": "a",
"author": "me"
@@ -35,11 +35,11 @@
},
{
"model": "dataimport.revision",
- "pk": "632cd743-ebec-40d0-8416-5bfb5836a40c",
+ "pk": "ffb8a683-836f-4e6a-a59b-17062885330f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "repo": "5a2c23dd-508c-4b0d-8ce7-211d87754538",
+ "repo": "6ebe4309-aa8d-4e40-af8f-6db4a0b086f7",
"hash": "1337",
"message": "My w0rk3r",
"author": "Test user"
@@ -47,80 +47,91 @@
},
{
"model": "dataimport.worker",
- "pk": "d3d654e9-9108-4ea2-bbf2-b94c7bf2ab92",
+ "pk": "1f70863f-fe00-42e9-b8b1-905fa8d88aac",
"fields": {
"name": "Recognizer",
"slug": "reco",
"type": "recognizer",
- "repository": "5a2c23dd-508c-4b0d-8ce7-211d87754538"
+ "repository": "6ebe4309-aa8d-4e40-af8f-6db4a0b086f7"
}
},
{
"model": "dataimport.worker",
- "pk": "ff456d02-9297-480c-b80e-e56055caaa4b",
+ "pk": "851c8902-ca57-42ff-9f16-06b6a8317bbd",
"fields": {
"name": "Document layout analyser",
"slug": "dla",
"type": "dla",
- "repository": "5a2c23dd-508c-4b0d-8ce7-211d87754538"
+ "repository": "6ebe4309-aa8d-4e40-af8f-6db4a0b086f7"
}
},
{
"model": "dataimport.workerversion",
- "pk": "50aaac3b-3326-4e7f-b07e-0c10c712cb48",
+ "pk": "5aeac49b-03b7-4c1c-8593-9d2e27b6a6df",
"fields": {
- "worker": "d3d654e9-9108-4ea2-bbf2-b94c7bf2ab92",
- "revision": "632cd743-ebec-40d0-8416-5bfb5836a40c",
+ "worker": "851c8902-ca57-42ff-9f16-06b6a8317bbd",
+ "revision": "ffb8a683-836f-4e6a-a59b-17062885330f",
"configuration": {
"test": 42
},
"state": "available",
- "docker_image": "4376763a-6f39-4bcd-adfd-aa59def40f75",
+ "docker_image": "b795d482-d08d-4599-ae82-db16ea4331e8",
"docker_image_iid": null
}
},
{
"model": "dataimport.workerversion",
- "pk": "f4affadd-77eb-4e97-a4ed-5c1605f22fdd",
+ "pk": "db7dc219-1cc6-4f2a-a372-14a42e76cf0d",
"fields": {
- "worker": "ff456d02-9297-480c-b80e-e56055caaa4b",
- "revision": "632cd743-ebec-40d0-8416-5bfb5836a40c",
+ "worker": "1f70863f-fe00-42e9-b8b1-905fa8d88aac",
+ "revision": "ffb8a683-836f-4e6a-a59b-17062885330f",
"configuration": {
"test": 42
},
"state": "available",
- "docker_image": "4376763a-6f39-4bcd-adfd-aa59def40f75",
+ "docker_image": "b795d482-d08d-4599-ae82-db16ea4331e8",
"docker_image_iid": null
}
},
{
"model": "documents.corpus",
- "pk": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
+ "pk": "dab98946-799e-415f-abcb-869cf1bda854",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"name": "Unit Tests",
"description": "",
- "repository": "74dd2cd8-e60d-4975-8f95-990f31bafe68",
+ "repository": "7a51c052-445a-4b37-80d1-2ffa8ca293b9",
"public": true
}
},
{
"model": "documents.elementtype",
- "pk": "40718c43-3e6c-4104-bbec-2e1535100d62",
+ "pk": "46ea8eee-f118-4706-a288-084bb64bcee0",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "slug": "volume",
- "display_name": "Volume",
- "folder": true,
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "slug": "surface",
+ "display_name": "Surface",
+ "folder": false,
"allowed_transcription": null
}
},
{
"model": "documents.elementtype",
- "pk": "acc69b60-94be-41dd-9cab-0fa36f47ba6b",
+ "pk": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "fields": {
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "slug": "word",
+ "display_name": "Word",
+ "folder": false,
+ "allowed_transcription": "word"
+ }
+},
+{
+ "model": "documents.elementtype",
+ "pk": "729a81f4-e38e-4e79-b2dc-eafbd00b447e",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
"slug": "act",
"display_name": "Act",
"folder": false,
@@ -129,9 +140,9 @@
},
{
"model": "documents.elementtype",
- "pk": "ad8b6fdd-ffa6-46f1-a2e8-474f5fc48385",
+ "pk": "7b5938ee-dc1e-4e37-890a-1e5988e99099",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
"slug": "page",
"display_name": "Page",
"folder": false,
@@ -140,9 +151,9 @@
},
{
"model": "documents.elementtype",
- "pk": "c200eb82-8774-469f-bdaa-37a93dd383c3",
+ "pk": "97ec5a9a-06fc-4d72-8a11-f107b76af6f2",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
"slug": "text_line",
"display_name": "Line",
"folder": false,
@@ -151,319 +162,308 @@
},
{
"model": "documents.elementtype",
- "pk": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "slug": "word",
- "display_name": "Word",
- "folder": false,
- "allowed_transcription": "word"
- }
-},
-{
- "model": "documents.elementtype",
- "pk": "f39c8521-5f42-45da-8d92-e14db9d7c633",
+ "pk": "dc3affbd-6a01-4aea-abce-c9f322698254",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "slug": "surface",
- "display_name": "Surface",
- "folder": false,
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "slug": "volume",
+ "display_name": "Volume",
+ "folder": true,
"allowed_transcription": null
}
},
{
"model": "documents.elementpath",
- "pk": "0894cb53-51b4-4bcd-b8d9-d647544eda49",
+ "pk": "0aacf1f9-41d7-4dfc-9d2a-b903e63f035d",
"fields": {
- "element": "b6557330-a08e-4d30-82a8-8a25973e2608",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"8e4dfe5b-82dd-484d-b43b-3a26a53e166b\"]",
+ "element": "a1c3c97c-2240-4c00-961e-12ca69b627a0",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
"ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "0936571e-d0f7-4b6f-9072-d5624155e0ce",
+ "pk": "134b9415-c240-4d55-beb0-9adec4b138f8",
"fields": {
- "element": "8e4dfe5b-82dd-484d-b43b-3a26a53e166b",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
+ "element": "525de37a-190f-4760-b831-4bf9bd4909f5",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "09e4a8f3-db61-41f8-a061-a44c3cef6c60",
+ "pk": "32b3ceb2-a64e-48d6-9429-8b5acdb953a5",
"fields": {
- "element": "c7111377-babd-4f65-a4cf-6def12e2fbfb",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"dd689af0-3e85-48b2-a5fd-02c5d374ae6a\"]",
+ "element": "bcfc8f66-d7a5-48bb-a17e-f08b209911c0",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"bf4d6982-d8c0-4b81-8f49-3352d2ac90ee\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "12015f7f-17e9-4b6e-8ffb-f0fe3b258555",
+ "pk": "50d6646e-c7e3-4c02-a843-aa66abcbc264",
"fields": {
- "element": "8d429c18-4efc-4bcd-b8b6-c1635ab52c1f",
- "path": "[\"a0606084-62ed-46cf-b850-3247d8568b7a\"]",
- "ordering": 2
+ "element": "edb4eec4-4860-446a-977e-acf83c031df9",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"1b2a3adb-3740-49d3-95e7-ce14dfc7da93\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "1fe5a90c-ca43-4682-ac96-866edf10ecb2",
+ "pk": "5e770ea3-3e6f-4f9c-b433-92b2c86da2c8",
"fields": {
- "element": "fa9dfb8a-a2df-4992-987a-6f0f5c851a8e",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"8e4dfe5b-82dd-484d-b43b-3a26a53e166b\"]",
- "ordering": 0
+ "element": "0f83e510-f4f6-4048-86a4-f314c7f88223",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
+ "ordering": 4
}
},
{
"model": "documents.elementpath",
- "pk": "21008483-3d35-4c24-a3fa-beb5a175f35e",
+ "pk": "5e802dbb-4877-410a-b136-52c9438d03d5",
"fields": {
- "element": "0d0819a6-4084-4bda-adec-40e2f37d5f26",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
- "ordering": 3
+ "element": "e9e92536-f98a-4dad-bb7e-0aa7e486b894",
+ "path": "[\"bb910784-dcb4-4b26-aab0-916313c3eb91\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "251e8c6d-c2a7-413e-8c49-d7754987ba5e",
+ "pk": "6ec3009d-e3ec-41dd-9f27-291f2aeca87b",
"fields": {
- "element": "7f4a52ce-2089-4525-ad9d-a1123f1478b9",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"b1b8d51e-22a5-4e64-b315-42c30f6afda1\"]",
- "ordering": 0
+ "element": "408ff192-649a-4f93-9a1a-0603641b4725",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "25d8db5c-48d4-4e1f-a0ed-3dc6e7f10227",
+ "pk": "6fa0b074-35f6-44f2-bf90-585c410cf550",
"fields": {
- "element": "17d521df-cd89-493d-9072-80d377d0ca47",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"e88ef3cd-f032-46c9-9342-62141b80f221\"]",
- "ordering": 1
+ "element": "6e829b5f-2f51-4c93-babb-418d5f01c8b0",
+ "path": "[\"bb910784-dcb4-4b26-aab0-916313c3eb91\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "273b6b54-663b-418a-af13-21d07a642f0b",
+ "pk": "73da7671-4e08-478a-9b89-066e5428ac58",
"fields": {
- "element": "1a693d55-8654-4ac1-97bc-6d9a91623429",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"8e4dfe5b-82dd-484d-b43b-3a26a53e166b\"]",
- "ordering": 2
+ "element": "a965eed2-b66c-41ec-b8fe-a9fab12eee9e",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"bf4d6982-d8c0-4b81-8f49-3352d2ac90ee\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "385e3836-9c20-457f-9154-d0b2ea0ad022",
+ "pk": "74b57d81-ebf5-4135-a82b-6aabc4e74840",
"fields": {
- "element": "0967069c-868f-40fe-ab47-79c94ee0de2f",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
- "ordering": 2
+ "element": "eb3bb68f-918b-4b90-90f2-27df023e4772",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"a1c3c97c-2240-4c00-961e-12ca69b627a0\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "40066d01-c599-4e9c-bad9-fc79c25367fb",
+ "pk": "8370b7f0-be3b-4e83-937b-b7b383485536",
"fields": {
- "element": "79a1b80e-87ec-4760-8a39-15661d7bf8ed",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"e88ef3cd-f032-46c9-9342-62141b80f221\"]",
+ "element": "af5f778a-0b86-4422-8594-91de359aa795",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"525de37a-190f-4760-b831-4bf9bd4909f5\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "42284795-c423-4f61-ae2d-eec8e4ea9208",
+ "pk": "8c278e8f-8690-4e6f-adf2-560de42e18de",
"fields": {
- "element": "c3ce087e-01e3-405d-b8ba-84446b8457f6",
- "path": "[\"a0606084-62ed-46cf-b850-3247d8568b7a\"]",
- "ordering": 0
+ "element": "1b2a3adb-3740-49d3-95e7-ce14dfc7da93",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
+ "ordering": 3
}
},
{
"model": "documents.elementpath",
- "pk": "4a5baf00-833d-4bfd-8e9a-14bf4acbd559",
+ "pk": "90949826-ca71-42cc-ad6e-3c3c91563f3f",
"fields": {
- "element": "b1b8d51e-22a5-4e64-b315-42c30f6afda1",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
+ "element": "2b33730b-a381-4a99-9463-b4faeb9bfde2",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"ce0dc249-37ee-4e2e-89a4-d1383b25ff8c\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "58e46a58-173e-4b3e-b140-9f85c19064da",
+ "pk": "93a66f20-d5de-4588-b198-20aa3dfb4fc2",
"fields": {
- "element": "37b44320-93a9-4252-8a7e-d8330e2adea9",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
- "ordering": 2
+ "element": "ce0dc249-37ee-4e2e-89a4-d1383b25ff8c",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "6fd56c71-25b8-4eb2-8d79-ea09c8cf8a04",
+ "pk": "95cafbdd-7201-41b0-aeca-76580be557c0",
"fields": {
- "element": "2c54f500-19c0-4d38-a3d0-ff954460766a",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"25856ede-a876-425f-a65e-f105dc5b8aea\"]",
- "ordering": 1
+ "element": "a22c9f39-95df-45de-98b9-59a9f358611d",
+ "path": "[\"bb910784-dcb4-4b26-aab0-916313c3eb91\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "7c4e2ac9-7d4e-48ee-a85c-6c9d8ff3abb8",
+ "pk": "9e3798f8-c75a-4a5e-a989-a39c1dc43213",
"fields": {
- "element": "0090a8fc-4030-49c1-afeb-a8e8991d594b",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"0967069c-868f-40fe-ab47-79c94ee0de2f\"]",
- "ordering": 0
+ "element": "d489659c-9c67-4fb9-8758-cf70f6750e18",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"408ff192-649a-4f93-9a1a-0603641b4725\"]",
+ "ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "87516a9a-fd56-4ee8-a0ce-f848a04b7244",
+ "pk": "a0c38196-4285-452b-9956-31edf88714ea",
"fields": {
- "element": "25856ede-a876-425f-a65e-f105dc5b8aea",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
+ "element": "2b269b30-fda3-4630-9784-b1c3b9a0d77f",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"bf4d6982-d8c0-4b81-8f49-3352d2ac90ee\"]",
"ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "8826d0e6-a422-4872-9e5e-2591b625e0bf",
+ "pk": "b1d6b0a2-b1ee-4b89-b4fb-7b93f63b6aad",
"fields": {
- "element": "3c042bc5-c90f-4f03-baa3-6cd0dc15b0c3",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"37b44320-93a9-4252-8a7e-d8330e2adea9\"]",
+ "element": "9c860370-6242-4ef9-87ea-351caa3a22e4",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"408ff192-649a-4f93-9a1a-0603641b4725\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "98958e72-54b2-482b-860c-018e488872e4",
+ "pk": "b46d58cd-4f4b-4731-99b6-447a6373a391",
"fields": {
- "element": "0335b1d8-e3bd-4e33-8541-363322dd278e",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"8e4dfe5b-82dd-484d-b43b-3a26a53e166b\"]",
+ "element": "651fd593-e5ef-4f9a-b5cf-75630a5a0eb3",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"1a9d2c4e-9bf8-4c14-896f-b498de08a082\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "a10d3ad1-93f2-4e9e-92e2-b46d6de2c32a",
+ "pk": "b710f950-71eb-46ac-b24e-18df836993a1",
"fields": {
- "element": "653c3be3-6236-4d8f-962f-b3adac214dc9",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"37b44320-93a9-4252-8a7e-d8330e2adea9\"]",
+ "element": "adfcdb63-1bec-4b44-a855-3dd765dda5d8",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"408ff192-649a-4f93-9a1a-0603641b4725\"]",
"ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "b827a973-539a-4f2b-ab21-aed3ddb65892",
+ "pk": "cf828aca-1205-4407-b261-87f3bf8d767e",
"fields": {
- "element": "28cbab98-215c-46fa-96a4-6f3341720ade",
- "path": "[\"a0606084-62ed-46cf-b850-3247d8568b7a\"]",
+ "element": "03e444f2-63ca-47ae-9928-efd8c790a485",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"ce0dc249-37ee-4e2e-89a4-d1383b25ff8c\"]",
"ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "bf7f7112-0bc4-4dff-9214-d116d967f65c",
+ "pk": "d17a8748-6fbb-4d09-a2c5-ee452d854208",
"fields": {
- "element": "0db70aca-8129-4f78-a9af-9c985cd4b1bb",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"0d0819a6-4084-4bda-adec-40e2f37d5f26\"]",
- "ordering": 0
+ "element": "03d374b1-6560-438c-9fde-4e88051ab3e1",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"a1c3c97c-2240-4c00-961e-12ca69b627a0\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "ca4a5af7-f6ff-48d6-bd83-528acac980f2",
+ "pk": "d1a5a6a4-7f2e-4c5a-bb16-a4909f081bb9",
"fields": {
- "element": "dd689af0-3e85-48b2-a5fd-02c5d374ae6a",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
- "ordering": 4
+ "element": "e4205894-9169-4fee-9823-e0bbc61e8724",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"bf4d6982-d8c0-4b81-8f49-3352d2ac90ee\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "cf84102e-b3cb-4b09-9848-a289f9915989",
+ "pk": "e4dfe612-52d5-4828-b60d-97cb7c4572dc",
"fields": {
- "element": "05526d69-40f0-4907-82be-5425d134ba81",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"25856ede-a876-425f-a65e-f105dc5b8aea\"]",
+ "element": "f2be38ee-c57c-4935-bf40-c15723f4e793",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"0f83e510-f4f6-4048-86a4-f314c7f88223\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "dcdecd2c-c64e-4b53-96a1-2abaf3947627",
+ "pk": "ec4d9260-038d-480c-b089-10ceed6b009d",
"fields": {
- "element": "c747d32d-ac58-4a70-be45-6cd67138de7f",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"37b44320-93a9-4252-8a7e-d8330e2adea9\"]",
- "ordering": 1
+ "element": "7393f32f-1bb4-4a00-a7e6-7a05659423ea",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\", \"a1c3c97c-2240-4c00-961e-12ca69b627a0\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "e7a75d28-b5f7-4658-9633-f85a343b4987",
+ "pk": "f1834c5f-6535-490d-8922-b37ee621b325",
"fields": {
- "element": "e88ef3cd-f032-46c9-9342-62141b80f221",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\"]",
- "ordering": 1
+ "element": "1a9d2c4e-9bf8-4c14-896f-b498de08a082",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "fff496bd-8770-427c-bdd7-66a7e4a8326d",
+ "pk": "f667cee8-8beb-4afe-98ce-924f8607a0eb",
"fields": {
- "element": "84cd373d-9b6c-4c06-85aa-0bcc0cefca3a",
- "path": "[\"f8ced3cd-2f55-4e2e-95d7-320ae34c1892\", \"e88ef3cd-f032-46c9-9342-62141b80f221\"]",
- "ordering": 2
+ "element": "bf4d6982-d8c0-4b81-8f49-3352d2ac90ee",
+ "path": "[\"5d4887e4-a9bd-4d75-aa82-0c63a40be1ee\"]",
+ "ordering": 0
}
},
{
"model": "documents.element",
- "pk": "0090a8fc-4030-49c1-afeb-a8e8991d594b",
+ "pk": "03d374b1-6560-438c-9fde-4e88051ab3e1",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "f39c8521-5f42-45da-8d92-e14db9d7c633",
- "name": "Surface D",
- "zone": "e45a50dc-cd76-42a8-9044-2c33f23bafa7",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "DATUM",
+ "zone": "8dc267fe-76ab-4e76-9b0a-3009b57b2ab2",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "0335b1d8-e3bd-4e33-8541-363322dd278e",
+ "pk": "03e444f2-63ca-47ae-9928-efd8c790a485",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "PARIS",
- "zone": "6a42e73e-97d7-4bef-918f-5a8fef86bd9f",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "46ea8eee-f118-4706-a288-084bb64bcee0",
+ "name": "Surface C",
+ "zone": "2478f4f6-5c23-43dc-99c5-422b5338f3b0",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "05526d69-40f0-4907-82be-5425d134ba81",
+ "pk": "0f83e510-f4f6-4048-86a4-f314c7f88223",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "f39c8521-5f42-45da-8d92-e14db9d7c633",
- "name": "Surface B",
- "zone": "6970185e-813e-488e-88b5-08f4be0894f7",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "729a81f4-e38e-4e79-b2dc-eafbd00b447e",
+ "name": "Act 5",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "0967069c-868f-40fe-ab47-79c94ee0de2f",
+ "pk": "1a9d2c4e-9bf8-4c14-896f-b498de08a082",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "acc69b60-94be-41dd-9cab-0fa36f47ba6b",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "729a81f4-e38e-4e79-b2dc-eafbd00b447e",
"name": "Act 3",
"zone": null,
"source": null,
@@ -472,12 +472,12 @@
},
{
"model": "documents.element",
- "pk": "0d0819a6-4084-4bda-adec-40e2f37d5f26",
+ "pk": "1b2a3adb-3740-49d3-95e7-ce14dfc7da93",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "acc69b60-94be-41dd-9cab-0fa36f47ba6b",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "729a81f4-e38e-4e79-b2dc-eafbd00b447e",
"name": "Act 4",
"zone": null,
"source": null,
@@ -486,55 +486,55 @@
},
{
"model": "documents.element",
- "pk": "0db70aca-8129-4f78-a9af-9c985cd4b1bb",
+ "pk": "2b269b30-fda3-4630-9784-b1c3b9a0d77f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "f39c8521-5f42-45da-8d92-e14db9d7c633",
- "name": "Surface E",
- "zone": "5a9d773d-041e-454a-a608-9e5c47cd8102",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "ROY",
+ "zone": "14c535d6-7b24-4366-a19c-4e56f3a7d073",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "17d521df-cd89-493d-9072-80d377d0ca47",
+ "pk": "2b33730b-a381-4a99-9463-b4faeb9bfde2",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "ROY",
- "zone": "8a830271-750f-4c62-b66a-203d2c2bf7fb",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "46ea8eee-f118-4706-a288-084bb64bcee0",
+ "name": "Surface B",
+ "zone": "2aedf0c1-ca2d-403a-9760-ed649271e3c3",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "1a693d55-8654-4ac1-97bc-6d9a91623429",
+ "pk": "408ff192-649a-4f93-9a1a-0603641b4725",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "DATUM",
- "zone": "b23f1366-50ff-4654-9677-74b063b22f63",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "7b5938ee-dc1e-4e37-890a-1e5988e99099",
+ "name": "Volume 1, page 2r",
+ "zone": "ea52165e-7d7d-41af-b29f-b8774955626a",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "25856ede-a876-425f-a65e-f105dc5b8aea",
+ "pk": "525de37a-190f-4760-b831-4bf9bd4909f5",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "acc69b60-94be-41dd-9cab-0fa36f47ba6b",
- "name": "Act 2",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "729a81f4-e38e-4e79-b2dc-eafbd00b447e",
+ "name": "Act 1",
"zone": null,
"source": null,
"worker_version": null
@@ -542,152 +542,152 @@
},
{
"model": "documents.element",
- "pk": "28cbab98-215c-46fa-96a4-6f3341720ade",
+ "pk": "5d4887e4-a9bd-4d75-aa82-0c63a40be1ee",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "ad8b6fdd-ffa6-46f1-a2e8-474f5fc48385",
- "name": "Volume 2, page 1v",
- "zone": "bfab7afe-7eee-46d4-a7e1-76917a956b98",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "dc3affbd-6a01-4aea-abce-c9f322698254",
+ "name": "Volume 1",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "2c54f500-19c0-4d38-a3d0-ff954460766a",
+ "pk": "651fd593-e5ef-4f9a-b5cf-75630a5a0eb3",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "f39c8521-5f42-45da-8d92-e14db9d7c633",
- "name": "Surface C",
- "zone": "f8c4d167-c6b2-4a69-9181-88055de061e4",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "46ea8eee-f118-4706-a288-084bb64bcee0",
+ "name": "Surface D",
+ "zone": "e41a5920-3078-4772-a83d-e05f05a9678f",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "37b44320-93a9-4252-8a7e-d8330e2adea9",
+ "pk": "6e829b5f-2f51-4c93-babb-418d5f01c8b0",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "ad8b6fdd-ffa6-46f1-a2e8-474f5fc48385",
- "name": "Volume 1, page 2r",
- "zone": "59a46750-85b6-4514-af3b-fda091954e23",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "7b5938ee-dc1e-4e37-890a-1e5988e99099",
+ "name": "Volume 2, page 1r",
+ "zone": "81408598-4522-4df6-856f-293d75d3390b",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "3c042bc5-c90f-4f03-baa3-6cd0dc15b0c3",
+ "pk": "7393f32f-1bb4-4a00-a7e6-7a05659423ea",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
"name": "PARIS",
- "zone": "54772ebe-a2ef-426a-96ad-20b850e6bd54",
+ "zone": "65fc5f42-bbf9-4ff2-90f8-0ffb43a16b52",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "653c3be3-6236-4d8f-962f-b3adac214dc9",
+ "pk": "9c860370-6242-4ef9-87ea-351caa3a22e4",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "DATUM",
- "zone": "7a43719f-fc6c-4464-a58d-b3cee9e26821",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "PARIS",
+ "zone": "47677898-aafc-42b6-aec8-2767442838a7",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "79a1b80e-87ec-4760-8a39-15661d7bf8ed",
+ "pk": "a1c3c97c-2240-4c00-961e-12ca69b627a0",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "PARIS",
- "zone": "06bcf646-41f0-4d61-baaf-ee96235ce796",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "7b5938ee-dc1e-4e37-890a-1e5988e99099",
+ "name": "Volume 1, page 1v",
+ "zone": "2478f4f6-5c23-43dc-99c5-422b5338f3b0",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "7f4a52ce-2089-4525-ad9d-a1123f1478b9",
+ "pk": "a22c9f39-95df-45de-98b9-59a9f358611d",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "f39c8521-5f42-45da-8d92-e14db9d7c633",
- "name": "Surface A",
- "zone": "f9d2df00-295e-4338-8933-3047dbac3f5c",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "7b5938ee-dc1e-4e37-890a-1e5988e99099",
+ "name": "Volume 2, page 2r",
+ "zone": "4d348752-c9c3-4c40-9924-fb0b78bde96a",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "84cd373d-9b6c-4c06-85aa-0bcc0cefca3a",
+ "pk": "a965eed2-b66c-41ec-b8fe-a9fab12eee9e",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "DATUM",
- "zone": "582f8f69-83ba-4a0d-8dc9-ac5830f61e6b",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "97ec5a9a-06fc-4d72-8a11-f107b76af6f2",
+ "name": "Text line",
+ "zone": "14c535d6-7b24-4366-a19c-4e56f3a7d073",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "8d429c18-4efc-4bcd-b8b6-c1635ab52c1f",
+ "pk": "adfcdb63-1bec-4b44-a855-3dd765dda5d8",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "ad8b6fdd-ffa6-46f1-a2e8-474f5fc48385",
- "name": "Volume 2, page 2r",
- "zone": "7eaaa88c-31d5-4a26-90db-9bde2c793a09",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "DATUM",
+ "zone": "ca0b6bd5-75d4-4ec2-b559-5a5919354e29",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "8e4dfe5b-82dd-484d-b43b-3a26a53e166b",
+ "pk": "af5f778a-0b86-4422-8594-91de359aa795",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "ad8b6fdd-ffa6-46f1-a2e8-474f5fc48385",
- "name": "Volume 1, page 1r",
- "zone": "716e8627-286e-4933-aa77-4607192ffcd4",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "46ea8eee-f118-4706-a288-084bb64bcee0",
+ "name": "Surface A",
+ "zone": "8f507e13-1f0e-43f4-84ce-44f55fcf187f",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "a0606084-62ed-46cf-b850-3247d8568b7a",
+ "pk": "bb910784-dcb4-4b26-aab0-916313c3eb91",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "40718c43-3e6c-4104-bbec-2e1535100d62",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "dc3affbd-6a01-4aea-abce-c9f322698254",
"name": "Volume 2",
"zone": null,
"source": null,
@@ -696,133 +696,133 @@
},
{
"model": "documents.element",
- "pk": "b1b8d51e-22a5-4e64-b315-42c30f6afda1",
+ "pk": "bcfc8f66-d7a5-48bb-a17e-f08b209911c0",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "acc69b60-94be-41dd-9cab-0fa36f47ba6b",
- "name": "Act 1",
- "zone": null,
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "PARIS",
+ "zone": "d885b67c-01fc-4254-9eea-81da4ec62102",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "b6557330-a08e-4d30-82a8-8a25973e2608",
+ "pk": "bf4d6982-d8c0-4b81-8f49-3352d2ac90ee",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "ROY",
- "zone": "116acf5e-6735-4860-a1f9-11aa72a02feb",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "7b5938ee-dc1e-4e37-890a-1e5988e99099",
+ "name": "Volume 1, page 1r",
+ "zone": "c8fc9430-cdd3-46ce-a045-957c8132b4d2",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "c3ce087e-01e3-405d-b8ba-84446b8457f6",
+ "pk": "ce0dc249-37ee-4e2e-89a4-d1383b25ff8c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "ad8b6fdd-ffa6-46f1-a2e8-474f5fc48385",
- "name": "Volume 2, page 1r",
- "zone": "f780ae66-a1fa-474f-b811-71c35ff0e3a6",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "729a81f4-e38e-4e79-b2dc-eafbd00b447e",
+ "name": "Act 2",
+ "zone": null,
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "c7111377-babd-4f65-a4cf-6def12e2fbfb",
+ "pk": "d489659c-9c67-4fb9-8758-cf70f6750e18",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "f39c8521-5f42-45da-8d92-e14db9d7c633",
- "name": "Surface F",
- "zone": "58dd01a9-e6e2-4516-88dd-7c61e821ddc4",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "ROY",
+ "zone": "ca56ae53-3a8b-4064-bef4-482773738b29",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "c747d32d-ac58-4a70-be45-6cd67138de7f",
+ "pk": "e4205894-9169-4fee-9823-e0bbc61e8724",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "d6195123-f556-42cf-8a74-e5f97a4f84e6",
- "name": "ROY",
- "zone": "4c34f35c-53e5-4f92-a14e-4e3e12a6321d",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "DATUM",
+ "zone": "6c7a21b2-5a54-4226-9b0b-a66eaea2caf8",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "dd689af0-3e85-48b2-a5fd-02c5d374ae6a",
+ "pk": "e9e92536-f98a-4dad-bb7e-0aa7e486b894",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "acc69b60-94be-41dd-9cab-0fa36f47ba6b",
- "name": "Act 5",
- "zone": null,
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "7b5938ee-dc1e-4e37-890a-1e5988e99099",
+ "name": "Volume 2, page 1v",
+ "zone": "26195a0d-1dcb-44a4-b01f-6ac80fab95f6",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "e88ef3cd-f032-46c9-9342-62141b80f221",
+ "pk": "eb3bb68f-918b-4b90-90f2-27df023e4772",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "ad8b6fdd-ffa6-46f1-a2e8-474f5fc48385",
- "name": "Volume 1, page 1v",
- "zone": "f8c4d167-c6b2-4a69-9181-88055de061e4",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "5f84f077-bd8f-4d7f-ab18-e8388fcf0325",
+ "name": "ROY",
+ "zone": "29d50e92-b7ef-462b-875d-3bb74506898c",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "f8ced3cd-2f55-4e2e-95d7-320ae34c1892",
+ "pk": "edb4eec4-4860-446a-977e-acf83c031df9",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "40718c43-3e6c-4104-bbec-2e1535100d62",
- "name": "Volume 1",
- "zone": null,
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "46ea8eee-f118-4706-a288-084bb64bcee0",
+ "name": "Surface E",
+ "zone": "0a23bba3-71a6-4511-8e80-e5b153e7d914",
"source": null,
"worker_version": null
}
},
{
"model": "documents.element",
- "pk": "fa9dfb8a-a2df-4992-987a-6f0f5c851a8e",
+ "pk": "f2be38ee-c57c-4935-bf40-c15723f4e793",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "c200eb82-8774-469f-bdaa-37a93dd383c3",
- "name": "Text line",
- "zone": "116acf5e-6735-4860-a1f9-11aa72a02feb",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "46ea8eee-f118-4706-a288-084bb64bcee0",
+ "name": "Surface F",
+ "zone": "a45cba6e-5304-4e60-a6c3-79c1627ded89",
"source": null,
"worker_version": null
}
},
{
"model": "documents.datasource",
- "pk": "2cb86f55-1760-495d-8574-ed42ba6962ad",
+ "pk": "210c9e45-2f4c-4b42-8596-4ddfada0e56c",
"fields": {
"type": "classifier",
"slug": "test",
@@ -833,7 +833,7 @@
},
{
"model": "documents.datasource",
- "pk": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "pk": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"fields": {
"type": "recognizer",
"slug": "test",
@@ -844,11 +844,11 @@
},
{
"model": "documents.transcription",
- "pk": "016f4609-6d40-4944-81bf-75ceb745fce6",
+ "pk": "009949b6-12c2-4562-9a9e-16d8235e0fae",
"fields": {
- "element": "653c3be3-6236-4d8f-962f-b3adac214dc9",
+ "element": "03d374b1-6560-438c-9fde-4e88051ab3e1",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
"text": "DATUM",
"score": 1.0
@@ -856,59 +856,59 @@
},
{
"model": "documents.transcription",
- "pk": "058bf8cd-37fd-4556-acf5-74cec4c45697",
+ "pk": "1dab3b99-b2a9-4838-b560-492ec24c4973",
"fields": {
- "element": "79a1b80e-87ec-4760-8a39-15661d7bf8ed",
+ "element": "2b269b30-fda3-4630-9784-b1c3b9a0d77f",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
- "text": "PARIS",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "05bea906-7a22-45a6-8e3c-6430e41b319d",
+ "pk": "1e452fbf-6e4a-4e1c-9316-8cc2be2f0de0",
"fields": {
- "element": "8e4dfe5b-82dd-484d-b43b-3a26a53e166b",
- "type": "page",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "element": "9c860370-6242-4ef9-87ea-351caa3a22e4",
+ "type": "word",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
- "text": "Lorem ipsum dolor sit amet",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "0b797792-44dc-432e-91d9-d69f90087ac0",
+ "pk": "2ee46985-d7d3-46ee-93ec-85563c3d8dc9",
"fields": {
- "element": "c747d32d-ac58-4a70-be45-6cd67138de7f",
+ "element": "adfcdb63-1bec-4b44-a855-3dd765dda5d8",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
- "text": "ROY",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "27b7069d-5abc-4a5d-8484-8e948f2dfd4d",
+ "pk": "310a14c6-65e9-4f2c-baff-8a0ecce01f54",
"fields": {
- "element": "b6557330-a08e-4d30-82a8-8a25973e2608",
- "type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "element": "bf4d6982-d8c0-4b81-8f49-3352d2ac90ee",
+ "type": "page",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
- "text": "ROY",
+ "text": "Lorem ipsum dolor sit amet",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "6504bbfc-cef5-402a-9af3-f2a2c8c942a4",
+ "pk": "7e7901a0-a1bc-47a2-b2ff-6465fca06490",
"fields": {
- "element": "3c042bc5-c90f-4f03-baa3-6cd0dc15b0c3",
+ "element": "bcfc8f66-d7a5-48bb-a17e-f08b209911c0",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
"text": "PARIS",
"score": 1.0
@@ -916,11 +916,11 @@
},
{
"model": "documents.transcription",
- "pk": "6cc3b967-4829-4c48-ab26-0fced374ea36",
+ "pk": "99c6d35f-5270-4d8e-8811-13dd21aa2a2a",
"fields": {
- "element": "17d521df-cd89-493d-9072-80d377d0ca47",
+ "element": "eb3bb68f-918b-4b90-90f2-27df023e4772",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
"text": "ROY",
"score": 1.0
@@ -928,75 +928,75 @@
},
{
"model": "documents.transcription",
- "pk": "773db455-a943-426b-b09b-1546c00d5da0",
+ "pk": "a572e06e-ba12-4609-a797-e64b2cf39def",
"fields": {
- "element": "1a693d55-8654-4ac1-97bc-6d9a91623429",
+ "element": "d489659c-9c67-4fb9-8758-cf70f6750e18",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
- "text": "DATUM",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "a3bcf442-09d5-45d2-b402-6faaf3232a79",
+ "pk": "e47b2d65-bb81-4b32-a735-a7ffdafdf645",
"fields": {
- "element": "84cd373d-9b6c-4c06-85aa-0bcc0cefca3a",
+ "element": "7393f32f-1bb4-4a00-a7e6-7a05659423ea",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
- "text": "DATUM",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "f1f5eb10-5ef4-4a03-9e93-08aaae042b7a",
+ "pk": "f0037009-83f3-4e5a-9db9-8696ea7f1c63",
"fields": {
- "element": "0335b1d8-e3bd-4e33-8541-363322dd278e",
+ "element": "e4205894-9169-4fee-9823-e0bbc61e8724",
"type": "word",
- "source": "c2d93af0-cada-430c-98e5-41d5f6272ff8",
+ "source": "92b6a695-61b8-429b-b3be-ad7ab8e6ddc1",
"worker_version": null,
- "text": "PARIS",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.allowedmetadata",
- "pk": "23a42f23-e5c2-400f-90de-8459f33bd8f5",
+ "pk": "1d07c0f3-5263-47a9-bd92-029659d7f1e0",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "text",
- "name": "folio"
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "location",
+ "name": "location"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "7502297d-c6f1-4ec4-b7c7-0f137393236d",
+ "pk": "aac48c98-259a-427b-b155-766658d7beef",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
"type": "date",
"name": "date"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "8e0acabc-183d-409e-a774-07b0189c25cc",
+ "pk": "c999abbe-91e1-42ec-8b32-82ed871410c3",
"fields": {
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
- "type": "location",
- "name": "location"
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
+ "type": "text",
+ "name": "folio"
}
},
{
"model": "documents.metadata",
- "pk": "4e145fdd-fe47-4092-835d-a28cecbfb571",
+ "pk": "07ac0f0c-ccfb-4ee4-96a4-7ca36e80cc44",
"fields": {
- "element": "e88ef3cd-f032-46c9-9342-62141b80f221",
- "name": "folio",
+ "element": "ce0dc249-37ee-4e2e-89a4-d1383b25ff8c",
+ "name": "number",
"type": "text",
- "value": "1v",
+ "value": "2",
"revision": null,
"index": 0,
"entity": null
@@ -1004,12 +1004,12 @@
},
{
"model": "documents.metadata",
- "pk": "57ee186e-121e-4567-8a9e-aa5dca2605f9",
+ "pk": "2d9aee95-a9f9-4332-b2e4-27010d779513",
"fields": {
- "element": "0d0819a6-4084-4bda-adec-40e2f37d5f26",
- "name": "number",
+ "element": "6e829b5f-2f51-4c93-babb-418d5f01c8b0",
+ "name": "folio",
"type": "text",
- "value": "4",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -1017,12 +1017,12 @@
},
{
"model": "documents.metadata",
- "pk": "7cd50608-fa1e-4060-a57f-9d40a458f77f",
+ "pk": "31ae24de-585d-42f5-95b4-2f4ff0aee9e6",
"fields": {
- "element": "b1b8d51e-22a5-4e64-b315-42c30f6afda1",
- "name": "number",
+ "element": "e9e92536-f98a-4dad-bb7e-0aa7e486b894",
+ "name": "folio",
"type": "text",
- "value": "1",
+ "value": "1v",
"revision": null,
"index": 0,
"entity": null
@@ -1030,12 +1030,12 @@
},
{
"model": "documents.metadata",
- "pk": "8fe32e5b-b6b8-4921-ba0c-26d5f802c785",
+ "pk": "59864bc6-7e0b-4927-bf80-3239ee89708f",
"fields": {
- "element": "c3ce087e-01e3-405d-b8ba-84446b8457f6",
+ "element": "a22c9f39-95df-45de-98b9-59a9f358611d",
"name": "folio",
"type": "text",
- "value": "1r",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -1043,12 +1043,12 @@
},
{
"model": "documents.metadata",
- "pk": "b2a9e2f1-3dcd-4caa-a8a2-e4c5c0288db8",
+ "pk": "7177773a-3970-4ede-b4d7-df4a7930b587",
"fields": {
- "element": "dd689af0-3e85-48b2-a5fd-02c5d374ae6a",
- "name": "number",
+ "element": "a1c3c97c-2240-4c00-961e-12ca69b627a0",
+ "name": "folio",
"type": "text",
- "value": "5",
+ "value": "1v",
"revision": null,
"index": 0,
"entity": null
@@ -1056,12 +1056,12 @@
},
{
"model": "documents.metadata",
- "pk": "baba5d90-a64e-4a07-a547-6538fa10fad8",
+ "pk": "a124d423-eed2-47e7-b945-1e77ed2ec454",
"fields": {
- "element": "37b44320-93a9-4252-8a7e-d8330e2adea9",
- "name": "folio",
+ "element": "1b2a3adb-3740-49d3-95e7-ce14dfc7da93",
+ "name": "number",
"type": "text",
- "value": "2r",
+ "value": "4",
"revision": null,
"index": 0,
"entity": null
@@ -1069,12 +1069,12 @@
},
{
"model": "documents.metadata",
- "pk": "c508ead8-da59-468d-a01d-aad50e28c5cf",
+ "pk": "baf0ed90-95c6-45c6-a74e-40d5d25b846b",
"fields": {
- "element": "8e4dfe5b-82dd-484d-b43b-3a26a53e166b",
- "name": "folio",
+ "element": "525de37a-190f-4760-b831-4bf9bd4909f5",
+ "name": "number",
"type": "text",
- "value": "1r",
+ "value": "1",
"revision": null,
"index": 0,
"entity": null
@@ -1082,12 +1082,12 @@
},
{
"model": "documents.metadata",
- "pk": "d083eb2d-c8d7-4a42-8222-9cde634a21dd",
+ "pk": "d217b793-f069-4d41-ba09-3914a9fb5cf5",
"fields": {
- "element": "8d429c18-4efc-4bcd-b8b6-c1635ab52c1f",
- "name": "folio",
+ "element": "1a9d2c4e-9bf8-4c14-896f-b498de08a082",
+ "name": "number",
"type": "text",
- "value": "2r",
+ "value": "3",
"revision": null,
"index": 0,
"entity": null
@@ -1095,12 +1095,12 @@
},
{
"model": "documents.metadata",
- "pk": "d6d9e615-939c-41c7-ba7d-2d5e363a6e70",
+ "pk": "df7055ea-2464-4761-b122-ef8b758cb62a",
"fields": {
- "element": "28cbab98-215c-46fa-96a4-6f3341720ade",
+ "element": "408ff192-649a-4f93-9a1a-0603641b4725",
"name": "folio",
"type": "text",
- "value": "1v",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -1108,12 +1108,12 @@
},
{
"model": "documents.metadata",
- "pk": "e11a5b55-9493-4432-a8f8-e237dec97c31",
+ "pk": "e661a537-f2ab-44a6-95aa-25ac5a7a60c9",
"fields": {
- "element": "0967069c-868f-40fe-ab47-79c94ee0de2f",
+ "element": "0f83e510-f4f6-4048-86a4-f314c7f88223",
"name": "number",
"type": "text",
- "value": "3",
+ "value": "5",
"revision": null,
"index": 0,
"entity": null
@@ -1121,12 +1121,12 @@
},
{
"model": "documents.metadata",
- "pk": "f53f7f2f-82ae-46c9-b41a-7a757114e19a",
+ "pk": "f595d9c5-474b-42bd-b95e-a260e6f4adf8",
"fields": {
- "element": "25856ede-a876-425f-a65e-f105dc5b8aea",
- "name": "number",
+ "element": "bf4d6982-d8c0-4b81-8f49-3352d2ac90ee",
+ "name": "folio",
"type": "text",
- "value": "2",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -1150,12 +1150,12 @@
},
{
"model": "images.image",
- "pk": "2fe98255-a9d4-4b57-9e14-0776e4558062",
+ "pk": "48be6ecd-de85-4cc7-9567-b6bb89769f3c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img4",
+ "path": "img5",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1164,12 +1164,12 @@
},
{
"model": "images.image",
- "pk": "330d8dfd-4795-4eeb-8145-c21bac53983d",
+ "pk": "53eb4ee2-c43b-45cb-8cf7-dcdf5dd9fe9d",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img3",
+ "path": "img2",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1178,12 +1178,12 @@
},
{
"model": "images.image",
- "pk": "3d15eeba-2d03-4b97-ba28-5fed7e920754",
+ "pk": "6538d5fb-5a86-4c34-a974-70c624bba5be",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img1",
+ "path": "img3",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1192,12 +1192,12 @@
},
{
"model": "images.image",
- "pk": "4f0b4ea4-25e0-458b-ab14-c563be145090",
+ "pk": "bc237d40-b2bd-4e2f-b728-d6c799beeac6",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img5",
+ "path": "img4",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1206,12 +1206,12 @@
},
{
"model": "images.image",
- "pk": "ab6cb9e8-d4a2-4565-97b4-e5eacaa50c17",
+ "pk": "ce68e28e-8d2a-4e07-901d-791c6eb0dfca",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img2",
+ "path": "img1",
"width": 1000,
"height": 1000,
"hash": null,
@@ -1220,7 +1220,7 @@
},
{
"model": "images.image",
- "pk": "da15dbb9-f11f-4133-aafa-e19b7ba95a18",
+ "pk": "e1a2aa51-72c4-4668-a131-754da40f48d0",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
@@ -1234,212 +1234,212 @@
},
{
"model": "images.zone",
- "pk": "06bcf646-41f0-4d61-baaf-ee96235ce796",
+ "pk": "0a23bba3-71a6-4511-8e80-e5b153e7d914",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "ab6cb9e8-d4a2-4565-97b4-e5eacaa50c17",
- "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
+ "image": "6538d5fb-5a86-4c34-a974-70c624bba5be",
+ "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)"
}
},
{
"model": "images.zone",
- "pk": "116acf5e-6735-4860-a1f9-11aa72a02feb",
+ "pk": "14c535d6-7b24-4366-a19c-4e56f3a7d073",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3d15eeba-2d03-4b97-ba28-5fed7e920754",
+ "image": "ce68e28e-8d2a-4e07-901d-791c6eb0dfca",
"polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
}
},
{
"model": "images.zone",
- "pk": "4c34f35c-53e5-4f92-a14e-4e3e12a6321d",
+ "pk": "2478f4f6-5c23-43dc-99c5-422b5338f3b0",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "330d8dfd-4795-4eeb-8145-c21bac53983d",
- "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
+ "image": "53eb4ee2-c43b-45cb-8cf7-dcdf5dd9fe9d",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "54772ebe-a2ef-426a-96ad-20b850e6bd54",
+ "pk": "26195a0d-1dcb-44a4-b01f-6ac80fab95f6",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "330d8dfd-4795-4eeb-8145-c21bac53983d",
- "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
+ "image": "48be6ecd-de85-4cc7-9567-b6bb89769f3c",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "582f8f69-83ba-4a0d-8dc9-ac5830f61e6b",
+ "pk": "29d50e92-b7ef-462b-875d-3bb74506898c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "ab6cb9e8-d4a2-4565-97b4-e5eacaa50c17",
- "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
+ "image": "53eb4ee2-c43b-45cb-8cf7-dcdf5dd9fe9d",
+ "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
}
},
{
"model": "images.zone",
- "pk": "58dd01a9-e6e2-4516-88dd-7c61e821ddc4",
+ "pk": "2aedf0c1-ca2d-403a-9760-ed649271e3c3",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "330d8dfd-4795-4eeb-8145-c21bac53983d",
+ "image": "ce68e28e-8d2a-4e07-901d-791c6eb0dfca",
"polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)"
}
},
{
"model": "images.zone",
- "pk": "59a46750-85b6-4514-af3b-fda091954e23",
+ "pk": "47677898-aafc-42b6-aec8-2767442838a7",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "330d8dfd-4795-4eeb-8145-c21bac53983d",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "6538d5fb-5a86-4c34-a974-70c624bba5be",
+ "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
}
},
{
"model": "images.zone",
- "pk": "5a9d773d-041e-454a-a608-9e5c47cd8102",
+ "pk": "4d348752-c9c3-4c40-9924-fb0b78bde96a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "330d8dfd-4795-4eeb-8145-c21bac53983d",
- "polygon": "LINEARRING (300 300, 300 600, 600 600, 600 300, 300 300)"
+ "image": "e1a2aa51-72c4-4668-a131-754da40f48d0",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "6970185e-813e-488e-88b5-08f4be0894f7",
+ "pk": "65fc5f42-bbf9-4ff2-90f8-0ffb43a16b52",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3d15eeba-2d03-4b97-ba28-5fed7e920754",
- "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)"
+ "image": "53eb4ee2-c43b-45cb-8cf7-dcdf5dd9fe9d",
+ "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
}
},
{
"model": "images.zone",
- "pk": "6a42e73e-97d7-4bef-918f-5a8fef86bd9f",
+ "pk": "6c7a21b2-5a54-4226-9b0b-a66eaea2caf8",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3d15eeba-2d03-4b97-ba28-5fed7e920754",
- "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
+ "image": "ce68e28e-8d2a-4e07-901d-791c6eb0dfca",
+ "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
}
},
{
"model": "images.zone",
- "pk": "716e8627-286e-4933-aa77-4607192ffcd4",
+ "pk": "81408598-4522-4df6-856f-293d75d3390b",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3d15eeba-2d03-4b97-ba28-5fed7e920754",
+ "image": "bc237d40-b2bd-4e2f-b728-d6c799beeac6",
"polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "7a43719f-fc6c-4464-a58d-b3cee9e26821",
+ "pk": "8dc267fe-76ab-4e76-9b0a-3009b57b2ab2",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "330d8dfd-4795-4eeb-8145-c21bac53983d",
+ "image": "53eb4ee2-c43b-45cb-8cf7-dcdf5dd9fe9d",
"polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
}
},
{
"model": "images.zone",
- "pk": "7eaaa88c-31d5-4a26-90db-9bde2c793a09",
+ "pk": "8f507e13-1f0e-43f4-84ce-44f55fcf187f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "da15dbb9-f11f-4133-aafa-e19b7ba95a18",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "ce68e28e-8d2a-4e07-901d-791c6eb0dfca",
+ "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "8a830271-750f-4c62-b66a-203d2c2bf7fb",
+ "pk": "a45cba6e-5304-4e60-a6c3-79c1627ded89",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "ab6cb9e8-d4a2-4565-97b4-e5eacaa50c17",
- "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
+ "image": "6538d5fb-5a86-4c34-a974-70c624bba5be",
+ "polygon": "LINEARRING (600 600, 600 1000, 1000 1000, 1000 600, 600 600)"
}
},
{
"model": "images.zone",
- "pk": "b23f1366-50ff-4654-9677-74b063b22f63",
+ "pk": "c8fc9430-cdd3-46ce-a045-957c8132b4d2",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3d15eeba-2d03-4b97-ba28-5fed7e920754",
- "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
+ "image": "ce68e28e-8d2a-4e07-901d-791c6eb0dfca",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "bfab7afe-7eee-46d4-a7e1-76917a956b98",
+ "pk": "ca0b6bd5-75d4-4ec2-b559-5a5919354e29",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "4f0b4ea4-25e0-458b-ab14-c563be145090",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "6538d5fb-5a86-4c34-a974-70c624bba5be",
+ "polygon": "LINEARRING (700 700, 700 800, 800 800, 800 700, 700 700)"
}
},
{
"model": "images.zone",
- "pk": "e45a50dc-cd76-42a8-9044-2c33f23bafa7",
+ "pk": "ca56ae53-3a8b-4064-bef4-482773738b29",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "330d8dfd-4795-4eeb-8145-c21bac53983d",
- "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)"
+ "image": "6538d5fb-5a86-4c34-a974-70c624bba5be",
+ "polygon": "LINEARRING (400 400, 400 500, 500 500, 500 400, 400 400)"
}
},
{
"model": "images.zone",
- "pk": "f780ae66-a1fa-474f-b811-71c35ff0e3a6",
+ "pk": "d885b67c-01fc-4254-9eea-81da4ec62102",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "2fe98255-a9d4-4b57-9e14-0776e4558062",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "ce68e28e-8d2a-4e07-901d-791c6eb0dfca",
+ "polygon": "LINEARRING (100 100, 100 200, 200 200, 200 100, 100 100)"
}
},
{
"model": "images.zone",
- "pk": "f8c4d167-c6b2-4a69-9181-88055de061e4",
+ "pk": "e41a5920-3078-4772-a83d-e05f05a9678f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "ab6cb9e8-d4a2-4565-97b4-e5eacaa50c17",
- "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
+ "image": "6538d5fb-5a86-4c34-a974-70c624bba5be",
+ "polygon": "LINEARRING (0 0, 0 300, 300 300, 300 0, 0 0)"
}
},
{
"model": "images.zone",
- "pk": "f9d2df00-295e-4338-8933-3047dbac3f5c",
+ "pk": "ea52165e-7d7d-41af-b29f-b8774955626a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3d15eeba-2d03-4b97-ba28-5fed7e920754",
- "polygon": "LINEARRING (0 0, 0 600, 600 600, 600 0, 0 0)"
+ "image": "6538d5fb-5a86-4c34-a974-70c624bba5be",
+ "polygon": "LINEARRING (0 0, 0 1000, 1000 1000, 1000 0, 0 0)"
}
},
{
"model": "users.user",
"pk": 1,
"fields": {
- "password": "pbkdf2_sha256$216000$xZRb9HtSdMBv$494uB+MuLLKg5oRncWtZ1pAhE5G57xCN8JRy/FZGNlM=",
+ "password": "pbkdf2_sha256$216000$SDRlvrKm5YOT$XxAljMHH19WWQzwUySlDiOTtKJe+TPhSITW6zo/I7xI=",
"last_login": null,
"email": "root@root.fr",
- "display_name": "Root",
+ "display_name": "Admin",
"transkribus_email": null,
"is_active": true,
"is_internal": false,
@@ -1451,10 +1451,10 @@
"model": "users.user",
"pk": 2,
"fields": {
- "password": "pbkdf2_sha256$216000$r2VS8A9wntGL$Qkk9RS4hyQpiCeSOg/W4WyjQrnzqynPmXLL9Zxa77Hc=",
+ "password": "pbkdf2_sha256$216000$CYynh60McAI6$SSlHKy0tGvxBBd/zzG1hc1zNEqhaNtv5rrH2M0ATgpY=",
"last_login": null,
"email": "internal@internal.fr",
- "display_name": "Internal",
+ "display_name": "Internal user",
"transkribus_email": null,
"is_active": true,
"is_internal": true,
@@ -1466,10 +1466,10 @@
"model": "users.user",
"pk": 3,
"fields": {
- "password": "pbkdf2_sha256$216000$ECvU1zVf7C3O$UpWNiV/mZhNcKkTT7EAhu3FdgP6L/lNYyqkuknemb6A=",
+ "password": "pbkdf2_sha256$216000$tGXE4KnOaN1S$O89hFVWrOj/YC22CvXIrTMaDBWYAfdOGpc1H1wkCSLQ=",
"last_login": null,
"email": "user@user.fr",
- "display_name": "User",
+ "display_name": "Test user",
"transkribus_email": null,
"is_active": true,
"is_internal": false,
@@ -1484,7 +1484,7 @@
"password": "",
"last_login": null,
"email": "user2@user.fr",
- "display_name": "",
+ "display_name": "Test user write",
"transkribus_email": null,
"is_active": true,
"is_internal": false,
@@ -1499,7 +1499,7 @@
"password": "",
"last_login": null,
"email": "user3@user.fr",
- "display_name": "",
+ "display_name": "Test user read",
"transkribus_email": null,
"is_active": true,
"is_internal": false,
@@ -1509,7 +1509,7 @@
},
{
"model": "users.group",
- "pk": "230172d1-4ff6-4c02-8ca8-353ba1fd20dd",
+ "pk": "3d43ed61-ef7e-4eaa-8e31-83bdf7083256",
"fields": {
"name": "User group",
"public": false
@@ -1520,7 +1520,7 @@
"pk": 1,
"fields": {
"user": 3,
- "group": "230172d1-4ff6-4c02-8ca8-353ba1fd20dd",
+ "group": "3d43ed61-ef7e-4eaa-8e31-83bdf7083256",
"level": 100
}
},
@@ -1529,7 +1529,7 @@
"pk": 2,
"fields": {
"user": 4,
- "group": "230172d1-4ff6-4c02-8ca8-353ba1fd20dd",
+ "group": "3d43ed61-ef7e-4eaa-8e31-83bdf7083256",
"level": 50
}
},
@@ -1538,13 +1538,13 @@
"pk": 3,
"fields": {
"user": 5,
- "group": "230172d1-4ff6-4c02-8ca8-353ba1fd20dd",
+ "group": "3d43ed61-ef7e-4eaa-8e31-83bdf7083256",
"level": 10
}
},
{
"model": "users.oauthcredentials",
- "pk": "6abe974b-3544-45e9-86d6-1feb20da0db1",
+ "pk": "9fb76b0e-6529-4c2c-acc4-02d616554102",
"fields": {
"user": 3,
"provider_name": "gitlab",
@@ -1561,7 +1561,7 @@
"pk": 1,
"fields": {
"user": 3,
- "corpus": "afdf79ed-40ed-42a9-be7b-ce6a2312e0df",
+ "corpus": "dab98946-799e-415f-abcb-869cf1bda854",
"can_write": true,
"can_admin": true
}
@@ -3260,7 +3260,7 @@
},
{
"model": "ponos.workflow",
- "pk": "7e202e3b-54a3-4d49-9529-635e31bdcdb0",
+ "pk": "17abc122-a22d-4788-b8ae-8a6f576e55ed",
"fields": {
"recipe": "tasks:\n docker_build:\n image: reco",
"created": "2020-02-02T01:23:45.678Z",
@@ -3269,7 +3269,7 @@
},
{
"model": "ponos.task",
- "pk": "c7bc72a9-c78b-4fbd-9868-a6708bb759ea",
+ "pk": "b579d90f-b7f1-49ff-b30d-06671078ea01",
"fields": {
"run": 0,
"depth": 0,
@@ -3282,7 +3282,7 @@
"has_docker_socket": false,
"image_artifact": null,
"agent": null,
- "workflow": "7e202e3b-54a3-4d49-9529-635e31bdcdb0",
+ "workflow": "17abc122-a22d-4788-b8ae-8a6f576e55ed",
"container": null,
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
@@ -3291,9 +3291,9 @@
},
{
"model": "ponos.artifact",
- "pk": "4376763a-6f39-4bcd-adfd-aa59def40f75",
+ "pk": "b795d482-d08d-4599-ae82-db16ea4331e8",
"fields": {
- "task": "c7bc72a9-c78b-4fbd-9868-a6708bb759ea",
+ "task": "b579d90f-b7f1-49ff-b30d-06671078ea01",
"path": "/path/to/docker_build",
"size": 42000,
"content_type": "application/octet-stream",
diff --git a/arkindex/documents/management/commands/build_fixtures.py b/arkindex/documents/management/commands/build_fixtures.py
index c01e9d98dd..f9481406de 100644
--- a/arkindex/documents/management/commands/build_fixtures.py
+++ b/arkindex/documents/management/commands/build_fixtures.py
@@ -61,23 +61,28 @@ class Command(BaseCommand):
line_zone = makezone(img1, 400, 500)
# Create an admin, an internal and a normal user
- superuser = User.objects.create_superuser('root@root.fr', 'Pa$$w0rd')
+ superuser = User.objects.create_superuser('root@root.fr', 'Pa$$w0rd', display_name='Admin')
superuser.verified_email = True
superuser.save()
- internal_user = User.objects.create_user('internal@internal.fr', 'Pa$$w0rd', internal=True)
+ internal_user = User.objects.create_user(
+ 'internal@internal.fr',
+ 'Pa$$w0rd',
+ display_name='Internal user',
+ internal=True,
+ )
internal_user.verified_email = True
internal_user.save()
- user = User.objects.create_user('user@user.fr', 'Pa$$w0rd')
+ user = User.objects.create_user('user@user.fr', 'Pa$$w0rd', display_name='Test user')
user.verified_email = True
user.save()
# Create a group owned by the user with 2 other members
group = Group.objects.create(name="User group", public=False)
group.memberships.create(user=user, level=100)
- group.users.create(email='user2@user.fr', through_defaults={'level': 50})
- group.users.create(email='user3@user.fr', through_defaults={'level': 10})
+ group.users.create(email='user2@user.fr', display_name='Test user write', through_defaults={'level': 50})
+ group.users.create(email='user3@user.fr', display_name='Test user read', through_defaults={'level': 10})
# Create 1 data source for transcriptions
recognizer_source = DataSource.objects.create(
diff --git a/arkindex/users/api.py b/arkindex/users/api.py
index 979368dfe1..a597da44d6 100644
--- a/arkindex/users/api.py
+++ b/arkindex/users/api.py
@@ -522,4 +522,4 @@ class GroupMembershipsList(ListAPIView):
users__in=[self.request.user],
id=self.kwargs['pk']
))
- return group.memberships.order_by('id').prefetch_related('user')
+ return group.memberships.order_by('user__display_name', 'id').prefetch_related('user')
diff --git a/arkindex/users/tests/test_membership.py b/arkindex/users/tests/test_membership.py
index 160da82396..95adf48159 100644
--- a/arkindex/users/tests/test_membership.py
+++ b/arkindex/users/tests/test_membership.py
@@ -113,6 +113,7 @@ class TestMembership(FixtureAPITestCase):
def test_list_members_level_right(self):
"""
List members of a group with their right corresponding to privileges level
+ Members are ordered by display name
"""
self.client.force_login(self.user)
with self.assertNumQueries(6):
@@ -126,20 +127,20 @@ class TestMembership(FixtureAPITestCase):
'previous': None,
'results': [
{
- 'display_name': admin_member.user.display_name,
+ 'display_name': 'Test user',
'email': admin_member.user.email,
'id': str(admin_member.user.id),
'level': 'admin'
}, {
- 'display_name': write_member.user.display_name,
- 'email': write_member.user.email,
- 'id': str(write_member.user.id),
- 'level': 'write'
- }, {
- 'display_name': read_member.user.display_name,
+ 'display_name': 'Test user read',
'email': read_member.user.email,
'id': str(read_member.user.id),
'level': 'read'
+ }, {
+ 'display_name': 'Test user write',
+ 'email': write_member.user.email,
+ 'id': str(write_member.user.id),
+ 'level': 'write'
}
]
})
--
GitLab