From db28d398537b92e00311ac8137d7f0d0c9011533 Mon Sep 17 00:00:00 2001
From: Felix Lohmeier <mail@felixlohmeier.de>
Date: Thu, 4 Mar 2021 16:44:30 +0100
Subject: [PATCH] Kollationsvermerk 4060 4061 und Formatangabe 4062

---
 bibliotheca/Taskfile.yml                          |  8 ++++++--
 bibliotheca/config/main/{4060a.json => 4060.json} |  2 +-
 bibliotheca/config/main/4061.json                 | 14 ++++++++++++++
 bibliotheca/config/main/4062.json                 | 14 ++++++++++++++
 bibliotheca/config/main/template.txt              |  4 +++-
 pica+/config/template.txt                         |  4 +++-
 6 files changed, 41 insertions(+), 5 deletions(-)
 rename bibliotheca/config/main/{4060a.json => 4060.json} (89%)
 create mode 100644 bibliotheca/config/main/4061.json
 create mode 100644 bibliotheca/config/main/4062.json

diff --git a/bibliotheca/Taskfile.yml b/bibliotheca/Taskfile.yml
index 8611052..b3b4eaf 100644
--- a/bibliotheca/Taskfile.yml
+++ b/bibliotheca/Taskfile.yml
@@ -165,8 +165,12 @@ tasks:
         "$CLIENT" -P {{.PORT}} {{.PROJECT}} --apply config/main/4030n.json > {{.LOG}}
       - > # spec_B_T_21: Erscheinungsort 4030p
         "$CLIENT" -P {{.PORT}} {{.PROJECT}} --apply config/main/4030p.json > {{.LOG}}
-      - > # spec_B_T_22: Umfang 4060a
-        "$CLIENT" -P {{.PORT}} {{.PROJECT}} --apply config/main/4060a.json > {{.LOG}}
+      - > # spec_B_T_22: Umfang 4060
+        "$CLIENT" -P {{.PORT}} {{.PROJECT}} --apply config/main/4060.json > {{.LOG}}
+      - > # spec_B_T_22: Illustrationsangabe 4061
+        "$CLIENT" -P {{.PORT}} {{.PROJECT}} --apply config/main/4061.json > {{.LOG}}
+      - > # spec_B_T_23: Formatangabe 4062
+        "$CLIENT" -P {{.PORT}} {{.PROJECT}} --apply config/main/4062.json > {{.LOG}}
       - > # spec_B_E_02: Verbuchungsnummer 8200
         "$CLIENT" -P {{.PORT}} {{.PROJECT}} --apply config/main/8200.json > {{.LOG}}
       - > # spec_B_T_02: Jahresangaben 1100a und 1100n; 1100a normiert mit zahlreichen Ersetzungen
diff --git a/bibliotheca/config/main/4060a.json b/bibliotheca/config/main/4060.json
similarity index 89%
rename from bibliotheca/config/main/4060a.json
rename to bibliotheca/config/main/4060.json
index 10e6608..7756d59 100644
--- a/bibliotheca/config/main/4060a.json
+++ b/bibliotheca/config/main/4060.json
@@ -8,7 +8,7 @@
     "baseColumnName": "M|UMF",
     "expression": "grel:value.split(' : ')[0]",
     "onError": "set-to-blank",
-    "newColumnName": "4060a",
+    "newColumnName": "4060",
     "columnInsertIndex": 3
   }
 ]
diff --git a/bibliotheca/config/main/4061.json b/bibliotheca/config/main/4061.json
new file mode 100644
index 0000000..f4c5c7f
--- /dev/null
+++ b/bibliotheca/config/main/4061.json
@@ -0,0 +1,14 @@
+[
+  {
+    "op": "core/column-addition",
+    "engineConfig": {
+      "facets": [],
+      "mode": "row-based"
+    },
+    "baseColumnName": "M|UMF",
+    "expression": "grel:value.split(' : ')[1]",
+    "onError": "set-to-blank",
+    "newColumnName": "4061",
+    "columnInsertIndex": 3
+  }
+]
diff --git a/bibliotheca/config/main/4062.json b/bibliotheca/config/main/4062.json
new file mode 100644
index 0000000..b1920cf
--- /dev/null
+++ b/bibliotheca/config/main/4062.json
@@ -0,0 +1,14 @@
+[
+  {
+    "op": "core/column-addition",
+    "engineConfig": {
+      "facets": [],
+      "mode": "row-based"
+    },
+    "baseColumnName": "M|FORM",
+    "expression": "grel:value",
+    "onError": "set-to-blank",
+    "newColumnName": "4062",
+    "columnInsertIndex": 3
+  }
+]
diff --git a/bibliotheca/config/main/template.txt b/bibliotheca/config/main/template.txt
index 192ad84..53a7983 100644
--- a/bibliotheca/config/main/template.txt
+++ b/bibliotheca/config/main/template.txt
@@ -33,7 +33,9 @@ with(
     '4020a',
     '4030n',
     '4030p',
-    '4060a',
+    '4060',
+    '4061',
+    '4062',
     '7100j',
     '7100f',
     '7100a',
diff --git a/pica+/config/template.txt b/pica+/config/template.txt
index 4e9f884..7833810 100644
--- a/pica+/config/template.txt
+++ b/pica+/config/template.txt
@@ -24,7 +24,9 @@ if(row.index - row.record.fromRowIndex == 0,
 + forNonBlank(cells['3110'].value, v, forEach(v.split('␟'),x,'029F ' + x + '\n').join(''), '')
 + forNonBlank(cells['4020a'].value, v, '032@ ' + 'a' + v + '\n', '')
 + if(or(isNonBlank(cells['4030n'].value),isNonBlank(cells['4030p'].value)),'033A ' + forNonBlank(cells['4030n'].value, v, 'n' + v,'') + forNonBlank(cells['4030p'].value, v, 'p' + v, '') + '\n', '')
-+ forNonBlank(cells['4060a'].value, v, '034D ' + 'a' + v + '\n', '')
++ forNonBlank(cells['4060'].value, v, '034D ' + 'a' + v + '\n', '')
++ forNonBlank(cells['4062'].value, v, '034I ' + 'a' + v + '\n', '')
++ forNonBlank(cells['4061'].value, v, '034M ' + 'a' + v + '\n', '')
 + forNonBlank(cells['0999'].value, v, '046W ' + 'a' + v + '\n', '')
 ,'')
 }}{{