Get intertext from database

ElectronicBabylonianLiterature · Dec 14, 2021 · 243631f · 243631f
1 parent 5bf5d70
commit 243631f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/ebl/corpus/application/display_schemas.py b/ebl/corpus/application/display_schemas.py
@@ -11,6 +11,9 @@
 
 class LineDisplaySchema(Schema):
     number = fields.Nested(OneOfLineNumberSchema, required=True)
+    intertext = fields.List(
+        fields.Nested(OneOfNoteLinePartSchema), load_default=tuple()
+    )
     reconstruction = fields.List(fields.Nested(OneOfTokenSchema), load_default=tuple())
     translation = fields.List(
         fields.Nested(OneOfNoteLinePartSchema), load_default=tuple()
@@ -20,7 +23,7 @@ class LineDisplaySchema(Schema):
     def make_line(self, data: dict, **kwargs) -> LineDisplay:
         return LineDisplay(
             data["number"],
-            tuple(),
+            tuple(data["intertext"]),
             tuple(data["reconstruction"]),
             tuple(data["translation"]),
         )

diff --git a/ebl/corpus/infrastructure/queries.py b/ebl/corpus/infrastructure/queries.py
@@ -149,6 +149,18 @@ def aggregate_chapter_display(id_: ChapterId) -> List[dict]:
                                     0,
                                 ]
                             },
+                            "intertext": {
+                                "$arrayElemAt": [
+                                    {
+                                        "$map": {
+                                            "input": "$$line.variants",
+                                            "as": "variant",
+                                            "in": "$$variant.intertext",
+                                        }
+                                    },
+                                    0,
+                                ]
+                            },
                             "reconstruction": {
                                 "$arrayElemAt": [
                                     {

diff --git a/ebl/tests/corpus/test_chapter_display_schema b/ebl/tests/corpus/test_chapter_display_schema
@@ -28,6 +28,9 @@ def to_dict(chapter: ChapterDisplay) -> dict:
         "lines": [
             {
                 "number": OneOfLineNumberSchema().dump(line.number),
+                "intertext": OneOfNoteLinePartSchema().dump(
+                    line.intertext, many=True
+                ),
                 "reconstruction": OneOfTokenSchema().dump(
                     line.reconstruction, many=True
                 ),