From 2aa391966640d07e702fffe440078b50a1160a3d Mon Sep 17 00:00:00 2001
From: Christoph Lorenz <christoph.lorenz@bsb-muenchen.de>
Date: Thu, 7 Mar 2024 16:14:15 +0100
Subject: [PATCH 1/2] More expressiontypes

---
 .../application-typedeclarations.yml          | 132 ++++++++++++++++--
 1 file changed, 124 insertions(+), 8 deletions(-)

diff --git a/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml b/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
index 83b43328a..f0b8d6afa 100644
--- a/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
+++ b/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
@@ -34,28 +34,144 @@ application:
       - UNSPECIFIED
 
     expressionTypes:
-      - mainType: TEXT
+      - mainType: ANNIVERSARYPUB
         subType: HANDMADE
-      - mainType: TEXT
+      - mainType: ANNIVERSARYPUB
         subType: PRINT
-      - mainType: SCORE
+      - mainType: ARTISTBOOK
         subType: HANDMADE
-      - mainType: SCORE
+      - mainType: ARTISTBOOK
+        subType: PRINT
+      - mainType: AUTOGRAPH
+        subType: HANDMADE
+      - mainType: AUTOGRAPH
+        subType: PRINT
+      - mainType: BIOGRAPHY
+        subType: HANDMADE
+      - mainType: BIOGRAPHY
+        subType: PRINT
+      - mainType: BROADSHEET
+        subType: HANDMADE
+      - mainType: BROADSHEET
+        subType: PRINT
+      - mainType: CATALOGUE
+        subType: HANDMADE
+      - mainType: CATALOGUE
+        subType: PRINT
+      - mainType: CHILDRENSBOOK
+        subType: HANDMADE
+      - mainType: CHILDRENSBOOK
+        subType: PRINT
+      - mainType: COLLECTION
+        subType: HANDMADE
+      - mainType: COLLECTION
+        subType: PRINT
+      - mainType: COMMENT
+        subType: HANDMADE
+      - mainType: COMMENT
+        subType: PRINT
+      - mainType: DIARY
+        subType: HANDMADE
+      - mainType: DIARY
+        subType: PRINT
+      - mainType: DICTIONARY
+        subType: HANDMADE
+      - mainType: DICTIONARY
+        subType: PRINT
+      - mainType: DIRECTORY
+        subType: HANDMADE
+      - mainType: DIRECTORY
+        subType: PRINT
+      - mainType: FICTION
+        subType: HANDMADE
+      - mainType: FICTION
+        subType: PRINT
+      - mainType: GUIDE
+        subType: HANDMADE
+      - mainType: GUIDE
+        subType: PRINT
+      - mainType: ILLUSTRATEDBOOK
+        subType: HANDMADE
+      - mainType: ILLUSTRATEDBOOK
+        subType: PRINT
+      - mainType: INCUNABULUM
+        subType: HANDMADE
+      - mainType: INCUNABULUM
+        subType: PRINT
+      - mainType: JOURNAL
+        subType: HANDMADE
+      - mainType: JOURNAL
+        subType: PRINT
+      - mainType: LETTERS
+        subType: HANDMADE
+      - mainType: LETTERS
+        subType: PRINT
+      - mainType: MANUSCRIPT
+        subType: HANDMADE
+      - mainType: MANUSCRIPT
         subType: PRINT
       - mainType: MAP
         subType: HANDMADE
       - mainType: MAP
         subType: PRINT
-      - mainType: IMAGE
+      - mainType: NEWSPAPER
         subType: HANDMADE
-      - mainType: IMAGE
+      - mainType: NEWSPAPER
+        subType: PRINT
+      - mainType: PAPYRUS
+        subType: HANDMADE
+      - mainType: PAPYRUS
+        subType: PRINT
+      - mainType: PROCEEDINGS
+        subType: HANDMADE
+      - mainType: PROCEEDINGS
         subType: PRINT
-      - mainType: SPATIAL
+      - mainType: PUBOFFICIAL
         subType: HANDMADE
-      - mainType: SPATIAL
+      - mainType: PUBOFFICIAL
+        subType: PRINT
+      - mainType: PAMPHLET
+        subType: HANDMADE
+      - mainType: PAMPHLET
+        subType: PRINT
+      - mainType: REPORT
+        subType: HANDMADE
+      - mainType: REPORT
+        subType: PRINT
+      - mainType: SCHOOLPROGRAM
+        subType: HANDMADE
+      - mainType: SCHOOLPROGRAM
+        subType: PRINT
+      - mainType: SCORE
+        subType: HANDMADE
+      - mainType: SCORE
+        subType: PRINT
+      - mainType: SOURCE
+        subType: HANDMADE
+      - mainType: SOURCE
+        subType: PRINT
+      - mainType: SPEECH
+        subType: HANDMADE
+      - mainType: SPEECH
+        subType: PRINT
+      - mainType: STATISTICS
+        subType: HANDMADE
+      - mainType: STATISTICS
+        subType: PRINT
+      - mainType: TEXTBOOK
+        subType: HANDMADE
+      - mainType: TEXTBOOK
+        subType: PRINT
+      - mainType: THESIS
+        subType: HANDMADE
+      - mainType: THESIS
         subType: PRINT
       - mainType: MICROFORM
         subType: PRINT
+      - mainType: IMAGE
+        subType: HANDMADE
+      - mainType: IMAGE
+        subType: PRINT
 
     titleTypes:
       - mainType: ABBR

From 814066422d2c379e5425a99c4e5cc2787e75d370 Mon Sep 17 00:00:00 2001
From: Christoph Lorenz <christoph.lorenz@bsb-muenchen.de>
Date: Fri, 8 Mar 2024 13:55:11 +0100
Subject: [PATCH 2/2] Re-add expressionTypes for text and spatial

---
 .../src/main/resources/application-typedeclarations.yml   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml b/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
index f0b8d6afa..3cb17590a 100644
--- a/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
+++ b/metasvc-server/webapp/src/main/resources/application-typedeclarations.yml
@@ -172,6 +172,14 @@ application:
         subType: HANDMADE
       - mainType: IMAGE
         subType: PRINT
+      - mainType: TEXT
+        subType: HANDMADE
+      - mainType: TEXT
+        subType: PRINT
+      - mainType: SPATIAL
+        subType: HANDMADE
+      - mainType: SPATIAL
+        subType: PRINT
 
     titleTypes:
       - mainType: ABBR