diff --git a/arkindex/documents/fixtures/data.json b/arkindex/documents/fixtures/data.json
index 5f432c88447d5934f8c86e8e67c86805919d2a23..cb23a357c65df5d96c6e8bd453058a569c0c86d3 100644
--- a/arkindex/documents/fixtures/data.json
+++ b/arkindex/documents/fixtures/data.json
@@ -1,22 +1,22 @@
[
{
"model": "dataimport.repository",
- "pk": "472e3565-862f-425f-bf63-73dee92f20bf",
+ "pk": "203cc620-cecc-4082-9f96-8221c2fa6819",
"fields": {
"url": "http://gitlab/repo",
"hook_token": "hook-token",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "credentials": "b1bb020b-b37b-424f-bd4f-4005df7f4dd0",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "credentials": "8df93bf0-dc69-4292-851e-2237744b6962",
"provider_name": "GitLabProvider"
}
},
{
"model": "dataimport.revision",
- "pk": "2a2f906c-321b-4abe-b66f-9e9dce9e9f95",
+ "pk": "f7a749c3-30ba-4c4a-b990-78183ea7ef85",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "repo": "472e3565-862f-425f-bf63-73dee92f20bf",
+ "repo": "203cc620-cecc-4082-9f96-8221c2fa6819",
"hash": "42",
"message": "a",
"author": "me",
@@ -25,7 +25,7 @@
},
{
"model": "documents.corpus",
- "pk": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
+ "pk": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
@@ -36,352 +36,377 @@
},
{
"model": "documents.elementtype",
- "pk": "1ca1e636-2751-4dad-b0a8-f46c0c40d00d",
+ "pk": "2e6fa45b-8fa2-44e6-87dd-ab3c060af6c1",
"fields": {
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "slug": "act",
- "display_name": "Act",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "slug": "page",
+ "display_name": "Page",
"folder": false,
- "default_view": false
+ "default_view": false,
+ "allowed_transcription": null
}
},
{
"model": "documents.elementtype",
- "pk": "50bee232-1372-4746-9238-2ca9697e57ca",
+ "pk": "41deec90-9724-45e1-bc1c-72e1fefa6d75",
"fields": {
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "slug": "surface",
- "display_name": "Surface",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "slug": "act",
+ "display_name": "Act",
"folder": false,
- "default_view": false
+ "default_view": false,
+ "allowed_transcription": null
}
},
{
"model": "documents.elementtype",
- "pk": "5674c512-3991-4334-929a-cbd428319fda",
+ "pk": "554ab0d4-f251-4d9f-a85f-7f0b8c8c08ed",
"fields": {
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "slug": "page",
- "display_name": "Page",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "slug": "text_line",
+ "display_name": "Line",
"folder": false,
- "default_view": false
+ "default_view": false,
+ "allowed_transcription": "line"
}
},
{
"model": "documents.elementtype",
- "pk": "ece42eb9-50b8-4b69-b11f-96da08d849c9",
+ "pk": "5de57d09-42a6-4cd9-911f-0c8fd848874b",
"fields": {
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
"slug": "volume",
"display_name": "Volume",
"folder": true,
- "default_view": false
+ "default_view": false,
+ "allowed_transcription": null
}
},
{
- "model": "documents.elementpath",
- "pk": "025b27e6-c968-4e4c-9ba9-4bd12022ce18",
+ "model": "documents.elementtype",
+ "pk": "d2cd751f-5c2e-4d6d-a352-23bb8782645b",
"fields": {
- "element": "802b1242-2585-4b65-b696-4d38b59a2376",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\", \"4835f0d8-59f8-428d-b268-de46d1b5ac18\"]",
- "ordering": 0
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "slug": "surface",
+ "display_name": "Surface",
+ "folder": false,
+ "default_view": false,
+ "allowed_transcription": null
}
},
{
"model": "documents.elementpath",
- "pk": "111c88bc-fef6-4dbc-956d-af0cbf3d57e1",
+ "pk": "4ab35c11-c4ad-4c0b-83cb-0c9bfbe3bac6",
"fields": {
- "element": "fffbb708-b741-4c07-94f2-7c2f43165810",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\", \"d4565234-668d-45ba-9b1a-962190abaef3\"]",
- "ordering": 0
+ "element": "15c5d832-ec28-4c26-ab96-d52528b83c3d",
+ "path": "[\"76f0a751-70db-440b-96ad-46fb53944657\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "151c1076-9603-4da7-abf2-fefb3a483f50",
+ "pk": "4add2c4c-a903-40b3-abd1-b23c891c30e9",
"fields": {
- "element": "e142de5c-4db8-44ab-99de-d1596645e777",
- "path": "[\"e4adac64-d945-47d1-b8e6-d2d8cbb456b9\"]",
- "ordering": 2
+ "element": "18b2cda0-eadb-4a40-91f7-0dafdcd149b7",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\", \"128c910f-32be-43de-83be-a985d48ca2d7\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "1ee5ad30-ce94-4758-a983-edcb90bc0e0b",
+ "pk": "4ea4170c-271f-4b68-bb9d-adad9864b458",
"fields": {
- "element": "a556a754-b967-43b2-b268-7bac0647fbe7",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
- "ordering": 4
+ "element": "c9c46c68-5e43-4706-947a-289d69e62770",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\", \"7805cd9f-fa1e-47e6-9e2a-065febd99b48\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "37b6239e-5c4e-4c4d-b5e7-378e3176475c",
+ "pk": "54da0a95-7ae3-4fe2-ae45-771bc2f27f42",
"fields": {
- "element": "c146079c-ee85-4b49-bdbd-46d811765669",
- "path": "[\"e4adac64-d945-47d1-b8e6-d2d8cbb456b9\"]",
+ "element": "ebcd0261-a821-4cf7-b389-bbb25a31c6f4",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
"ordering": 1
}
},
{
"model": "documents.elementpath",
- "pk": "4a98dba2-5f3e-4647-9ae4-9c0eb6cce9b0",
+ "pk": "5c1288ea-5c11-4448-bc1a-580c47006c36",
"fields": {
- "element": "d4565234-668d-45ba-9b1a-962190abaef3",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
- "ordering": 1
+ "element": "6103b744-5fcd-4906-a225-96cadf0e7936",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\", \"ce69a6e9-94f4-4b09-834b-e4495463cdc3\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "56e9b722-5621-4dc6-a92f-e8bf4c3b9fdf",
+ "pk": "71520def-1fb6-4351-a160-ff28a5c95853",
"fields": {
- "element": "ff9fd2ae-7447-4987-98c5-4c1f9a0b0d02",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\", \"a556a754-b967-43b2-b268-7bac0647fbe7\"]",
+ "element": "37d58715-fab5-4dc3-aae7-4e1642aaca59",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\", \"700316f9-d961-430b-bbcb-e4463f1fbc06\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "5769fbb9-68c6-4ec6-b32b-a2553ea6584b",
+ "pk": "91a16788-b75d-4fe5-ad88-1dc9e7d51f02",
"fields": {
- "element": "aef0810f-db70-4877-9178-b62db1fe41bb",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
- "ordering": 1
+ "element": "094557a1-07fa-4a18-b316-6436132b7f20",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
+ "ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "863799e3-ff82-4211-affa-33a5f9c6444d",
+ "pk": "a7941275-6d0c-4ee0-ab49-2651fc3da3d1",
"fields": {
- "element": "d9ce2868-9b3a-4ac8-8ad7-6df7310a457d",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
+ "element": "766c03fd-0da1-47f8-9445-3604d4384180",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "acdb00d6-d213-4a22-9f2c-cfbe7c783b4d",
+ "pk": "aa7713e7-f489-494e-8c3c-685617799467",
"fields": {
- "element": "e9f6f33e-1426-4035-bd22-02b06cbb3976",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\", \"ab8c1471-a345-4160-9deb-1b6d8742e6b8\"]",
+ "element": "cc1de49c-f3d7-4b32-b51e-19b0933a4ec2",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\", \"766c03fd-0da1-47f8-9445-3604d4384180\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "be5b5375-49b4-44d7-8907-a9fa38fc2046",
+ "pk": "ac977f04-cf5a-4f6c-b92c-972170d4fd7e",
"fields": {
- "element": "fc71d2d5-1287-4194-b879-36d45f3a805f",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\", \"d4565234-668d-45ba-9b1a-962190abaef3\"]",
- "ordering": 1
+ "element": "700316f9-d961-430b-bbcb-e4463f1fbc06",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
+ "ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "ccaa46f2-9993-4824-ad4d-92d047ee7968",
+ "pk": "b116e953-b2e1-4aec-b35e-18f644a326b4",
"fields": {
- "element": "4835f0d8-59f8-428d-b268-de46d1b5ac18",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
+ "element": "ce69a6e9-94f4-4b09-834b-e4495463cdc3",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
"ordering": 3
}
},
{
"model": "documents.elementpath",
- "pk": "deb75150-23cd-4b2b-949e-e5ebac14b07f",
+ "pk": "b388c8bb-6ac0-43ae-bb76-17524a1370d9",
"fields": {
- "element": "01ade438-e34c-46e5-8528-11173fd50dd0",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
+ "element": "921db870-00b4-4a19-b658-b4ab23c43b0f",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
"ordering": 2
}
},
{
"model": "documents.elementpath",
- "pk": "dfd96461-de37-43a2-a9c1-f60ac2450b0e",
+ "pk": "b4be39fe-6a24-41ba-ad01-8434d91add9c",
"fields": {
- "element": "ab8c1471-a345-4160-9deb-1b6d8742e6b8",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
- "ordering": 0
+ "element": "a61f752b-73a5-4321-8c99-92ef4cfacd7a",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\", \"7805cd9f-fa1e-47e6-9e2a-065febd99b48\"]",
+ "ordering": 1
+ }
+},
+{
+ "model": "documents.elementpath",
+ "pk": "cd0c64ff-37f7-4a58-9b16-51944e6af777",
+ "fields": {
+ "element": "128c910f-32be-43de-83be-a985d48ca2d7",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
+ "ordering": 4
}
},
{
"model": "documents.elementpath",
- "pk": "e3c756aa-e342-4a3a-8f50-a773ecf9275d",
+ "pk": "d714e9e3-c17d-4da5-a990-73e07aeeb6e7",
"fields": {
- "element": "8af1cf14-3ba3-4898-9c43-154481c9e26f",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\", \"d26f8e7c-318a-4902-b205-64fab01e420b\"]",
+ "element": "17f6784d-82d3-48ea-b9c7-d10f99a3e969",
+ "path": "[\"76f0a751-70db-440b-96ad-46fb53944657\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "ef9d04b4-6dcf-48aa-9191-91508f7e5a3e",
+ "pk": "d8a528a2-11f3-4531-afe1-de59ec6980a6",
"fields": {
- "element": "1055e127-026e-41bf-9c39-ed286cc11e80",
- "path": "[\"e4adac64-d945-47d1-b8e6-d2d8cbb456b9\"]",
+ "element": "7805cd9f-fa1e-47e6-9e2a-065febd99b48",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\"]",
+ "ordering": 1
+ }
+},
+{
+ "model": "documents.elementpath",
+ "pk": "e9fa4027-7031-48f9-86a5-d16c1cdd7e5c",
+ "fields": {
+ "element": "97593999-a57a-4012-8751-c15277b24d11",
+ "path": "[\"5d151c42-6ad5-4db7-8f86-c42a63529d9e\", \"094557a1-07fa-4a18-b316-6436132b7f20\"]",
"ordering": 0
}
},
{
"model": "documents.elementpath",
- "pk": "f623c46a-31fc-4686-9bfb-751be702b402",
+ "pk": "f516a64b-693d-480d-9e8a-79c546aade9a",
"fields": {
- "element": "d26f8e7c-318a-4902-b205-64fab01e420b",
- "path": "[\"43cf82df-142d-430d-b4a3-0f46d192dd41\"]",
- "ordering": 2
+ "element": "ab75efae-56cd-43bb-a39a-ca60f03a2de6",
+ "path": "[\"76f0a751-70db-440b-96ad-46fb53944657\"]",
+ "ordering": 1
}
},
{
"model": "documents.element",
- "pk": "01ade438-e34c-46e5-8528-11173fd50dd0",
+ "pk": "094557a1-07fa-4a18-b316-6436132b7f20",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "5674c512-3991-4334-929a-cbd428319fda",
- "name": "Volume 1, page 2r",
- "zone": "7fbc91b3-627c-45b6-95e5-78d015594bbc",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "41deec90-9724-45e1-bc1c-72e1fefa6d75",
+ "name": "Act 3",
+ "zone": null,
"source": null
}
},
{
"model": "documents.element",
- "pk": "1055e127-026e-41bf-9c39-ed286cc11e80",
+ "pk": "128c910f-32be-43de-83be-a985d48ca2d7",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "5674c512-3991-4334-929a-cbd428319fda",
- "name": "Volume 2, page 1r",
- "zone": "801a5ee2-9a10-42ad-9257-08534ba2e6f6",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "41deec90-9724-45e1-bc1c-72e1fefa6d75",
+ "name": "Act 5",
+ "zone": null,
"source": null
}
},
{
"model": "documents.element",
- "pk": "43cf82df-142d-430d-b4a3-0f46d192dd41",
+ "pk": "15c5d832-ec28-4c26-ab96-d52528b83c3d",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "ece42eb9-50b8-4b69-b11f-96da08d849c9",
- "name": "Volume 1",
- "zone": null,
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "2e6fa45b-8fa2-44e6-87dd-ab3c060af6c1",
+ "name": "Volume 2, page 2r",
+ "zone": "75e2b202-2e4e-4490-89f4-1fdb6c685aa9",
"source": null
}
},
{
"model": "documents.element",
- "pk": "4835f0d8-59f8-428d-b268-de46d1b5ac18",
+ "pk": "17f6784d-82d3-48ea-b9c7-d10f99a3e969",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "1ca1e636-2751-4dad-b0a8-f46c0c40d00d",
- "name": "Act 4",
- "zone": null,
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "2e6fa45b-8fa2-44e6-87dd-ab3c060af6c1",
+ "name": "Volume 2, page 1r",
+ "zone": "7e3cd3e9-4b7a-43bf-b68d-162db7dc57d4",
"source": null
}
},
{
"model": "documents.element",
- "pk": "802b1242-2585-4b65-b696-4d38b59a2376",
+ "pk": "18b2cda0-eadb-4a40-91f7-0dafdcd149b7",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "50bee232-1372-4746-9238-2ca9697e57ca",
- "name": "Surface E",
- "zone": "e92d542c-4eb6-43e0-9058-9148dc542b00",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "d2cd751f-5c2e-4d6d-a352-23bb8782645b",
+ "name": "Surface F",
+ "zone": "3472cd35-58cd-4935-aa91-206c24127aaa",
"source": null
}
},
{
"model": "documents.element",
- "pk": "8af1cf14-3ba3-4898-9c43-154481c9e26f",
+ "pk": "37d58715-fab5-4dc3-aae7-4e1642aaca59",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "50bee232-1372-4746-9238-2ca9697e57ca",
- "name": "Surface D",
- "zone": "c359abf0-b70a-4f07-bced-f1920bf8b962",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "554ab0d4-f251-4d9f-a85f-7f0b8c8c08ed",
+ "name": "Text line",
+ "zone": "75c6d528-20aa-4fb8-8e1f-51b390ad1d7c",
"source": null
}
},
{
"model": "documents.element",
- "pk": "a556a754-b967-43b2-b268-7bac0647fbe7",
+ "pk": "5d151c42-6ad5-4db7-8f86-c42a63529d9e",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "1ca1e636-2751-4dad-b0a8-f46c0c40d00d",
- "name": "Act 5",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "5de57d09-42a6-4cd9-911f-0c8fd848874b",
+ "name": "Volume 1",
"zone": null,
"source": null
}
},
{
"model": "documents.element",
- "pk": "ab8c1471-a345-4160-9deb-1b6d8742e6b8",
+ "pk": "6103b744-5fcd-4906-a225-96cadf0e7936",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "1ca1e636-2751-4dad-b0a8-f46c0c40d00d",
- "name": "Act 1",
- "zone": null,
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "d2cd751f-5c2e-4d6d-a352-23bb8782645b",
+ "name": "Surface E",
+ "zone": "7d3cce77-abbf-4c92-836e-dcdafcfcca74",
"source": null
}
},
{
"model": "documents.element",
- "pk": "aef0810f-db70-4877-9178-b62db1fe41bb",
+ "pk": "700316f9-d961-430b-bbcb-e4463f1fbc06",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "5674c512-3991-4334-929a-cbd428319fda",
- "name": "Volume 1, page 1v",
- "zone": "4ef2fea5-9845-47bc-82b0-587e3e5461f5",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "2e6fa45b-8fa2-44e6-87dd-ab3c060af6c1",
+ "name": "Volume 1, page 1r",
+ "zone": "62a2cade-d8f8-4e49-b143-f12871eead1c",
"source": null
}
},
{
"model": "documents.element",
- "pk": "c146079c-ee85-4b49-bdbd-46d811765669",
+ "pk": "766c03fd-0da1-47f8-9445-3604d4384180",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "5674c512-3991-4334-929a-cbd428319fda",
- "name": "Volume 2, page 1v",
- "zone": "f75c127e-b909-4612-97b9-8d70c983d3f9",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "41deec90-9724-45e1-bc1c-72e1fefa6d75",
+ "name": "Act 1",
+ "zone": null,
"source": null
}
},
{
"model": "documents.element",
- "pk": "d26f8e7c-318a-4902-b205-64fab01e420b",
+ "pk": "76f0a751-70db-440b-96ad-46fb53944657",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "1ca1e636-2751-4dad-b0a8-f46c0c40d00d",
- "name": "Act 3",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "5de57d09-42a6-4cd9-911f-0c8fd848874b",
+ "name": "Volume 2",
"zone": null,
"source": null
}
},
{
"model": "documents.element",
- "pk": "d4565234-668d-45ba-9b1a-962190abaef3",
+ "pk": "7805cd9f-fa1e-47e6-9e2a-065febd99b48",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "1ca1e636-2751-4dad-b0a8-f46c0c40d00d",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "41deec90-9724-45e1-bc1c-72e1fefa6d75",
"name": "Act 2",
"zone": null,
"source": null
@@ -389,98 +414,111 @@
},
{
"model": "documents.element",
- "pk": "d9ce2868-9b3a-4ac8-8ad7-6df7310a457d",
+ "pk": "921db870-00b4-4a19-b658-b4ab23c43b0f",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "5674c512-3991-4334-929a-cbd428319fda",
- "name": "Volume 1, page 1r",
- "zone": "7edb3fb5-2fe6-4758-9e51-29cf872830d4",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "2e6fa45b-8fa2-44e6-87dd-ab3c060af6c1",
+ "name": "Volume 1, page 2r",
+ "zone": "357b0756-050d-4315-8859-1ea7bbe9856c",
"source": null
}
},
{
"model": "documents.element",
- "pk": "e142de5c-4db8-44ab-99de-d1596645e777",
+ "pk": "97593999-a57a-4012-8751-c15277b24d11",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "5674c512-3991-4334-929a-cbd428319fda",
- "name": "Volume 2, page 2r",
- "zone": "c8e7289f-709c-4a2d-bf2e-052370ce3778",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "d2cd751f-5c2e-4d6d-a352-23bb8782645b",
+ "name": "Surface D",
+ "zone": "29031a61-eb67-44b6-a621-f112d94e761c",
"source": null
}
},
{
"model": "documents.element",
- "pk": "e4adac64-d945-47d1-b8e6-d2d8cbb456b9",
+ "pk": "a61f752b-73a5-4321-8c99-92ef4cfacd7a",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "ece42eb9-50b8-4b69-b11f-96da08d849c9",
- "name": "Volume 2",
- "zone": null,
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "d2cd751f-5c2e-4d6d-a352-23bb8782645b",
+ "name": "Surface C",
+ "zone": "9a24a7fa-7e9a-4847-a372-17e48f200aa5",
"source": null
}
},
{
"model": "documents.element",
- "pk": "e9f6f33e-1426-4035-bd22-02b06cbb3976",
+ "pk": "ab75efae-56cd-43bb-a39a-ca60f03a2de6",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "50bee232-1372-4746-9238-2ca9697e57ca",
- "name": "Surface A",
- "zone": "d44ed0bb-dbbc-4c8b-956e-c0eee9061751",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "2e6fa45b-8fa2-44e6-87dd-ab3c060af6c1",
+ "name": "Volume 2, page 1v",
+ "zone": "4c2d7b0e-368f-425c-b5fd-224afc4b1d94",
"source": null
}
},
{
"model": "documents.element",
- "pk": "fc71d2d5-1287-4194-b879-36d45f3a805f",
+ "pk": "c9c46c68-5e43-4706-947a-289d69e62770",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "50bee232-1372-4746-9238-2ca9697e57ca",
- "name": "Surface C",
- "zone": "4ef2fea5-9845-47bc-82b0-587e3e5461f5",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "d2cd751f-5c2e-4d6d-a352-23bb8782645b",
+ "name": "Surface B",
+ "zone": "c37646fc-9a4e-49ce-b663-dfea5c44cb5e",
"source": null
}
},
{
"model": "documents.element",
- "pk": "ff9fd2ae-7447-4987-98c5-4c1f9a0b0d02",
+ "pk": "cc1de49c-f3d7-4b32-b51e-19b0933a4ec2",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "50bee232-1372-4746-9238-2ca9697e57ca",
- "name": "Surface F",
- "zone": "8b77d647-3e9e-435e-93d9-ec02f0f7cb56",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "d2cd751f-5c2e-4d6d-a352-23bb8782645b",
+ "name": "Surface A",
+ "zone": "2953f320-e934-4906-9770-450ff3d8048d",
"source": null
}
},
{
"model": "documents.element",
- "pk": "fffbb708-b741-4c07-94f2-7c2f43165810",
+ "pk": "ce69a6e9-94f4-4b09-834b-e4495463cdc3",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "50bee232-1372-4746-9238-2ca9697e57ca",
- "name": "Surface B",
- "zone": "5f62ff8a-6c6f-4e3e-af78-aedf856e74b4",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "41deec90-9724-45e1-bc1c-72e1fefa6d75",
+ "name": "Act 4",
+ "zone": null,
+ "source": null
+ }
+},
+{
+ "model": "documents.element",
+ "pk": "ebcd0261-a821-4cf7-b389-bbb25a31c6f4",
+ "fields": {
+ "created": "2020-02-02T01:23:45.678Z",
+ "updated": "2020-02-02T01:23:45.678Z",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "2e6fa45b-8fa2-44e6-87dd-ab3c060af6c1",
+ "name": "Volume 1, page 1v",
+ "zone": "9a24a7fa-7e9a-4847-a372-17e48f200aa5",
"source": null
}
},
{
"model": "documents.datasource",
- "pk": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
+ "pk": "6da38e37-7c7d-47b2-991d-261e8b19b185",
"fields": {
"type": "recognizer",
"slug": "test",
@@ -491,159 +529,159 @@
},
{
"model": "documents.transcription",
- "pk": "1fcc68b4-4cc0-44b8-bcf4-a8627ca4461a",
+ "pk": "09402d3d-be9a-4a39-881a-1fa910f0d03b",
"fields": {
- "element": "d9ce2868-9b3a-4ac8-8ad7-6df7310a457d",
+ "element": "700316f9-d961-430b-bbcb-e4463f1fbc06",
"type": "page",
"zone": null,
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
"text": "Lorem ipsum dolor sit amet",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "2af4c1e2-8cf5-4c4f-87a5-84485558457e",
+ "pk": "117bff45-4520-4de7-b234-70d6c9268250",
"fields": {
- "element": "d9ce2868-9b3a-4ac8-8ad7-6df7310a457d",
+ "element": "700316f9-d961-430b-bbcb-e4463f1fbc06",
"type": "word",
- "zone": "e235fdbe-01d8-47d9-8581-85d91bfac75f",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
+ "zone": "95fb6483-254c-43da-b640-b7100df32d54",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
"text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "4f9cc938-0825-47a3-afd4-a5e4ecda50ff",
+ "pk": "12de8476-c634-4546-99f2-9953feeb4052",
"fields": {
- "element": "01ade438-e34c-46e5-8528-11173fd50dd0",
+ "element": "921db870-00b4-4a19-b658-b4ab23c43b0f",
"type": "word",
- "zone": "130ac813-ec5d-4858-bc37-f61efc839414",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
- "text": "ROY",
+ "zone": "3ba0691e-c2c1-4316-b8dc-f35b13ce2279",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "660b1eb9-6aa6-4814-9609-a1b42677768b",
+ "pk": "1d5b0eef-ff81-482f-bb15-7712871b2c64",
"fields": {
- "element": "01ade438-e34c-46e5-8528-11173fd50dd0",
+ "element": "ebcd0261-a821-4cf7-b389-bbb25a31c6f4",
"type": "word",
- "zone": "c0acc6d4-7503-4c5e-977b-ce992d99d957",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
+ "zone": "2c21e647-b737-4114-bfc4-28313859f159",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
"text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "6daa2225-32d5-4ca0-b8b6-5bac82f5163f",
+ "pk": "32d386d8-8500-4c52-b254-aa1d6bf02f70",
"fields": {
- "element": "d9ce2868-9b3a-4ac8-8ad7-6df7310a457d",
+ "element": "700316f9-d961-430b-bbcb-e4463f1fbc06",
"type": "word",
- "zone": "797ed4bd-95db-45da-9f30-c5cb9398860e",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
+ "zone": "75c6d528-20aa-4fb8-8e1f-51b390ad1d7c",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
"text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "896f6a72-5499-46f5-b1cd-ea55050fe6d4",
+ "pk": "57058fc4-b7a2-4dbb-a376-3d3a843154ae",
"fields": {
- "element": "aef0810f-db70-4877-9178-b62db1fe41bb",
+ "element": "ebcd0261-a821-4cf7-b389-bbb25a31c6f4",
"type": "word",
- "zone": "e5fa833b-133d-4d71-b4fc-f3d2d0610215",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
- "text": "ROY",
+ "zone": "405c439a-8eb0-439a-b190-737fb83e7229",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
+ "text": "DATUM",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "9416b327-0b95-4aea-8bfa-60caec2f4321",
+ "pk": "725dc85c-6cfb-421b-8d5b-bdc35a257ee3",
"fields": {
- "element": "aef0810f-db70-4877-9178-b62db1fe41bb",
+ "element": "921db870-00b4-4a19-b658-b4ab23c43b0f",
"type": "word",
- "zone": "02e02df2-c24b-469d-9d93-5c038e7734a9",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
- "text": "DATUM",
+ "zone": "b8478c83-81d0-48ea-9133-c39b00042fec",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "d62524bc-7709-4d95-b227-00dba98b597c",
+ "pk": "92f7ffe9-5e32-44c1-9e6c-7f0c126bfac7",
"fields": {
- "element": "01ade438-e34c-46e5-8528-11173fd50dd0",
+ "element": "700316f9-d961-430b-bbcb-e4463f1fbc06",
"type": "word",
- "zone": "25d36a13-456c-4ee7-99cc-b0e4eaf3601d",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
- "text": "DATUM",
+ "zone": "5307480a-13a0-4229-be95-c57f4dcc2503",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
+ "text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "e5beaab1-7cc1-4a64-9cce-d28faeb27f48",
+ "pk": "b0a62b3d-52c2-429f-90d9-b35117310d38",
"fields": {
- "element": "d9ce2868-9b3a-4ac8-8ad7-6df7310a457d",
+ "element": "921db870-00b4-4a19-b658-b4ab23c43b0f",
"type": "word",
- "zone": "81a80065-892d-4def-8685-1605c7e1770f",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
+ "zone": "6a31844c-d9ce-4150-b5a3-b1fead611f2c",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
"text": "PARIS",
"score": 1.0
}
},
{
"model": "documents.transcription",
- "pk": "e6c2a427-425d-40a3-ac0e-f353676514e9",
+ "pk": "b434f5e2-3419-42fc-afd9-9826bed1b559",
"fields": {
- "element": "aef0810f-db70-4877-9178-b62db1fe41bb",
+ "element": "ebcd0261-a821-4cf7-b389-bbb25a31c6f4",
"type": "word",
- "zone": "1a98bb31-36ce-4c27-8946-dd5a28a598ca",
- "source": "e5f34f5c-300b-42d5-95c2-6a0ccefb37cf",
- "text": "PARIS",
+ "zone": "0f5d5d57-7d36-4617-baed-3d135c6e50cf",
+ "source": "6da38e37-7c7d-47b2-991d-261e8b19b185",
+ "text": "ROY",
"score": 1.0
}
},
{
"model": "documents.allowedmetadata",
- "pk": "8c7c739d-183b-4342-9607-0bf660942212",
+ "pk": "6a775139-ccd0-4065-94a6-63492942dfc8",
"fields": {
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "location",
- "name": "location"
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "date",
+ "name": "date"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "bb5d5b39-fa61-4ec9-8f95-2dcc85b305b3",
+ "pk": "b2f8d728-d1e4-4232-ae69-15e1ee2b4a28",
"fields": {
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
"type": "text",
"name": "folio"
}
},
{
"model": "documents.allowedmetadata",
- "pk": "e4468f24-1402-4e72-a6df-97a6d0d29390",
+ "pk": "d9c5565b-9ac5-4d5a-b7e3-5538c4266efd",
"fields": {
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
- "type": "date",
- "name": "date"
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
+ "type": "location",
+ "name": "location"
}
},
{
"model": "documents.metadata",
- "pk": "1c60d7f5-142e-45ea-a7fa-c666c94d6053",
+ "pk": "5e0afbd4-d29d-4f42-95b8-5479864bf280",
"fields": {
- "element": "4835f0d8-59f8-428d-b268-de46d1b5ac18",
- "name": "number",
+ "element": "700316f9-d961-430b-bbcb-e4463f1fbc06",
+ "name": "folio",
"type": "text",
- "value": "4",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -651,12 +689,12 @@
},
{
"model": "documents.metadata",
- "pk": "50ab3f9a-d48e-4096-aec8-95551b83494b",
+ "pk": "91dd7b8c-fee7-4328-ad82-d34ddfd15a10",
"fields": {
- "element": "e142de5c-4db8-44ab-99de-d1596645e777",
+ "element": "ab75efae-56cd-43bb-a39a-ca60f03a2de6",
"name": "folio",
"type": "text",
- "value": "2r",
+ "value": "1v",
"revision": null,
"index": 0,
"entity": null
@@ -664,12 +702,12 @@
},
{
"model": "documents.metadata",
- "pk": "5b53c298-6c7d-49ba-b77c-5f4d9a00fa21",
+ "pk": "a1ce09b2-a64e-4244-929c-cf59b1d2dbff",
"fields": {
- "element": "a556a754-b967-43b2-b268-7bac0647fbe7",
- "name": "number",
+ "element": "17f6784d-82d3-48ea-b9c7-d10f99a3e969",
+ "name": "folio",
"type": "text",
- "value": "5",
+ "value": "1r",
"revision": null,
"index": 0,
"entity": null
@@ -677,12 +715,12 @@
},
{
"model": "documents.metadata",
- "pk": "669cd0d7-d691-40f7-b629-42321b52632d",
+ "pk": "b0bb03ad-8bc9-4abb-834f-5960eb37781c",
"fields": {
- "element": "d26f8e7c-318a-4902-b205-64fab01e420b",
+ "element": "7805cd9f-fa1e-47e6-9e2a-065febd99b48",
"name": "number",
"type": "text",
- "value": "3",
+ "value": "2",
"revision": null,
"index": 0,
"entity": null
@@ -690,12 +728,12 @@
},
{
"model": "documents.metadata",
- "pk": "74cd8e94-ae2c-4633-a3af-31e16ae5de25",
+ "pk": "c0374257-8c3c-4d14-bc57-840ce927a123",
"fields": {
- "element": "1055e127-026e-41bf-9c39-ed286cc11e80",
- "name": "folio",
+ "element": "766c03fd-0da1-47f8-9445-3604d4384180",
+ "name": "number",
"type": "text",
- "value": "1r",
+ "value": "1",
"revision": null,
"index": 0,
"entity": null
@@ -703,12 +741,12 @@
},
{
"model": "documents.metadata",
- "pk": "89dea15b-91f0-4221-aac7-6ffb23d58fd6",
+ "pk": "cc97e77c-4746-4a79-8ab6-c8502a44ad16",
"fields": {
- "element": "c146079c-ee85-4b49-bdbd-46d811765669",
+ "element": "15c5d832-ec28-4c26-ab96-d52528b83c3d",
"name": "folio",
"type": "text",
- "value": "1v",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -716,12 +754,12 @@
},
{
"model": "documents.metadata",
- "pk": "b18f6e53-77bc-4f2c-914a-00d7a7887918",
+ "pk": "e3aa6c6b-8423-4282-b21c-7942051d3407",
"fields": {
- "element": "ab8c1471-a345-4160-9deb-1b6d8742e6b8",
+ "element": "094557a1-07fa-4a18-b316-6436132b7f20",
"name": "number",
"type": "text",
- "value": "1",
+ "value": "3",
"revision": null,
"index": 0,
"entity": null
@@ -729,12 +767,12 @@
},
{
"model": "documents.metadata",
- "pk": "b912edbf-3701-48de-b10c-aa322d16a1bb",
+ "pk": "ef178883-c8e3-41c5-a1d0-d4641acf951f",
"fields": {
- "element": "aef0810f-db70-4877-9178-b62db1fe41bb",
+ "element": "921db870-00b4-4a19-b658-b4ab23c43b0f",
"name": "folio",
"type": "text",
- "value": "1v",
+ "value": "2r",
"revision": null,
"index": 0,
"entity": null
@@ -742,12 +780,12 @@
},
{
"model": "documents.metadata",
- "pk": "ee88d8f0-8ec6-44d1-be54-a40fd7baa090",
+ "pk": "f514ebca-1e56-4750-8650-a15b9ac8995a",
"fields": {
- "element": "01ade438-e34c-46e5-8528-11173fd50dd0",
+ "element": "ebcd0261-a821-4cf7-b389-bbb25a31c6f4",
"name": "folio",
"type": "text",
- "value": "2r",
+ "value": "1v",
"revision": null,
"index": 0,
"entity": null
@@ -755,12 +793,12 @@
},
{
"model": "documents.metadata",
- "pk": "f259e3f9-3eaf-4dc4-86c1-5a011d4dd520",
+ "pk": "f742d3f7-9816-4a12-bc95-9f1abebb7102",
"fields": {
- "element": "d4565234-668d-45ba-9b1a-962190abaef3",
+ "element": "128c910f-32be-43de-83be-a985d48ca2d7",
"name": "number",
"type": "text",
- "value": "2",
+ "value": "5",
"revision": null,
"index": 0,
"entity": null
@@ -768,12 +806,12 @@
},
{
"model": "documents.metadata",
- "pk": "fa6aa57b-f971-4225-aabe-a9816e2f4f5f",
+ "pk": "fbe7c682-b8ea-4cd1-a623-d3e5157b6bb3",
"fields": {
- "element": "d9ce2868-9b3a-4ac8-8ad7-6df7310a457d",
- "name": "folio",
+ "element": "ce69a6e9-94f4-4b09-834b-e4495463cdc3",
+ "name": "number",
"type": "text",
- "value": "1r",
+ "value": "4",
"revision": null,
"index": 0,
"entity": null
@@ -797,13 +835,13 @@
},
{
"model": "images.image",
- "pk": "3360cef2-344e-4f62-81cb-6032479d752a",
+ "pk": "3fd2a662-dc26-4333-908e-daf592cd7ae9",
"fields": {
"status": "unchecked",
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img2",
+ "path": "img6",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -812,13 +850,13 @@
},
{
"model": "images.image",
- "pk": "4ca014a4-2b76-45de-bfb7-4300facc17fa",
+ "pk": "4d020ec5-317d-40ab-9b2f-fedd6d528083",
"fields": {
"status": "unchecked",
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img6",
+ "path": "img1",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -827,13 +865,13 @@
},
{
"model": "images.image",
- "pk": "79dde88c-0abd-48ff-b333-cace738ddf7d",
+ "pk": "6e2f9194-8a29-430e-af51-457caaffddc2",
"fields": {
"status": "unchecked",
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img3",
+ "path": "img5",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -842,13 +880,13 @@
},
{
"model": "images.image",
- "pk": "a5a651be-7c6f-4422-935b-d5631e88c1a8",
+ "pk": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
"fields": {
"status": "unchecked",
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img1",
+ "path": "img3",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -857,13 +895,13 @@
},
{
"model": "images.image",
- "pk": "afd440a3-2f6d-499f-8f93-b7d96c049b79",
+ "pk": "97e99785-9d86-47b0-a375-09dfe4213464",
"fields": {
"status": "unchecked",
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
"server": 1,
- "path": "img5",
+ "path": "img2",
"width": 1000,
"height": 1000,
"datafile": null,
@@ -872,7 +910,7 @@
},
{
"model": "images.image",
- "pk": "c557a59c-86fe-44cc-9420-85220b8ef331",
+ "pk": "d3461459-0968-45e8-8641-0602e2ea46a2",
"fields": {
"status": "unchecked",
"created": "2020-02-02T01:23:45.678Z",
@@ -887,202 +925,202 @@
},
{
"model": "images.zone",
- "pk": "02e02df2-c24b-469d-9d93-5c038e7734a9",
+ "pk": "0f5d5d57-7d36-4617-baed-3d135c6e50cf",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3360cef2-344e-4f62-81cb-6032479d752a",
- "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
+ "image": "97e99785-9d86-47b0-a375-09dfe4213464",
+ "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
}
},
{
"model": "images.zone",
- "pk": "130ac813-ec5d-4858-bc37-f61efc839414",
+ "pk": "29031a61-eb67-44b6-a621-f112d94e761c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "79dde88c-0abd-48ff-b333-cace738ddf7d",
- "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
+ "image": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
+ "polygon": "Polygon([(0, 0), (0, 300), (300, 300), (300, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "1a98bb31-36ce-4c27-8946-dd5a28a598ca",
+ "pk": "2953f320-e934-4906-9770-450ff3d8048d",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3360cef2-344e-4f62-81cb-6032479d752a",
- "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
+ "image": "4d020ec5-317d-40ab-9b2f-fedd6d528083",
+ "polygon": "Polygon([(0, 0), (0, 600), (600, 600), (600, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "25d36a13-456c-4ee7-99cc-b0e4eaf3601d",
+ "pk": "2c21e647-b737-4114-bfc4-28313859f159",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "79dde88c-0abd-48ff-b333-cace738ddf7d",
- "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
+ "image": "97e99785-9d86-47b0-a375-09dfe4213464",
+ "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
}
},
{
"model": "images.zone",
- "pk": "4ef2fea5-9845-47bc-82b0-587e3e5461f5",
+ "pk": "3472cd35-58cd-4935-aa91-206c24127aaa",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3360cef2-344e-4f62-81cb-6032479d752a",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "image": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
+ "polygon": "Polygon([(600, 600), (600, 1000), (1000, 1000), (1000, 600), (600, 600)])"
}
},
{
"model": "images.zone",
- "pk": "5f62ff8a-6c6f-4e3e-af78-aedf856e74b4",
+ "pk": "357b0756-050d-4315-8859-1ea7bbe9856c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "a5a651be-7c6f-4422-935b-d5631e88c1a8",
- "polygon": "Polygon([(600, 600), (600, 1000), (1000, 1000), (1000, 600), (600, 600)])"
+ "image": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "797ed4bd-95db-45da-9f30-c5cb9398860e",
+ "pk": "3ba0691e-c2c1-4316-b8dc-f35b13ce2279",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "a5a651be-7c6f-4422-935b-d5631e88c1a8",
- "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
+ "image": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
+ "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
}
},
{
"model": "images.zone",
- "pk": "7edb3fb5-2fe6-4758-9e51-29cf872830d4",
+ "pk": "405c439a-8eb0-439a-b190-737fb83e7229",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "a5a651be-7c6f-4422-935b-d5631e88c1a8",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "image": "97e99785-9d86-47b0-a375-09dfe4213464",
+ "polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
}
},
{
"model": "images.zone",
- "pk": "7fbc91b3-627c-45b6-95e5-78d015594bbc",
+ "pk": "4c2d7b0e-368f-425c-b5fd-224afc4b1d94",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "79dde88c-0abd-48ff-b333-cace738ddf7d",
+ "image": "6e2f9194-8a29-430e-af51-457caaffddc2",
"polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "801a5ee2-9a10-42ad-9257-08534ba2e6f6",
+ "pk": "5307480a-13a0-4229-be95-c57f4dcc2503",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "c557a59c-86fe-44cc-9420-85220b8ef331",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "image": "4d020ec5-317d-40ab-9b2f-fedd6d528083",
+ "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
}
},
{
"model": "images.zone",
- "pk": "81a80065-892d-4def-8685-1605c7e1770f",
+ "pk": "62a2cade-d8f8-4e49-b143-f12871eead1c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "a5a651be-7c6f-4422-935b-d5631e88c1a8",
- "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
+ "image": "4d020ec5-317d-40ab-9b2f-fedd6d528083",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "8b77d647-3e9e-435e-93d9-ec02f0f7cb56",
+ "pk": "6a31844c-d9ce-4150-b5a3-b1fead611f2c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "79dde88c-0abd-48ff-b333-cace738ddf7d",
- "polygon": "Polygon([(600, 600), (600, 1000), (1000, 1000), (1000, 600), (600, 600)])"
+ "image": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
+ "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
}
},
{
"model": "images.zone",
- "pk": "c0acc6d4-7503-4c5e-977b-ce992d99d957",
+ "pk": "75c6d528-20aa-4fb8-8e1f-51b390ad1d7c",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "79dde88c-0abd-48ff-b333-cace738ddf7d",
- "polygon": "Polygon([(100, 100), (100, 200), (200, 200), (200, 100), (100, 100)])"
+ "image": "4d020ec5-317d-40ab-9b2f-fedd6d528083",
+ "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
}
},
{
"model": "images.zone",
- "pk": "c359abf0-b70a-4f07-bced-f1920bf8b962",
+ "pk": "75e2b202-2e4e-4490-89f4-1fdb6c685aa9",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "79dde88c-0abd-48ff-b333-cace738ddf7d",
- "polygon": "Polygon([(0, 0), (0, 300), (300, 300), (300, 0), (0, 0)])"
+ "image": "3fd2a662-dc26-4333-908e-daf592cd7ae9",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "c8e7289f-709c-4a2d-bf2e-052370ce3778",
+ "pk": "7d3cce77-abbf-4c92-836e-dcdafcfcca74",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "4ca014a4-2b76-45de-bfb7-4300facc17fa",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "image": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
+ "polygon": "Polygon([(300, 300), (300, 600), (600, 600), (600, 300), (300, 300)])"
}
},
{
"model": "images.zone",
- "pk": "d44ed0bb-dbbc-4c8b-956e-c0eee9061751",
+ "pk": "7e3cd3e9-4b7a-43bf-b68d-162db7dc57d4",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "a5a651be-7c6f-4422-935b-d5631e88c1a8",
- "polygon": "Polygon([(0, 0), (0, 600), (600, 600), (600, 0), (0, 0)])"
+ "image": "d3461459-0968-45e8-8641-0602e2ea46a2",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "e235fdbe-01d8-47d9-8581-85d91bfac75f",
+ "pk": "95fb6483-254c-43da-b640-b7100df32d54",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "a5a651be-7c6f-4422-935b-d5631e88c1a8",
+ "image": "4d020ec5-317d-40ab-9b2f-fedd6d528083",
"polygon": "Polygon([(700, 700), (700, 800), (800, 800), (800, 700), (700, 700)])"
}
},
{
"model": "images.zone",
- "pk": "e5fa833b-133d-4d71-b4fc-f3d2d0610215",
+ "pk": "9a24a7fa-7e9a-4847-a372-17e48f200aa5",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "3360cef2-344e-4f62-81cb-6032479d752a",
- "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
+ "image": "97e99785-9d86-47b0-a375-09dfe4213464",
+ "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
}
},
{
"model": "images.zone",
- "pk": "e92d542c-4eb6-43e0-9058-9148dc542b00",
+ "pk": "b8478c83-81d0-48ea-9133-c39b00042fec",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "79dde88c-0abd-48ff-b333-cace738ddf7d",
- "polygon": "Polygon([(300, 300), (300, 600), (600, 600), (600, 300), (300, 300)])"
+ "image": "81a6e4e6-91b8-4c8f-b46c-473f078124f0",
+ "polygon": "Polygon([(400, 400), (400, 500), (500, 500), (500, 400), (400, 400)])"
}
},
{
"model": "images.zone",
- "pk": "f75c127e-b909-4612-97b9-8d70c983d3f9",
+ "pk": "c37646fc-9a4e-49ce-b663-dfea5c44cb5e",
"fields": {
"created": "2020-02-02T01:23:45.678Z",
"updated": "2020-02-02T01:23:45.678Z",
- "image": "afd440a3-2f6d-499f-8f93-b7d96c049b79",
- "polygon": "Polygon([(0, 0), (0, 1000), (1000, 1000), (1000, 0), (0, 0)])"
+ "image": "4d020ec5-317d-40ab-9b2f-fedd6d528083",
+ "polygon": "Polygon([(600, 600), (600, 1000), (1000, 1000), (1000, 600), (600, 600)])"
}
},
{
@@ -2501,7 +2539,7 @@
"model": "users.user",
"pk": 1,
"fields": {
- "password": "pbkdf2_sha256$150000$kkDKMr5Bb5UH$V0LVTQkoG2CMrkB3Hjcb/5H1Pv67PBiRzKP9GnFEl2k=",
+ "password": "pbkdf2_sha256$150000$Cw1lRVqcMULj$1ksz8Ytm7iRX1/3T4arWn2xZxobLufc40FjKG9uFCDc=",
"last_login": null,
"email": "root@root.fr",
"is_active": true,
@@ -2514,7 +2552,7 @@
"model": "users.user",
"pk": 2,
"fields": {
- "password": "pbkdf2_sha256$150000$Yneqne1TjazE$LvR+TRjPcqtqjEnlGMUg3WgVJVSkzlkB6E0gTdiAO5w=",
+ "password": "pbkdf2_sha256$150000$bjtjlhDGeLhM$6bU845uzwx8r5PycelQoKg8Y+pkwYnMdhF6Adce3E+o=",
"last_login": null,
"email": "user@user.fr",
"is_active": true,
@@ -2525,7 +2563,7 @@
},
{
"model": "users.oauthcredentials",
- "pk": "b1bb020b-b37b-424f-bd4f-4005df7f4dd0",
+ "pk": "8df93bf0-dc69-4292-851e-2237744b6962",
"fields": {
"user": 2,
"provider_name": "gitlab",
@@ -2542,7 +2580,7 @@
"pk": 1,
"fields": {
"user": 2,
- "corpus": "8956fd1a-76aa-491d-b9c6-2b08a8b976a3",
+ "corpus": "b2737342-7df2-4e3b-808f-e9a6b66c537c",
"can_write": true,
"can_admin": true
}
diff --git a/arkindex/documents/management/commands/build_fixtures.py b/arkindex/documents/management/commands/build_fixtures.py
index ca1a7d732168ddf94c1604f16a0a763c8ad7dda2..ae37261a6e06a1ced2d80c131bc992640ebacb62 100644
--- a/arkindex/documents/management/commands/build_fixtures.py
+++ b/arkindex/documents/management/commands/build_fixtures.py
@@ -53,6 +53,9 @@ class Command(BaseCommand):
z5 = makezone(img5, 0, 1000)
z6 = makezone(img6, 0, 1000)
+ # Create a zone for the text line
+ line_zone = makezone(img1, 400, 500)
+
# Create internal user group
# It may have already been created by users.0002_default_groups
Group.objects.get_or_create(id=2, name='Internal')
@@ -104,6 +107,12 @@ class Command(BaseCommand):
slug='surface',
display_name='Surface',
)
+ line_type = corpus.types.create(
+ slug='text_line',
+ display_name='Line',
+ # Allows manual transcriptions of type 'line' for text lines
+ allowed_transcription=TranscriptionType.Line
+ )
# Create 2 volumes
vol1 = Element.objects.create(
@@ -189,6 +198,15 @@ class Command(BaseCommand):
score=1.0,
)
+ # Create a text zone on the first page of volume 1
+ text_line = Element.objects.create(
+ corpus=corpus,
+ type=line_type,
+ name="Text line",
+ zone=line_zone,
+ )
+ text_line.add_parent(p1_1)
+
# Create 5 acts on volume 1
act1 = Element.objects.create(corpus=corpus, type=act_type, name="Act 1")
act2 = Element.objects.create(corpus=corpus, type=act_type, name="Act 2")
diff --git a/arkindex/documents/tests/test_corpus.py b/arkindex/documents/tests/test_corpus.py
index a6a030a6667cb20b79df20c37022f340840e3cc6..91cc9b76a8af95b4236aa617466c3b32ccd9ccd0 100644
--- a/arkindex/documents/tests/test_corpus.py
+++ b/arkindex/documents/tests/test_corpus.py
@@ -67,6 +67,13 @@ class TestCorpus(FixtureAPITestCase):
'folder': False,
'default_view': False,
'allowed_transcription': None
+ },
+ {
+ 'slug': 'text_line',
+ 'display_name': 'Line',
+ 'folder': False,
+ 'default_view': False,
+ 'allowed_transcription': 'line'
}
])
@@ -122,6 +129,13 @@ class TestCorpus(FixtureAPITestCase):
'folder': False,
'default_view': False,
'allowed_transcription': None
+ },
+ {
+ 'slug': 'text_line',
+ 'display_name': 'Line',
+ 'folder': False,
+ 'default_view': False,
+ 'allowed_transcription': 'line'
}
])
@@ -187,6 +201,13 @@ class TestCorpus(FixtureAPITestCase):
'folder': False,
'default_view': False,
'allowed_transcription': None
+ },
+ {
+ 'slug': 'text_line',
+ 'display_name': 'Line',
+ 'folder': False,
+ 'default_view': False,
+ 'allowed_transcription': 'line'
}
])
@@ -308,6 +329,13 @@ class TestCorpus(FixtureAPITestCase):
'default_view': False,
'allowed_transcription': None
},
+ {
+ 'slug': 'text_line',
+ 'display_name': 'Line',
+ 'folder': False,
+ 'default_view': False,
+ 'allowed_transcription': 'line'
+ }
])
self.assertDictEqual(data, {
'id': str(self.corpus_public.id),
@@ -385,14 +413,14 @@ class TestCorpus(FixtureAPITestCase):
Ensure corpus deletion deletes elements first to prevent a ProtectedError
"""
self.assertEqual(Corpus.objects.count(), 3)
- self.assertEqual(Element.objects.count(), 19)
+ self.assertEqual(Element.objects.count(), 20)
# Use Django's default deletion method and expect a ProtectedError
with self.assertRaises(ProtectedError):
Model.delete(self.corpus)
self.assertEqual(Corpus.objects.count(), 3)
- self.assertEqual(Element.objects.count(), 19)
+ self.assertEqual(Element.objects.count(), 20)
# Use the corpus deletion method and it works!
self.corpus.delete()
diff --git a/arkindex/documents/tests/test_elements_api.py b/arkindex/documents/tests/test_elements_api.py
index ed673e909787e29a99656394c58e9ee8feb9481d..1c1834444803ce816dc94a51da22426c012fd229 100644
--- a/arkindex/documents/tests/test_elements_api.py
+++ b/arkindex/documents/tests/test_elements_api.py
@@ -508,7 +508,7 @@ class TestElementsAPI(FixtureAPITestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertDictEqual(
response.json(),
- {'element': "Element '{}' is linked to 14 children elements".format(self.vol.id)}
+ {'element': "Element '{}' is linked to 15 children elements".format(self.vol.id)}
)
def test_get_transcriptions(self):
@@ -675,7 +675,7 @@ class TestElementsAPI(FixtureAPITestCase):
self.assertEqual(response.json()['results'][0]['name'], 'Act 1')
def test_element_children(self):
- response = self.client.get(reverse('api:elements-children', kwargs={'pk': str(self.page.id)}))
+ response = self.client.get(reverse('api:elements-children', kwargs={'pk': str(self.element.id)}))
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertListEqual(response.json()['results'], [])
@@ -706,10 +706,10 @@ class TestElementsAPI(FixtureAPITestCase):
response = self.client.get(reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}) + '?recursive')
self.assertEqual(response.status_code, status.HTTP_200_OK)
- self.assertEqual(len(response.json()['results']), 14)
+ self.assertEqual(len(response.json()['results']), 15)
self.assertSetEqual(
{r['type'] for r in response.json()['results']},
- {'act', 'page', 'surface'},
+ {'act', 'page', 'surface', 'text_line'},
)
response = self.client.get(reverse('api:elements-children', kwargs={'pk': str(self.vol.id)}) + '?type=page')
@@ -784,14 +784,18 @@ class TestElementsAPI(FixtureAPITestCase):
with self.assertNumQueries(9):
response = self.client.get(reverse('api:elements'), data={'with_children_count': True})
self.assertEqual(response.status_code, status.HTTP_200_OK)
+ data = response.json()
+ self.assertIsNone(data['next'])
+
self.assertDictEqual(
- {element['name']: element['children_count'] for element in response.json()['results']},
+ {element['name']: element['children_count'] for element in data['results']},
{
'Act 1': 1,
'Act 2': 2,
'Act 3': 1,
'Act 4': 1,
'Act 5': 1,
+ 'Text line': 0,
'Surface A': 0,
'Surface B': 0,
'Surface C': 0,
@@ -799,7 +803,7 @@ class TestElementsAPI(FixtureAPITestCase):
'Surface E': 0,
'Surface F': 0,
'Volume 1': 8,
- 'Volume 1, page 1r': 0,
+ 'Volume 1, page 1r': 1,
'Volume 1, page 1v': 0,
'Volume 1, page 2r': 0,
'Volume 2': 3,
@@ -824,7 +828,7 @@ class TestElementsAPI(FixtureAPITestCase):
'Act 3': 1,
'Act 4': 1,
'Act 5': 1,
- 'Volume 1, page 1r': 0,
+ 'Volume 1, page 1r': 1,
'Volume 1, page 1v': 0,
'Volume 1, page 2r': 0,
}
diff --git a/arkindex/documents/tests/test_transcription_create.py b/arkindex/documents/tests/test_transcription_create.py
index 2691280a9ef69ee46f615ee2b3203a4f1b5c2fbd..27e9bce25637a375b09140e9b6b13f5e6660c764 100644
--- a/arkindex/documents/tests/test_transcription_create.py
+++ b/arkindex/documents/tests/test_transcription_create.py
@@ -22,11 +22,10 @@ class TestTranscriptionCreate(FixtureAPITestCase):
cls.page = cls.corpus.elements.get(name='Volume 1, page 1r')
cls.vol = cls.corpus.elements.get(name='Volume 1')
cls.src = DataSource.objects.get(slug='test')
- cls.page.type.allowed_transcription = TranscriptionType.Word
- cls.page.type.save()
+ cls.line = cls.corpus.elements.filter(type__slug='text_line').first()
def test_create_transcription_require_login(self):
- response = self.client.post(reverse('api:transcription-create', kwargs={'pk': self.page.id}), format='json')
+ response = self.client.post(reverse('api:transcription-create', kwargs={'pk': self.line.id}), format='json')
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
self.assertDictEqual(response.json(), {
'detail': 'Authentication credentials were not provided.'
@@ -95,24 +94,24 @@ class TestTranscriptionCreate(FixtureAPITestCase):
self.client.force_login(self.user)
with self.assertNumQueries(11):
response = self.client.post(
- reverse('api:transcription-create', kwargs={'pk': self.page.id}),
+ reverse('api:transcription-create', kwargs={'pk': self.line.id}),
format='json',
data={
- 'type': 'word',
- 'text': 'NEKUDOTAYIM'
+ 'type': 'line',
+ 'text': 'A perfect day in a perfect place'
}
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
- new_ts = Transcription.objects.get(text="NEKUDOTAYIM", type=TranscriptionType.Word)
+ new_ts = Transcription.objects.get(text='A perfect day in a perfect place', type=TranscriptionType.Line)
self.assertIsNone(new_ts.zone)
self.assertIsNone(new_ts.score)
self.assertEqual(new_ts.source.slug, 'manual')
- self.assertTrue(self.page.transcriptions.filter(pk=new_ts.id).exists())
+ self.assertTrue(self.line.transcriptions.filter(pk=new_ts.id).exists())
get_layer_mock().send.assert_called_once_with('reindex', {
'type': 'reindex.start',
- 'element': str(self.page.id),
+ 'element': str(self.line.id),
'corpus': None,
'entity': None,
'transcriptions': True,
@@ -130,17 +129,17 @@ class TestTranscriptionCreate(FixtureAPITestCase):
self.client.force_login(self.user)
response = self.client.post(
- reverse('api:transcription-create', kwargs={'pk': self.page.id}),
+ reverse('api:transcription-create', kwargs={'pk': self.line.id}),
format='json',
data={
- 'type': 'word',
+ 'type': 'line',
'polygon': [(0, 0), (42, 0), (42, 42), (0, 42), (0, 0)],
'text': 'SQUARE'
}
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
- new_ts = Transcription.objects.get(text='SQUARE', type=TranscriptionType.Word)
+ new_ts = Transcription.objects.get(text='SQUARE', type=TranscriptionType.Line)
self.assertEqual(new_ts.zone, None)
@patch('arkindex.project.triggers.get_channel_layer')
@@ -150,14 +149,15 @@ class TestTranscriptionCreate(FixtureAPITestCase):
"""
manual_source = DataSource.objects.create(type=MLToolType.Recognizer, slug='manual', internal=True)
get_layer_mock.return_value.send = AsyncMock()
+
self.client.force_login(self.user)
ts = self.page.transcriptions.create(text='GLOUBIBOULGA', type=TranscriptionType.Word, source=manual_source)
with self.assertNumQueries(8):
response = self.client.post(
- reverse('api:transcription-create', kwargs={'pk': self.page.id}),
+ reverse('api:transcription-create', kwargs={'pk': self.line.id}),
format='json',
data={
- 'type': 'word',
+ 'type': 'line',
'text': ts.text
}
)
@@ -170,7 +170,7 @@ class TestTranscriptionCreate(FixtureAPITestCase):
def test_create_transcription_wrong_type(self, get_layer_mock):
self.client.force_login(self.user)
response = self.client.post(
- reverse('api:transcription-create', kwargs={'pk': self.page.id}),
+ reverse('api:transcription-create', kwargs={'pk': self.line.id}),
format='json',
data={
'type': 'AAAAA',
@@ -187,11 +187,11 @@ class TestTranscriptionCreate(FixtureAPITestCase):
def test_create_transcription_no_search(self, get_layer_mock):
self.client.force_login(self.user)
response = self.client.post(
- reverse('api:transcription-create', kwargs={'pk': self.page.id}),
+ reverse('api:transcription-create', kwargs={'pk': self.line.id}),
format='json',
data={
- 'type': 'word',
- 'text': 'NEKUDOTAYIM'
+ 'type': 'line',
+ 'text': 'A classy text line'
}
)
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
@@ -203,24 +203,24 @@ class TestTranscriptionCreate(FixtureAPITestCase):
"""
self.client.force_login(self.user)
response = self.client.post(
- reverse('api:transcription-create', kwargs={'pk': self.page.id}),
+ reverse('api:transcription-create', kwargs={'pk': self.line.id}),
format='json',
data={
- 'type': 'line',
- 'text': 'A classy text line'
+ 'type': 'word',
+ 'text': 'NEKUDOTAYIM'
}
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertDictEqual(response.json(), {
- 'type': ["Only transcriptions of type 'word' are allowed for this element"]
+ 'type': ["Only transcriptions of type 'line' are allowed for this element"]
})
def test_manual_transcription_no_allowed_type(self):
- self.page.type.allowed_transcription = None
- self.page.type.save()
+ self.line.type.allowed_transcription = None
+ self.line.type.save()
self.client.force_login(self.user)
response = self.client.post(
- reverse('api:transcription-create', kwargs={'pk': self.page.id}),
+ reverse('api:transcription-create', kwargs={'pk': self.line.id}),
format='json',
data={
'type': 'line',
diff --git a/arkindex/images/tests/test_image_elements.py b/arkindex/images/tests/test_image_elements.py
index 0524f463c4a134bc1f8f5e4016cb477fd888b559..0cf4ac39f345fdc6960110fa381d89344cd072ca 100644
--- a/arkindex/images/tests/test_image_elements.py
+++ b/arkindex/images/tests/test_image_elements.py
@@ -16,7 +16,7 @@ class TestImageElements(FixtureTestCase):
data = response.json()
self.assertListEqual(
[element['name'] for element in data['results']],
- ['Volume 1, page 1r', 'Surface A', 'Surface B'],
+ ['Volume 1, page 1r', 'Surface A', 'Surface B', 'Text line'],
)
def test_image_elements_type_filter(self):