From 262f658218df0ceca10968cc8f4f09f1d95c3a31 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Thu, 14 Mar 2024 17:52:14 +0100 Subject: [PATCH 01/10] keep gender if exists or use the other one #176 --- apis_core/apis_metainfo/models.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/apis_core/apis_metainfo/models.py b/apis_core/apis_metainfo/models.py index 697eb00..71e4622 100644 --- a/apis_core/apis_metainfo/models.py +++ b/apis_core/apis_metainfo/models.py @@ -298,17 +298,23 @@ def merge_with(self, entities): if not isinstance(entities, list) and not isinstance(entities, QuerySet): entities = [entities] entities = [ - self_model_class.objects.get(pk=ent) - if type(ent) == int - else ent # noqa: E721 + self_model_class.objects.get(pk=ent) if type(ent) == int else ent # noqa: E721 for ent in entities ] rels = ContentType.objects.filter( app_label="apis_relations", model__icontains=e_a ) + try: + self_gender = self.gender + except AttributeError: + self_gender = False notes = [] references = [] for ent in entities: + try: + ent_gender = ent.gender + except AttributeError: + ent_gender = False if isinstance(ent.notes, str): notes.append(ent.notes) if isinstance(ent.references, str): @@ -357,6 +363,12 @@ def merge_with(self, entities): setattr(t, "related_{}".format(e_a.lower()), self) t.save() ent.delete() + if self_gender: + pass + elif ent_gender: + self.gender = ent_gender + else: + pass save_target = False if len(notes) > 0: additional_notes = " ".join(notes) From 3e4f1c1c99875124db0546b43dd864ac9423f28b Mon Sep 17 00:00:00 2001 From: csae8092 Date: Thu, 14 Mar 2024 17:57:45 +0100 Subject: [PATCH 02/10] test for gender merging --- apis_core/apis_entities/tests.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apis_core/apis_entities/tests.py b/apis_core/apis_entities/tests.py index ab75b17..5d22271 100644 --- a/apis_core/apis_entities/tests.py +++ b/apis_core/apis_entities/tests.py @@ -140,14 +140,15 @@ def test_009_merge_view(self): after = Person.objects.all().count() self.assertTrue(before > after) - def test_009a_merge_notesandreferences(self): + def test_009a_merge_notesandreferences_andgedner(self): source_one = Person.objects.create( name="Person which will be merged", notes="notes_one", references="references_one", + gender="female", ) source_two = Person.objects.create( - name="Person two which will be merged", + name="Person two which will be merged", gender="male" ) target = Person.objects.create( name="Person which will be kept", @@ -155,11 +156,17 @@ def test_009a_merge_notesandreferences(self): references="target_references", ) target.merge_with(source_one.id) + self.assertEqual("female", target.gender) self.assertTrue("notes_one" in target.notes) self.assertTrue("target_notes" in target.notes) self.assertTrue("references_one" in target.references) self.assertTrue("target_references" in target.references) target.merge_with(source_two) + self.assertEqual("female", target.gender) + + place_target = Place.objects.create(name="Sumsi") + place_source = Place.objects.create(name="Dumsi") + place_target.merge(place_source.id) def test_010_delete_views(self): client.login(**USER) From 014d4ed913c998a4e2635399076cc8adca096575 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Thu, 14 Mar 2024 18:04:24 +0100 Subject: [PATCH 03/10] fixed broken test --- apis_core/apis_entities/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis_core/apis_entities/tests.py b/apis_core/apis_entities/tests.py index 5d22271..5468ef3 100644 --- a/apis_core/apis_entities/tests.py +++ b/apis_core/apis_entities/tests.py @@ -166,7 +166,7 @@ def test_009a_merge_notesandreferences_andgedner(self): place_target = Place.objects.create(name="Sumsi") place_source = Place.objects.create(name="Dumsi") - place_target.merge(place_source.id) + place_target.merge_with(place_source.id) def test_010_delete_views(self): client.login(**USER) From af7bc876ee26610273843b3cec01037fd89f8496 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Fri, 12 Apr 2024 14:08:24 +0200 Subject: [PATCH 04/10] closes #179 [skip ci] --- issue__169_merging.ipynb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/issue__169_merging.ipynb b/issue__169_merging.ipynb index 86e0b54..a80c443 100644 --- a/issue__169_merging.ipynb +++ b/issue__169_merging.ipynb @@ -7,6 +7,7 @@ "metadata": {}, "outputs": [], "source": [ + "# rerun 2024-04-12\n", "# rerun 2024-04-09\n", "# run 2024-04-05\n", "from tqdm import tqdm\n", @@ -39,6 +40,14 @@ " except Exception as e:\n", " print(keep.id, remove.id, e)" ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "d9f368fb", + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { From b0574a129160ea727e6051467f51fa711c1b9009 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Fri, 12 Apr 2024 17:11:59 +0200 Subject: [PATCH 05/10] added scipt to fetch missing feature codes #171 [skip ci] --- .gitignore | 4 +- issue__171_gnfeature_codes.ipynb | 84 ++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 issue__171_gnfeature_codes.ipynb diff --git a/.gitignore b/.gitignore index dc60f7a..59551d0 100644 --- a/.gitignore +++ b/.gitignore @@ -185,4 +185,6 @@ hansi.* media/relations.gexf edges.csv nodes.csv -node_modules/ \ No newline at end of file +node_modules/ +featureCodes_en.csv +featureCodes_en.tsv diff --git a/issue__171_gnfeature_codes.ipynb b/issue__171_gnfeature_codes.ipynb new file mode 100644 index 0000000..582b03c --- /dev/null +++ b/issue__171_gnfeature_codes.ipynb @@ -0,0 +1,84 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "id": "51cca613", + "metadata": {}, + "outputs": [], + "source": [ + "import pandas as pd\n", + "from tqdm import tqdm\n", + "from django.core.exceptions import MultipleObjectsReturned" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "733e8089", + "metadata": {}, + "outputs": [], + "source": [ + "df = pd.read_table(\"./featureCodes_en.tsv\", sep=\"\\t\", header=None)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "b41f79d4", + "metadata": {}, + "outputs": [], + "source": [ + "print(PlaceType.objects.all().count())" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "f380fb44", + "metadata": {}, + "outputs": [], + "source": [ + "for i, row in tqdm(df.iterrows()):\n", + " exists = PlaceType.objects.filter(name=row[0])\n", + " if exists:\n", + " pass\n", + " else:\n", + " try:\n", + " new_place = PlaceType.objects.create(name=row[0], description=row[1])\n", + " except:\n", + " pass\n", + "print(PlaceType.objects.all().count()) " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "bb3f96c3", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Django Shell-Plus", + "language": "python", + "name": "django_extensions" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.10.12" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} From ec014772603bdc6095b89a45ecb117ac4397905c Mon Sep 17 00:00:00 2001 From: csae8092 Date: Thu, 18 Apr 2024 09:05:00 +0200 Subject: [PATCH 06/10] closes #171 and closes #180 --- issue__171_gnfeature_codes.ipynb | 1 + issue__180_merge_place_types.ipynb | 130 +++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 issue__180_merge_place_types.ipynb diff --git a/issue__171_gnfeature_codes.ipynb b/issue__171_gnfeature_codes.ipynb index 582b03c..1d30150 100644 --- a/issue__171_gnfeature_codes.ipynb +++ b/issue__171_gnfeature_codes.ipynb @@ -7,6 +7,7 @@ "metadata": {}, "outputs": [], "source": [ + "# run against production 2024-04-18\n", "import pandas as pd\n", "from tqdm import tqdm\n", "from django.core.exceptions import MultipleObjectsReturned" diff --git a/issue__180_merge_place_types.ipynb b/issue__180_merge_place_types.ipynb new file mode 100644 index 0000000..e7e0eb2 --- /dev/null +++ b/issue__180_merge_place_types.ipynb @@ -0,0 +1,130 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "id": "f47bcd68", + "metadata": {}, + "outputs": [], + "source": [ + "# run against production 2024-04-18\n", + "import pandas as pd" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "f820cd7f", + "metadata": {}, + "outputs": [], + "source": [ + "props = [\"id\", \"name\"] " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "fe06fca6", + "metadata": {}, + "outputs": [], + "source": [ + "df = pd.DataFrame(\n", + " PlaceType.objects.all().values_list(*props),\n", + " columns=props,\n", + ").astype(\"str\")" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "e6c74cfd", + "metadata": {}, + "outputs": [], + "source": [ + "df" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "9c0cca8a", + "metadata": {}, + "outputs": [], + "source": [ + "to_process = []\n", + "for g, ndf in df.groupby(\"name\"):\n", + " if len(ndf) > 1:\n", + " to_process.append([int(x) for x in ndf['id'].tolist()])\n", + " " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "0a73dbb6", + "metadata": {}, + "outputs": [], + "source": [ + "len(to_process)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "fd48e0e6", + "metadata": {}, + "outputs": [], + "source": [ + "print(f\"Nr. of place types before: {PlaceType.objects.all().count()}\")\n", + "for x in to_process:\n", + " good_type = PlaceType.objects.get(id=x[0])\n", + " bad_type = PlaceType.objects.get(id=x[1])\n", + " bad_type_base = VocabsBaseClass.objects.get(id=x[1])\n", + " for place in Place.objects.filter(kind=bad_type):\n", + " place.kind = good_type\n", + " place.save()\n", + " bad_type_base.delete()\n", + "print(f\"Nr. of place types after: {PlaceType.objects.all().count()}\")\n" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "bd2993ae", + "metadata": {}, + "outputs": [], + "source": [ + "PlaceType.objects.filter(name=\"A.ADM1\")" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "313cea39", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Django Shell-Plus", + "language": "python", + "name": "django_extensions" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.10.12" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} From 2ca08a4ce12982addc0aca21d09cfb8710904f57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Anton=20M=C3=BCller?= Date: Thu, 25 Apr 2024 14:45:48 +0200 Subject: [PATCH 07/10] Update settings.py fixed color --- pmb/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmb/settings.py b/pmb/settings.py index af8d613..cfc4d9b 100644 --- a/pmb/settings.py +++ b/pmb/settings.py @@ -310,7 +310,7 @@ DEFAULT_COLOR = "#9B5F98" DOMAIN_MAPPING = [ ("d-nb.info", "gnd", "#006AB3"), - ("geonames", "geonames", "##363"), + ("geonames", "geonames", "#363"), ("wikidata", "wikidata", "#0645ad"), ("wikipedia", "wikipedia", "#0645AD"), ("fackel.oeaw.ac.at", "fackel", "#CE0F0B"), From 536fa7841839fa78e0042eeb2f939ad775d67d58 Mon Sep 17 00:00:00 2001 From: csae8092 Date: Fri, 26 Apr 2024 07:09:26 +0200 Subject: [PATCH 08/10] no whitespace, closes #182 --- apis_core/apis_metainfo/models.py | 4 ++-- issue__102_gender.ipynb => notebooks/issue__102_gender.ipynb | 0 .../issue__112_fix_image_urls.ipynb | 0 .../issue__162_tagebuchurifix.ipynb | 0 .../issue__166_bahruris.ipynb | 0 .../issue__169_merging.ipynb | 0 .../issue__171_gnfeature_codes.ipynb | 0 .../issue__17_dataimports.ipynb | 0 .../issue__17_dataimports_part2.ipynb | 0 .../issue__17_dataimports_part3_works.ipynb | 0 .../issue__17_remove_references.ipynb | 0 .../issue__180_merge_place_types.ipynb | 0 .../issue__78_rm_anno_uris.ipynb | 0 .../issue__79_fetch_gn_feature_codes.ipynb | 0 issue__8.ipynb => notebooks/issue__8.ipynb | 0 .../issue__80_professions.ipynb | 0 issue__87.ipynb => notebooks/issue__87.ipynb | 0 .../wikidata_wiki__to_wikidata_entity.ipynb | 0 pmb/settings.py | 2 ++ 19 files changed, 4 insertions(+), 2 deletions(-) rename issue__102_gender.ipynb => notebooks/issue__102_gender.ipynb (100%) rename issue__112_fix_image_urls.ipynb => notebooks/issue__112_fix_image_urls.ipynb (100%) rename issue__162_tagebuchurifix.ipynb => notebooks/issue__162_tagebuchurifix.ipynb (100%) rename issue__166_bahruris.ipynb => notebooks/issue__166_bahruris.ipynb (100%) rename issue__169_merging.ipynb => notebooks/issue__169_merging.ipynb (100%) rename issue__171_gnfeature_codes.ipynb => notebooks/issue__171_gnfeature_codes.ipynb (100%) rename issue__17_dataimports.ipynb => notebooks/issue__17_dataimports.ipynb (100%) rename issue__17_dataimports_part2.ipynb => notebooks/issue__17_dataimports_part2.ipynb (100%) rename issue__17_dataimports_part3_works.ipynb => notebooks/issue__17_dataimports_part3_works.ipynb (100%) rename issue__17_remove_references.ipynb => notebooks/issue__17_remove_references.ipynb (100%) rename issue__180_merge_place_types.ipynb => notebooks/issue__180_merge_place_types.ipynb (100%) rename issue__78_rm_anno_uris.ipynb => notebooks/issue__78_rm_anno_uris.ipynb (100%) rename fetch_gn_feature_codes__issue__79.ipynb => notebooks/issue__79_fetch_gn_feature_codes.ipynb (100%) rename issue__8.ipynb => notebooks/issue__8.ipynb (100%) rename issue__80_professions.ipynb => notebooks/issue__80_professions.ipynb (100%) rename issue__87.ipynb => notebooks/issue__87.ipynb (100%) rename wikidata_wiki__to_wikidata_entity.ipynb => notebooks/wikidata_wiki__to_wikidata_entity.ipynb (100%) diff --git a/apis_core/apis_metainfo/models.py b/apis_core/apis_metainfo/models.py index 71e4622..a8dc8b0 100644 --- a/apis_core/apis_metainfo/models.py +++ b/apis_core/apis_metainfo/models.py @@ -183,14 +183,14 @@ def clean_start_date_written(self): if self.start_date_written: if "<" in self.start_date_written: clean_date = self.start_date_written.split("<")[0] - return clean_date + return clean_date.strip() def clean_end_date_written(self): clean_date = self.end_date_written if self.end_date_written: if "<" in self.end_date_written: clean_date = self.end_date_written.split("<")[0] - return clean_date + return clean_date.strip() @classmethod def get_listview_url(self): diff --git a/issue__102_gender.ipynb b/notebooks/issue__102_gender.ipynb similarity index 100% rename from issue__102_gender.ipynb rename to notebooks/issue__102_gender.ipynb diff --git a/issue__112_fix_image_urls.ipynb b/notebooks/issue__112_fix_image_urls.ipynb similarity index 100% rename from issue__112_fix_image_urls.ipynb rename to notebooks/issue__112_fix_image_urls.ipynb diff --git a/issue__162_tagebuchurifix.ipynb b/notebooks/issue__162_tagebuchurifix.ipynb similarity index 100% rename from issue__162_tagebuchurifix.ipynb rename to notebooks/issue__162_tagebuchurifix.ipynb diff --git a/issue__166_bahruris.ipynb b/notebooks/issue__166_bahruris.ipynb similarity index 100% rename from issue__166_bahruris.ipynb rename to notebooks/issue__166_bahruris.ipynb diff --git a/issue__169_merging.ipynb b/notebooks/issue__169_merging.ipynb similarity index 100% rename from issue__169_merging.ipynb rename to notebooks/issue__169_merging.ipynb diff --git a/issue__171_gnfeature_codes.ipynb b/notebooks/issue__171_gnfeature_codes.ipynb similarity index 100% rename from issue__171_gnfeature_codes.ipynb rename to notebooks/issue__171_gnfeature_codes.ipynb diff --git a/issue__17_dataimports.ipynb b/notebooks/issue__17_dataimports.ipynb similarity index 100% rename from issue__17_dataimports.ipynb rename to notebooks/issue__17_dataimports.ipynb diff --git a/issue__17_dataimports_part2.ipynb b/notebooks/issue__17_dataimports_part2.ipynb similarity index 100% rename from issue__17_dataimports_part2.ipynb rename to notebooks/issue__17_dataimports_part2.ipynb diff --git a/issue__17_dataimports_part3_works.ipynb b/notebooks/issue__17_dataimports_part3_works.ipynb similarity index 100% rename from issue__17_dataimports_part3_works.ipynb rename to notebooks/issue__17_dataimports_part3_works.ipynb diff --git a/issue__17_remove_references.ipynb b/notebooks/issue__17_remove_references.ipynb similarity index 100% rename from issue__17_remove_references.ipynb rename to notebooks/issue__17_remove_references.ipynb diff --git a/issue__180_merge_place_types.ipynb b/notebooks/issue__180_merge_place_types.ipynb similarity index 100% rename from issue__180_merge_place_types.ipynb rename to notebooks/issue__180_merge_place_types.ipynb diff --git a/issue__78_rm_anno_uris.ipynb b/notebooks/issue__78_rm_anno_uris.ipynb similarity index 100% rename from issue__78_rm_anno_uris.ipynb rename to notebooks/issue__78_rm_anno_uris.ipynb diff --git a/fetch_gn_feature_codes__issue__79.ipynb b/notebooks/issue__79_fetch_gn_feature_codes.ipynb similarity index 100% rename from fetch_gn_feature_codes__issue__79.ipynb rename to notebooks/issue__79_fetch_gn_feature_codes.ipynb diff --git a/issue__8.ipynb b/notebooks/issue__8.ipynb similarity index 100% rename from issue__8.ipynb rename to notebooks/issue__8.ipynb diff --git a/issue__80_professions.ipynb b/notebooks/issue__80_professions.ipynb similarity index 100% rename from issue__80_professions.ipynb rename to notebooks/issue__80_professions.ipynb diff --git a/issue__87.ipynb b/notebooks/issue__87.ipynb similarity index 100% rename from issue__87.ipynb rename to notebooks/issue__87.ipynb diff --git a/wikidata_wiki__to_wikidata_entity.ipynb b/notebooks/wikidata_wiki__to_wikidata_entity.ipynb similarity index 100% rename from wikidata_wiki__to_wikidata_entity.ipynb rename to notebooks/wikidata_wiki__to_wikidata_entity.ipynb diff --git a/pmb/settings.py b/pmb/settings.py index cfc4d9b..6f68666 100644 --- a/pmb/settings.py +++ b/pmb/settings.py @@ -332,4 +332,6 @@ ("bahr-textverzeichnis.acdh.oeaw.ac.at/pmb", "bahr-textverzeichnis", "#8E4162"), ("bahr-textverzeichnis.acdh.oeaw.ac.at/TSN-", "bahr-TSN", "#ce0000"), ("amp.acdh.oeaw.ac.at", "auden-musulin-papers", "#b59890"), + ("schnitzler-zeitungen.", "schnitzler-zeitungen", DEFAULT_COLOR), + ("schnitzler-mikrofilme.", "schnitzler-mikrofilme", DEFAULT_COLOR), ] From d6eda9bf93975f75a9d880025d8aacf584b6932f Mon Sep 17 00:00:00 2001 From: csae8092 Date: Fri, 26 Apr 2024 07:10:37 +0200 Subject: [PATCH 09/10] more uris, closes #181 --- notebooks/issue__181_import_uris.ipynb | 106 +++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 notebooks/issue__181_import_uris.ipynb diff --git a/notebooks/issue__181_import_uris.ipynb b/notebooks/issue__181_import_uris.ipynb new file mode 100644 index 0000000..07f3c82 --- /dev/null +++ b/notebooks/issue__181_import_uris.ipynb @@ -0,0 +1,106 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "id": "a1d2f86e", + "metadata": {}, + "outputs": [], + "source": [ + "# 2024-04-26 run against production\n", + "from tqdm.notebook import tqdm\n", + "from dumper.utils import gsheet_to_df\n", + "from django.db import IntegrityError\n", + "\n", + "from apis_core.utils import get_object_from_pk_or_uri\n" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "b83e3a0d", + "metadata": {}, + "outputs": [], + "source": [ + "df = gsheet_to_df(\"1prs6ih08rQ5-n4OXotfMp6RMTWBDIYKtD-MF9sQ3Mwo\")" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "46dc7464", + "metadata": {}, + "outputs": [], + "source": [ + "df.head()" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "2123b4c4", + "metadata": {}, + "outputs": [], + "source": [ + "already_there = []\n", + "for i, row in tqdm(df.iterrows(), total=len(df)):\n", + " try:\n", + " pmb_id = int(row[\"PMB\"])\n", + " except ValueError:\n", + " continue\n", + " domain = row[\"Domain\"]\n", + " uri = row[\"URI\"]\n", + " entity = get_object_from_pk_or_uri(pmb_id)\n", + " try:\n", + " uri_obj, _ = Uri.objects.get_or_create(\n", + " uri=uri,\n", + " domain=domain,\n", + " entity=entity\n", + " )\n", + " except IntegrityError:\n", + " already_there.append(uri)\n", + " " + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "bf6bd6d6", + "metadata": {}, + "outputs": [], + "source": [ + "for x in already_there:\n", + " print(x)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "id": "9e846928", + "metadata": {}, + "outputs": [], + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Django Shell-Plus", + "language": "python", + "name": "django_extensions" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.10.12" + } + }, + "nbformat": 4, + "nbformat_minor": 5 +} From 3c6cbc50608f860620383f9ba039bee3a69e74fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Anton=20M=C3=BCller?= Date: Fri, 26 Apr 2024 07:55:45 +0200 Subject: [PATCH 10/10] colors for zeitungen and microfilms --- pmb/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmb/settings.py b/pmb/settings.py index 6f68666..be91c96 100644 --- a/pmb/settings.py +++ b/pmb/settings.py @@ -332,6 +332,6 @@ ("bahr-textverzeichnis.acdh.oeaw.ac.at/pmb", "bahr-textverzeichnis", "#8E4162"), ("bahr-textverzeichnis.acdh.oeaw.ac.at/TSN-", "bahr-TSN", "#ce0000"), ("amp.acdh.oeaw.ac.at", "auden-musulin-papers", "#b59890"), - ("schnitzler-zeitungen.", "schnitzler-zeitungen", DEFAULT_COLOR), - ("schnitzler-mikrofilme.", "schnitzler-mikrofilme", DEFAULT_COLOR), + ("schnitzler-zeitungen.", "schnitzler-zeitungen", "#8E8575"), + ("schnitzler-mikrofilme.", "schnitzler-mikrofilme", "#6e7b8b"), ]