issue #75: add tag VIT

pkiraly · Dec 19, 2020 · b513020 · b513020
1 parent 1d2580b
commit b513020
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/main/java/de/gwdg/metadataqa/marc/definition/tags/bltags/TagVIT.java b/src/main/java/de/gwdg/metadataqa/marc/definition/tags/bltags/TagVIT.java
@@ -51,9 +51,15 @@ private void initialize() {
       "s", "Contains the string ‘Supplement’ if the Newspaper Audit database Item Description field contained ‘supp’. Otherwise blank", "NR"
     );
 
-    getSubfield("b").setMqTag("barcode");
-    getSubfield("c").setMqTag("status");
-    getSubfield("d").setMqTag("description");
+    getSubfield("b")
+      .setValidator(new RegexValidator("^.*[^\\.]$"))
+      .setMqTag("barcode");
+    getSubfield("c")
+      .setValidator(new RegexValidator("^.*[^\\.]$"))
+      .setMqTag("status");
+    getSubfield("d")
+      .setValidator(new RegexValidator("^.*[^\\.]$"))
+      .setMqTag("description");
     getSubfield("e")
       .setValidator(new RegexValidator("^(1[5-9]|20)\\d\\d$"))
       .setMqTag("fromYear");
@@ -73,7 +79,12 @@ private void initialize() {
       .setValidator(
         new RegexValidator("^(0[1-9]|[1-2][0-9]|3[01])(/(0[1-9]|[1-2][0-9]|3[01]))?$"))
       .setMqTag("fromToDay");
-    getSubfield("o").setMqTag("opacNote");
-    getSubfield("s").setMqTag("isSupplement");
+    getSubfield("o")
+      .setValidator(new RegexValidator("^.*[^\\.]$"))
+      .setMqTag("opacNote");
+    // TODO: in the PDF it is not well formatted
+    getSubfield("s")
+      .setValidator(new RegexValidator("^(Supplement|)$"))
+      .setMqTag("isSupplement");
   }
 }
diff --git a/src/test/java/de/gwdg/metadataqa/marc/definition/tags/bltags/TagVITTest.java b/src/test/java/de/gwdg/metadataqa/marc/definition/tags/bltags/TagVITTest.java
@@ -23,6 +23,8 @@ public void testValidFields() {
     validField("j", "11/12");
     validField("k", "11");
     validField("k", "11/12");
+    validField("s", "Supplement");
+    validField("s", "");
   }
 
   @Test
@@ -37,5 +39,6 @@ public void testInvalidFields() {
     invalidField("j", "13");
     invalidField("j", "01/13");
     invalidField("k", "01/32");
+    invalidField("s", "Supplement.");
   }
 }