Skip to content

Feature/smaller marcframe cleanups #1728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klngwll merged 2 commits into from
Mar 23, 2026
Merged

Feature/smaller marcframe cleanups #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a5b8df
Fix revert-only test in 852
klngwll Mar 23, 2026
69e26f2
Expand 655 genreform testing logic
klngwll Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions whelk-core/src/main/resources/ext/marcframe-hold.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,8 +1759,8 @@
}
},
{
"TODO": "a revert-only case",
"jsonLd": {
"name": "revert-only: heldBy as @id with no other data",
"result": {
"mainEntity": {
"@type": "Item",
"copyNumber": "1",
Expand All @@ -1769,7 +1769,7 @@
"physicalLocation": ["MAG"]
}
},
"resultMarc": {"852": {
"normalized": {"852": {
"ind1": " ",
"ind2": " ",
"subfields": [{"b": "H"}, {"c": "MAG"}, {"j": "65.465"}, {"t": "1"}]
Expand Down
44 changes: 39 additions & 5 deletions whelk-core/src/main/resources/ext/marcframe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15616,17 +15616,20 @@
}}
},
{
"name": "Malformed: blank ind2 with $2 present, normalize ind2 to 7",
"TODO": "Requires converter change. Needs ind2 normalization before match rules?",
"source": {"655": {"ind1": " ", "ind2": " ", "subfields": [{"a": "True crime stories"}, {"2": "lcgft"}]}},
"TODO:EmptyInd2-result": {"mainEntity": {
"normalized": {"655": {"ind1": " ", "ind2": "7", "subfields": [{"a": "True crime stories"}, {"2": "lcgft"}]}},
"TODO:result": {"mainEntity": {
"instanceOf": {
"@type": "Text",
"genreForm": [
{
"@type": "GenreForm",
"@id": "hhttp://id.loc.gov/authorities/genreForms/gf2014026203.html",
"@id": "http://id.loc.gov/authorities/genreForms/gf2014026203",
"inScheme": {
"@type": "ConceptScheme",
"@id": "http://id.loc.gov/authorities/genreForms",
"@id": "https://id.kb.se/term/lcgft",
"code": "lcgft"
},
"prefLabel": "True crime stories"
Expand All @@ -15636,10 +15639,41 @@
}}
},
{
"name": "Malformed: blank ind2 without $2, normalize ind2 to 4",
"source": {"655": {"ind1": " ", "ind2": " ", "subfields": [{"a": "Festskrifter"}]}},
"normalized": {"655": {"ind1": " ", "ind2": "4", "subfields": [{"a": "Festskrifter"}]}},
"result": {"mainEntity": {
"instanceOf": {
"@type": "Text",
"genreForm": [
{
"@type": "GenreForm",
"prefLabel": "Festskrifter"
}
]
}
}}
},
{
"name": "Malformed: ind1/ind2 swapped, normalize using $2 presence",
"TODO": "Requires converter change. Needs ind2 normalization before match rules? Make types normalization compatible?",
"source": {"655": {"ind1": "7", "ind2": " ", "subfields": [{"a": "Artikeldatabaser"}, {"2": "saogf"}]}},
"TODO:": {"mainEntity": {
"normalized": {"655": {"ind1": " ", "ind2": "7", "subfields": [{"a": "Artikeldatabaser"}, {"2": "saogf"}]}},
"TODO:result": {"mainEntity": {
"instanceOf": {
"@type": "Text"
"@type": "Text",
"genreForm": [
{
"@type": "GenreForm",
"@id": "https://id.kb.se/term/saogf/Artikeldatabaser",
"inScheme": {
"@type": "ConceptScheme",
"@id": "https://id.kb.se/term/saogf",
"code": "saogf"
},
"prefLabel": "Artikeldatabaser"
}
]
}
}}
},
Expand Down
Loading