Skip to content

Commit

Permalink
Implementing MARC Update No. 36 (June 2023) #333
Browse files Browse the repository at this point in the history
  • Loading branch information
pkiraly committed Oct 23, 2023
1 parent a62b43b commit e352fc2
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private void initialize() {

getSubfield("6").setContentParser(LinkageParser.getInstance());

getSubfield("a")
getSubfield("b")
.setMqTag("archivingAgency");

getSubfield("c")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public void testStatistics() {
assertEquals( 8, statistics.keys().size());
assertEquals( 6, statistics.get(DataElementType.controlFields));
assertEquals( 212, statistics.get(DataElementType.controlFieldPositions));
assertEquals( 227, statistics.get(DataElementType.coreFields));
assertEquals( 181, statistics.get(DataElementType.coreIndicators));
assertEquals(2616, statistics.get(DataElementType.coreSubfields));
assertEquals( 229, statistics.get(DataElementType.coreFields));
assertEquals( 184, statistics.get(DataElementType.coreIndicators));
assertEquals(2667, statistics.get(DataElementType.coreSubfields));
assertEquals( 214, statistics.get(DataElementType.localFields));
assertEquals( 28, statistics.get(DataElementType.localIndicators));
assertEquals(1737, statistics.get(DataElementType.localSubfields));
assertEquals(5221, statistics.total());
assertEquals(1743, statistics.get(DataElementType.localSubfields));
assertEquals(5283, statistics.total());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ public void testGetMarcPathByfunction() {
FrbrFunctionLister lister = new FrbrFunctionLister(MarcVersion.MARC21);
Map<FRBRFunction, List<String>> functions = lister.getMarcPathByFunction();
assertEquals(12, functions.size());
assertEquals(454, functions.get(FRBRFunction.DiscoveryObtain).size());
assertEquals(455, functions.get(FRBRFunction.DiscoveryObtain).size());
assertEquals(464, functions.get(FRBRFunction.DiscoverySearch).size());
assertEquals(348, functions.get(FRBRFunction.DiscoverySelect).size());
assertEquals(968, functions.get(FRBRFunction.DiscoveryIdentify).size());
assertEquals(349, functions.get(FRBRFunction.DiscoverySelect).size());
assertEquals(969, functions.get(FRBRFunction.DiscoveryIdentify).size());
assertEquals( 80, functions.get(FRBRFunction.ManagementDisplay).size());
assertEquals( 26, functions.get(FRBRFunction.ManagementSort).size());
assertEquals(547, functions.get(FRBRFunction.ManagementProcess).size());
Expand Down
66 changes: 33 additions & 33 deletions src/test/java/de/gwdg/metadataqa/marc/utils/MarcTagListerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void testListTag() {
List<Class<? extends DataFieldDefinition>> tags = MarcTagLister.listTags();
assertNotNull(tags);
assertNotEquals(0, tags.size());
assertEquals(441, tags.size());
assertEquals(443, tags.size());
assertEquals("Tag010", tags.get(0).getSimpleName());
Map<String, Integer> versionCounter = new HashMap<>();
Map<MarcVersion, Integer> versionCounter2 = new HashMap<>();
Expand Down Expand Up @@ -68,38 +68,38 @@ public void testListTag() {
}
}

assertEquals(11, (int) versionCounter2.get(MarcVersion.DNB));
assertEquals(11, (int) versionCounter.get("dnbtags"));

assertEquals(24, (int) versionCounter2.get(MarcVersion.FENNICA));
assertEquals(24, (int) versionCounter.get("fennicatags"));

assertEquals(3, (int) versionCounter2.get(MarcVersion.GENT));
assertEquals(3, (int) versionCounter.get("genttags"));

assertEquals(39, (int) versionCounter2.get(MarcVersion.NKCR));
assertEquals(39, (int) versionCounter.get("nkcrtags"));

assertEquals(15, (int) versionCounter2.get(MarcVersion.OCLC));
assertEquals(15, (int) versionCounter.get("oclctags"));

assertEquals(15, (int) versionCounter2.get(MarcVersion.SZTE));
assertEquals(15, (int) versionCounter.get("sztetags"));

assertEquals(227, (int) versionCounter2.get(MarcVersion.MARC21));
assertEquals(2, (int) versionCounter.get("holdings"));
assertEquals(49, (int) versionCounter.get("tags01x"));
assertEquals(4, (int) versionCounter.get("tags1xx"));
assertEquals(8, (int) versionCounter.get("tags20x"));
assertEquals(11, (int) versionCounter.get("tags25x"));
assertEquals(39, (int) versionCounter.get("tags3xx"));
assertEquals(5, (int) versionCounter.get("tags4xx"));
assertEquals(51, (int) versionCounter.get("tags5xx"));
assertEquals(16, (int) versionCounter.get("tags6xx"));
assertEquals(11, (int) versionCounter.get("tags70x"));
assertEquals(16, (int) versionCounter.get("tags76x"));
assertEquals(4, (int) versionCounter.get("tags80x"));
assertEquals(11, (int) versionCounter.get("tags84x"));
assertEquals( 11, (int) versionCounter2.get(MarcVersion.DNB));
assertEquals( 11, (int) versionCounter.get("dnbtags"));

assertEquals( 24, (int) versionCounter2.get(MarcVersion.FENNICA));
assertEquals( 24, (int) versionCounter.get("fennicatags"));

assertEquals( 3, (int) versionCounter2.get(MarcVersion.GENT));
assertEquals( 3, (int) versionCounter.get("genttags"));

assertEquals( 39, (int) versionCounter2.get(MarcVersion.NKCR));
assertEquals( 39, (int) versionCounter.get("nkcrtags"));

assertEquals( 15, (int) versionCounter2.get(MarcVersion.OCLC));
assertEquals( 15, (int) versionCounter.get("oclctags"));

assertEquals( 15, (int) versionCounter2.get(MarcVersion.SZTE));
assertEquals( 15, (int) versionCounter.get("sztetags"));

assertEquals(229, (int) versionCounter2.get(MarcVersion.MARC21));
assertEquals( 2, (int) versionCounter.get("holdings"));
assertEquals( 49, (int) versionCounter.get("tags01x"));
assertEquals( 4, (int) versionCounter.get("tags1xx"));
assertEquals( 8, (int) versionCounter.get("tags20x"));
assertEquals( 11, (int) versionCounter.get("tags25x"));
assertEquals( 40, (int) versionCounter.get("tags3xx"));
assertEquals( 5, (int) versionCounter.get("tags4xx"));
assertEquals( 51, (int) versionCounter.get("tags5xx"));
assertEquals( 16, (int) versionCounter.get("tags6xx"));
assertEquals( 11, (int) versionCounter.get("tags70x"));
assertEquals( 16, (int) versionCounter.get("tags76x"));
assertEquals( 4, (int) versionCounter.get("tags80x"));
assertEquals( 12, (int) versionCounter.get("tags84x"));
}

@Test
Expand Down

0 comments on commit e352fc2

Please sign in to comment.