From 247e4e6f421b7d2d72d75b55b489410a476e9a6a Mon Sep 17 00:00:00 2001 From: fo Date: Tue, 9 Jun 2026 17:19:53 +0000 Subject: [PATCH 01/94] Initial bcp work TODO: - build the new marc key correctly, not working with subfields. They don't update - duplicate - add additional 4XX - Adjust the marc recrd - Post the marc record --- .../panels/edit/modals/ComplexLookupModal.vue | 350 ++++++++++++++---- src/lib/utils_network.js | 20 + 2 files changed, 292 insertions(+), 78 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index f33361d9..b4717af6 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -104,6 +104,17 @@ "identifiers","broaders", "collections", "genres", "subjects", "marcKeys", "vernacularMarcKeys", "vernacularLabels", "rdftypes", "hasRelatedAuthoritys", "useFors" ], + + // editing 4XX + showEdit4xxPanel: false, + marcDoc: {}, + associatedLang: null, + targetName: '', + bcpCodes: {}, + bcpSelection: [], + marcData: [], + newMarcKeys: [], + newMarcKey: '' } }, computed: { @@ -117,7 +128,7 @@ // array of the pssobile groups from the stlyes ...mapState(useConfigStore, ['lookupConfig']), - ...mapState(useProfileStore, ['returnComponentByPropertyLabel', 'duplicateComponentGetId', 'isEmptyComponent']), + ...mapState(useProfileStore, ['returnComponentByPropertyLabel', 'duplicateComponentGetId', 'isEmptyComponent', 'isLatin']), ...mapState(usePreferenceStore, ['diacriticUseValues', 'diacriticUse','diacriticPacks', 'lastComplexLookupString']), @@ -170,6 +181,11 @@ modeSelect: async function(){ this.activeComplexSearch = [] this.doSearch() + }, + + targetName: function(){ + console.info("name change?", this.marcData) + this.buildNewMarcKey() } @@ -177,6 +193,103 @@ }, methods: { + edit4XX: async function(data, idx){ + console.info("data: ", data) + let marcKey = data.extra.marcKeys[0] + let tag = marcKey.slice(0,3) + let indicators = marcKey.slice(3,5) + + // get the MARCxml + let marcXML = await this.fetchAuthXML(data.uri.split('/').at(-1)) + let parser = new DOMParser(); + this.xmlDoc = parser.parseFromString(marcXML, "text/xml") + this.associatedLang = this.xmlDoc.querySelectorAll('[tag="377"]'); + + if (this.associatedLang.length == 1){ + this.associatedLang = this.associatedLang[0].textContent.trim() + } + console.info("associatedLang: ", this.associatedLang) + + + // get the initial bcp47 API results + let variants = data.extra.variantLabels + // this.targetName = variants[idx] + + console.info("variants: ", variants) + console.info("target: ", this.targetName) + + let targetTag = "4" + tag.slice(1,3) + this.marcData.tag = targetTag + this.marcData.indicators = indicators + + let targetName = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] + + for (let child of targetName.children){ + + let subfield = child.getAttribute("code") + let value = child.innerHTML + this.marcData["subfield_" + subfield] = value + } + + this.bcpCodes = await utilsNetwork.fetchBCP47Codes(targetName, this.associatedLang) + console.info("codes: ", this.bcpCodes) + + for (let c of this.bcpSelection){ + this.marcData.dollar7 = "(bcp47)" + this.bcpCodes[c].bcp47code + } + + // console.info("target: ", variants[idx]) + this.targetName = variants[idx] + + // swap out left panel for form + this.showEdit4xxPanel = true + + }, + + hideBCP: function(){ + console.info('hide:', this.showEdit4xxPanel) + this.showEdit4xxPanel = false + }, + + buildNewMarcKey: function(idx=0){ + console.info("build") + if (this.bcpSelection.includes(idx)){ // remove it + console.info("remove") + this.bcpSelection = this.bcpSelection.filter(item => item != idx) + } else { // add it + console.info("add") + this.bcpSelection.push(idx) + } + + console.info("this.bcpCodes: ", this.bcpCodes) + console.info("this.bcpSelection: ", this.bcpSelection) + this.marcData.dollar7 = '' + for (let c of this.bcpSelection){ + this.marcData.dollar7 = this.marcData.dollar7 + "(bcp47)" + this.bcpCodes[c].bcp47code + } + + let key = this.marcData.tag + this.marcData.indicators + for (let sub of Object.keys(this.marcData)) { + if (sub.startsWith("subfield_")){ + if (sub == 'subfield_a'){ + console.info("subfieldA: ", this.targetName) + key = key + " $" + sub.split("_")[1] + this.targetName + } else { + key = key + " $" + sub.split("_")[1] + this.marcData[sub] + } + } + } + key = key + " $7" + this.marcData["dollar7"] + + this.newMarcKey = key + }, + + fetchAuthXML: async function(lccn){ + let r = await utilsNetwork.fetchAuthMarc(lccn) + return r + }, + + sortResults: function(a,b){ if (a.label.includes('Literal')){ return -1 @@ -316,6 +429,7 @@ }, generateLabel: function(data){ + console.info("data: ", data) let label = !data.literal ? data.suggestLabel : data.label + ((data.literal) ? ' [Literal]' : '') if (label.includes("(USE ")){ @@ -330,6 +444,7 @@ // label = label.slice(0, start) + "" + label.slice(start, end+1) + "" + label.slice(end+1) // } + console.info("\t", label) return label }, truncate: function(string){ @@ -828,9 +943,9 @@ } // filter the Authorized NonLatin from the variants - if (this.activeContext && this.activeContext.extra && this.activeContext.extra['variantLabels'] && this.activeContext.extra['nonlatinLabels']){ - this.activeContext.extra['variantLabels'] = this.activeContext.extra['variantLabels'].filter(n => !this.activeContext.extra['nonlatinLabels'].includes(n)) - } + // if (this.activeContext && this.activeContext.extra && this.activeContext.extra['variantLabels'] && this.activeContext.extra['nonlatinLabels']){ + // this.activeContext.extra['variantLabels'] = this.activeContext.extra['variantLabels'].filter(n => !this.activeContext.extra['nonlatinLabels'].includes(n)) + // } // Filter earlier/later forms of name from releated if (this.activeContext && this.activeContext.extra && this.activeContext.extra['relateds'] && this.activeContext.extra['hasEarlierEstablishedForms']){ this.activeContext.extra['relateds'] = this.activeContext.extra['relateds'].filter(n => !this.activeContext.extra['hasEarlierEstablishedForms'].includes(n)) @@ -1130,92 +1245,132 @@
-
- +
@@ -1247,6 +1402,9 @@
view on ID + +
+ view MARCXML
@@ -1299,7 +1457,11 @@
{{ Object.keys(this.labelMap).includes(key) ? this.labelMap[key] : key }}:
  • - {{v}} + {{v}} + +
    {{v}}
    @@ -1832,5 +1994,37 @@ margin-left: 5px; } +.variant-edit { + font-size: 12px; +} + +/* BCP Stuff */ +table { + border-collapse: collapse; + border: 2px solid rgb(140 140 140); + font-family: sans-serif; + font-size: 0.8rem; + letter-spacing: 1px; + + width: 100%; + margin-bottom: 15px; +} + +th { + font-weight: bold; + font-size: 14px; +} + +th, +td { + border: 1px solid rgb(160 160 160); + padding: 8px 10px; + text-align: center; +} + +.active { + background-color: rgb(131, 131, 255); +} + diff --git a/src/lib/utils_network.js b/src/lib/utils_network.js index aedb7e32..a93802d7 100644 --- a/src/lib/utils_network.js +++ b/src/lib/utils_network.js @@ -4454,6 +4454,26 @@ const utilsNetwork = { return content }, + async fetchAuthMarc(lccn){ + let url = "https://preprod-8080.id.loc.gov/authorities/names/" + lccn + ".marcxml.xml" + let marcXML = await this.fetchSimpleLookup(url) + return marcXML + }, + + async fetchBCP47Codes(string, hint=false){ + let url = "https://preprod.id.loc.gov/controllers/xqapi-determine-bcp47.xqy?serialization=application/json&string=" + encodeURIComponent(string) + if (hint){ + url = url + "&hint=" + hint + } + let resp = await this.fetchSimpleLookup(url) + console.info(resp) + if (resp.status != 200){ + resp = [{"bcp47code":"th", "name":"Thai", "score":6}, {"bcp47code":"lo-thai", "name":"Lao", "score":0}, {"bcp47code":"lwl-thai", "name":"Eastern Lawa", "score":-1}, {"bcp47code":"kdt-thai", "name":"Kuy", "score":-1}, {"bcp47code":"tts-thai", "name":"Northeastern Thai", "score":-1}, {"bcp47code":"kxm-thai", "name":"Northern Khmer", "score":-1}, {"bcp47code":"sou-thai", "name":"Southern Thai", "score":-1}, {"bcp47code":"lcp-thai", "name":"Western Lawa", "score":-1}, {"bcp47code":"pi-thai", "name":"Pali", "score":-2}] + } + + return resp + }, + } From fb28e84100ddae6020c5ae3156c2728ca86770fd Mon Sep 17 00:00:00 2001 From: fo Date: Tue, 9 Jun 2026 18:15:50 +0000 Subject: [PATCH 02/94] Fix date duplicating when present --- .../panels/edit/modals/ComplexLookupModal.vue | 62 ++++++++++++++++--- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index b4717af6..c5fe4aac 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -231,15 +231,19 @@ this.marcData["subfield_" + subfield] = value } - this.bcpCodes = await utilsNetwork.fetchBCP47Codes(targetName, this.associatedLang) + this.bcpCodes = await utilsNetwork.fetchBCP47Codes(this.marcData["subfield_a"], this.associatedLang) console.info("codes: ", this.bcpCodes) for (let c of this.bcpSelection){ this.marcData.dollar7 = "(bcp47)" + this.bcpCodes[c].bcp47code } - // console.info("target: ", variants[idx]) - this.targetName = variants[idx] + this.targetName = '' + for (let sf of Object.keys(this.marcData)){ + if (sf.startsWith('subfield_')){ + this.targetName = this.targetName + " $" + sf.split("_")[1] + this.marcData[sf] + } + } // swap out left panel for form this.showEdit4xxPanel = true @@ -269,14 +273,48 @@ } let key = this.marcData.tag + this.marcData.indicators + let userInput = this.targetName + console.info("userInput: ", userInput) + console.info("this.marcData: ", this.marcData) + + // split up the user input and use to populate the marcKey/Data + let subfields = userInput.match(/(\$[a-z0-9])/g) + for (let sub in subfields){ + sub = Number(sub) + let sf = subfields[sub] + let end = false + if (sub < subfields.length-1){ + end = subfields[sub+1] + } + let value + if (end){ + value = userInput.substring( + userInput.indexOf(sf), + userInput.indexOf(end), + ) + } else { + value = userInput.substring( + userInput.indexOf(sf) + ) + } + let field = value.slice(1,2) + value = value.slice(2) + console.info("field: ", field) + console.info("value: ", value) + this.marcData["subfield_" + field] = value + + + } + for (let sub of Object.keys(this.marcData)) { if (sub.startsWith("subfield_")){ - if (sub == 'subfield_a'){ - console.info("subfieldA: ", this.targetName) - key = key + " $" + sub.split("_")[1] + this.targetName - } else { - key = key + " $" + sub.split("_")[1] + this.marcData[sub] - } + key = key + " $" + sub.split("_")[1] + this.marcData[sub] + // if (sub == 'subfield_a'){ + // console.info("subfieldA: ", this.targetName) + // key = key + " $" + sub.split("_")[1] + this.targetName + // } else { + // key = key + " $" + sub.split("_")[1] + this.marcData[sub] + // } } } key = key + " $7" + this.marcData["dollar7"] @@ -1337,7 +1375,7 @@

    Update BCP47 Language

    - Name: + Name: @@ -2025,6 +2063,10 @@ td { .active { background-color: rgb(131, 131, 255); } +.bcp-input{ + width: 80%; + font-size: 1.3em; +} From 4d1714cb1bb3869c873cd58894a346f09189f4eb Mon Sep 17 00:00:00 2001 From: fo Date: Wed, 10 Jun 2026 13:38:57 +0000 Subject: [PATCH 03/94] Input with multiple fields, works --- .../panels/edit/modals/ComplexLookupModal.vue | 196 ++++++++++++------ 1 file changed, 130 insertions(+), 66 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index c5fe4aac..28dd3cfa 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -111,10 +111,12 @@ associatedLang: null, targetName: '', bcpCodes: {}, - bcpSelection: [], - marcData: [], - newMarcKeys: [], - newMarcKey: '' + bcpSelection: [0], + marcData: [{}], + newMarcKeys: [{targetName: '', bcpSelection: []}], + newMarcKey: '', + activeIndex: 0, + } }, computed: { @@ -183,7 +185,16 @@ this.doSearch() }, - targetName: function(){ + // marcData: { + // deep: true, + // handler(newVal, oldVal){ + // console.info("new", newVal) + // console.info("old", oldVal) + // // this.buildNewMarcKey() + // } + // }, + + 'marcData[activeIndex].targetName': function(){ console.info("name change?", this.marcData) this.buildNewMarcKey() } @@ -194,10 +205,9 @@ methods: { edit4XX: async function(data, idx){ - console.info("data: ", data) let marcKey = data.extra.marcKeys[0] - let tag = marcKey.slice(0,3) - let indicators = marcKey.slice(3,5) + this.tag = marcKey.slice(0,3) + this.indicators = marcKey.slice(3,5) // get the MARCxml let marcXML = await this.fetchAuthXML(data.uri.split('/').at(-1)) @@ -208,74 +218,89 @@ if (this.associatedLang.length == 1){ this.associatedLang = this.associatedLang[0].textContent.trim() } - console.info("associatedLang: ", this.associatedLang) - - // get the initial bcp47 API results let variants = data.extra.variantLabels - // this.targetName = variants[idx] - console.info("variants: ", variants) - console.info("target: ", this.targetName) + console.info("this.marcData: ", this.marcData) - let targetTag = "4" + tag.slice(1,3) - this.marcData.tag = targetTag - this.marcData.indicators = indicators + let targetTag = "4" + this.tag.slice(1,3) + this.tag = targetTag + this.marcData[0].tag = targetTag + this.marcData[0].indicators = this.indicators let targetName = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] + this.marcData[0]["fullString"] = targetTag+ this.indicators - for (let child of targetName.children){ + for (let child of targetName.children){ let subfield = child.getAttribute("code") let value = child.innerHTML - this.marcData["subfield_" + subfield] = value + this.marcData[0]["subfield_" + subfield] = value + this.marcData[0]["fullString"] = this.marcData[0]["fullString"] + " $" + subfield + value } - this.bcpCodes = await utilsNetwork.fetchBCP47Codes(this.marcData["subfield_a"], this.associatedLang) - console.info("codes: ", this.bcpCodes) + this.bcpCodes = await utilsNetwork.fetchBCP47Codes(this.marcData[0]["subfield_a"], this.associatedLang) - for (let c of this.bcpSelection){ - this.marcData.dollar7 = "(bcp47)" + this.bcpCodes[c].bcp47code + console.info("this.marcData: ", this.marcData) + console.info("this.activeIndex: ", this.activeIndex) + this.marcData[this.activeIndex].bcpSelection = [0] + for (let c of this.marcData[this.activeIndex].bcpSelection){ + console.info("\t", c) + this.marcData[0].dollar7 = "(bcp47)" + this.bcpCodes[c].bcp47code } + this.marcData[0]["fullString"] = this.marcData[0]["fullString"] + " $7" + this.marcData[0].dollar7 - this.targetName = '' - for (let sf of Object.keys(this.marcData)){ + this.marcData[0].targetName = '' + for (let sf of Object.keys(this.marcData[0])){ if (sf.startsWith('subfield_')){ - this.targetName = this.targetName + " $" + sf.split("_")[1] + this.marcData[sf] + this.marcData[0].targetName = this.marcData[0].targetName + " $" + sf.split("_")[1] + this.marcData[0][sf] } } + console.info("this.marcData: ", this.marcData) + + // create string for display/editing + + // swap out left panel for form this.showEdit4xxPanel = true }, hideBCP: function(){ - console.info('hide:', this.showEdit4xxPanel) this.showEdit4xxPanel = false }, - buildNewMarcKey: function(idx=0){ - console.info("build") - if (this.bcpSelection.includes(idx)){ // remove it - console.info("remove") - this.bcpSelection = this.bcpSelection.filter(item => item != idx) - } else { // add it - console.info("add") - this.bcpSelection.push(idx) + addBcpCode: function(idx){ + // activeIndex + console.info("this.marcData: ", this.marcData) + console.info("this.activeIndex: ", this.activeIndex) + if (!this.marcData[this.activeIndex].bcpSelection){ + this.marcData[this.activeIndex].bcpSelection = [] + } + if (this.marcData[this.activeIndex].bcpSelection.includes(idx)){ // remove it + this.marcData[this.activeIndex].bcpSelection = this.marcData[this.activeIndex].bcpSelection.filter(item => item != idx) + } else { + this.marcData[this.activeIndex].bcpSelection.push(idx) } + }, - console.info("this.bcpCodes: ", this.bcpCodes) - console.info("this.bcpSelection: ", this.bcpSelection) - this.marcData.dollar7 = '' - for (let c of this.bcpSelection){ - this.marcData.dollar7 = this.marcData.dollar7 + "(bcp47)" + this.bcpCodes[c].bcp47code + buildNewMarcKey: function(){ + console.info("active: ", this.activeIndex, "--", this.marcData[this.activeIndex]) + if (!this.marcData[this.activeIndex]){ + this.marcData[this.activeIndex] = {} + } + this.marcData[this.activeIndex].dollar7 = '' + for (let c of this.marcData[this.activeIndex].bcpSelection){ + this.marcData[this.activeIndex].dollar7 = this.marcData[this.activeIndex].dollar7 + "(bcp47)" + this.bcpCodes[c].bcp47code } - let key = this.marcData.tag + this.marcData.indicators - let userInput = this.targetName + let key = '' + let fullString = this.marcData[this.activeIndex].tag + this.marcData[this.activeIndex].indicators + console.info("fullString: ", fullString) + let userInput = this.marcData[this.activeIndex].targetName console.info("userInput: ", userInput) - console.info("this.marcData: ", this.marcData) + // split up the user input and use to populate the marcKey/Data let subfields = userInput.match(/(\$[a-z0-9])/g) @@ -286,6 +311,7 @@ if (sub < subfields.length-1){ end = subfields[sub+1] } + let value if (end){ value = userInput.substring( @@ -294,32 +320,42 @@ ) } else { value = userInput.substring( - userInput.indexOf(sf) + userInput.indexOf(sf), ) } + let field = value.slice(1,2) value = value.slice(2) - console.info("field: ", field) - console.info("value: ", value) - this.marcData["subfield_" + field] = value - - + this.marcData[this.activeIndex]["subfield_" + field] = value } - for (let sub of Object.keys(this.marcData)) { + for (let sub of Object.keys(this.marcData[this.activeIndex])) { if (sub.startsWith("subfield_")){ - key = key + " $" + sub.split("_")[1] + this.marcData[sub] - // if (sub == 'subfield_a'){ - // console.info("subfieldA: ", this.targetName) - // key = key + " $" + sub.split("_")[1] + this.targetName - // } else { - // key = key + " $" + sub.split("_")[1] + this.marcData[sub] - // } + key = key + "$" + sub.split("_")[1] + this.marcData[this.activeIndex][sub] } } - key = key + " $7" + this.marcData["dollar7"] + fullString = fullString + key + " $7" + this.marcData[this.activeIndex]["dollar7"] + + // this.marcData = key + this.marcData[this.activeIndex]['targetName'] = key + console.info(">>>>", this.marcData[this.activeIndex]) + this.marcData[this.activeIndex]['targetName'] = key + this.marcData[this.activeIndex]['fullString'] = fullString + }, - this.newMarcKey = key + addBcpRow: function(){ + this.marcData.push({ + 'tag': this.tag, + 'indicators': this.indicators, + 'targetName': '', + 'bcpSelection': [0], + 'fullString': '', + 'targetName': '$a', + }) + }, + removeBcpRow: function(row){ + console.info("remove: ", row, "--", this.marcData) + this.marcData.splice(row, 1); }, fetchAuthXML: async function(lccn){ @@ -327,6 +363,12 @@ return r }, + handleInput: function(event){ + this.marcData[this.activeIndex].targetName = event.target.value + console.info("this.marcData[this.activeIndex].targetName: ", this.marcData[this.activeIndex].targetName) + this.buildNewMarcKey() + }, + sortResults: function(a,b){ if (a.label.includes('Literal')){ @@ -501,6 +543,8 @@ this.searchValueLocal = null this.authorityLookupLocal = null this.offsetStep = 30 + + this.showEdit4xxPanel = false }, // watching the search input, when it changes kick off a search @@ -1373,9 +1417,24 @@ @@ -2136,5 +2168,37 @@ td { border: 5px solid #28cd28; } +.record-comp { + width: 100%; + height: 200px; + margin: auto; + +} + +.old-data { + width: 45%; + height: 200px; + float: left; +} + +.new-data { + width: 45%; + margin-left: 5%; + height: 200px; + float: right; +} + +.record-data { + background: whitesmoke; +} + +pre { + white-space: pre-wrap; /* Since CSS 2.1 */ + white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ +} + diff --git a/src/stores/profile.js b/src/stores/profile.js index 3628812c..17c889de 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8766,6 +8766,30 @@ export const useProfileStore = defineStore('profile', { return pp }, + compareAuthRecords: function(oldRec, newRec, target){ + + let diff = {} + + let recordOld = oldRec.getElementsByTagName('marcxml:record')[0] + let targetNameOld = oldRec.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] + + let recordNew = newRec.getElementsByTagName('marcxml:record')[0] + let targetNameNew = newRec.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] + + let recordOldString = new XMLSerializer().serializeToString(targetNameOld); + let recordNewString = new XMLSerializer().serializeToString(targetNameNew); + + // change to target name + diff = { + 'old': [recordOldString], + 'new': [recordNewString], + } + + console.info("dif: ", diff) + + return diff + }, + adjustAuthRecord: function(marcXML, updates, target){ console.info("adjusting") console.info("\tmarcXML: ", marcXML) @@ -8788,7 +8812,6 @@ export const useProfileStore = defineStore('profile', { * TODO: * - remove 667? under what conditions? $a >Non-Latin script references not evaluated.? * - flag for preferred? - * - additional names * - deleted names */ @@ -8801,54 +8824,59 @@ export const useProfileStore = defineStore('profile', { for (let [idx, update] of updates.entries()){ - let indicators = update.indicators.split("") - targetNameXML.setAttribute("ind1", indicators[0]) - targetNameXML.setAttribute("ind2", indicators[1]) - - if (idx == 0){ - for (let key of Object.keys(update)){ - if (key.includes('subfield_')){ - let subfield = key.split("_")[1] - let value = update[key] - - // if we're looking at the first update - let target = existingCodes[subfield] - if (target){ // if the subfield is existing update it - target.innerHTML = value - }else { // otherwise, create it - let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); - newSubField.setAttribute("code", subfield) - newSubField.innerHTML = value.trim() - // targetNameXML.appendChild(newSubField) - this.indentedAppend(targetNameXML, newSubField) - } + if (update.delete){ + record.removeChild(targetNameXML) + } else { + + let indicators = update.indicators.split("") + targetNameXML.setAttribute("ind1", indicators[0]) + targetNameXML.setAttribute("ind2", indicators[1]) + + if (idx == 0){ + for (let key of Object.keys(update)){ + if (key.includes('subfield_')){ + let subfield = key.split("_")[1] + let value = update[key] + + // if we're looking at the first update + let target = existingCodes[subfield] + if (target){ // if the subfield is existing update it + target.innerHTML = value + }else { // otherwise, create it + let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); + newSubField.setAttribute("code", subfield) + newSubField.innerHTML = value.trim() + // targetNameXML.appendChild(newSubField) + this.indentedAppend(targetNameXML, newSubField) + } + } } - } - } else { // it's a new field for the top element - let newField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:datafield') - newField.setAttribute('tag', update.tag) - newField.setAttribute('ind1', indicators[0]) - newField.setAttribute('ind2', indicators[1]) + } else { // it's a new field for the top element + let newField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:datafield') + newField.setAttribute('tag', update.tag) + newField.setAttribute('ind1', indicators[0]) + newField.setAttribute('ind2', indicators[1]) - this.indentedAppend(record, newField, false, nextBlock) + this.indentedAppend(record, newField, false, nextBlock) - for (let [idx, key] of Object.keys(update).entries()){ - if (key.includes('subfield_')){ - let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); - let subfield = key.split("_")[1] - let value = update[key] + for (let [idx, key] of Object.keys(update).entries()){ + if (key.includes('subfield_')){ + let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); + let subfield = key.split("_")[1] + let value = update[key] - newSubField.setAttribute("code", subfield) - newSubField.innerHTML = value.trim() - if (idx == Object.keys(update).length - 1){ - this.indentedAppend(newField, newSubField, false, 'last') - } else { - this.indentedAppend(newField, newSubField, false) + newSubField.setAttribute("code", subfield) + newSubField.innerHTML = value.trim() + if (idx == Object.keys(update).length - 1){ + this.indentedAppend(newField, newSubField, false, 'last') + } else { + this.indentedAppend(newField, newSubField, false) + } } } - } + } } } From 4311b6641df6e6d1359d5ee9db2664f734a52764 Mon Sep 17 00:00:00 2001 From: fo Date: Fri, 12 Jun 2026 17:14:56 +0000 Subject: [PATCH 09/94] Fix not deleting things If a subfield is removed, but not the entire 4XX, the deleted subfield would remain. Make sure to always have a copy of the original marc --- src/stores/profile.js | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/stores/profile.js b/src/stores/profile.js index 17c889de..7ab1010f 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8772,12 +8772,17 @@ export const useProfileStore = defineStore('profile', { let recordOld = oldRec.getElementsByTagName('marcxml:record')[0] let targetNameOld = oldRec.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] + let recordOldString = new XMLSerializer().serializeToString(targetNameOld); let recordNew = newRec.getElementsByTagName('marcxml:record')[0] let targetNameNew = newRec.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] + let recordNewString - let recordOldString = new XMLSerializer().serializeToString(targetNameOld); - let recordNewString = new XMLSerializer().serializeToString(targetNameNew); + try { + recordNewString = new XMLSerializer().serializeToString(targetNameNew); + } catch(err){ + recordNewString = 'DELETED' + } // change to target name diff = { @@ -8797,7 +8802,8 @@ export const useProfileStore = defineStore('profile', { console.info("\tupdates: ", updates) let record = marcXML.getElementsByTagName('marcxml:record')[0] - let targetNameXML = marcXML.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] + record = record.cloneNode(true) + let targetNameXML = record.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] let index = [].indexOf.call(record.children, targetNameXML) let nextBlock = record.children[index + 1] @@ -8832,16 +8838,36 @@ export const useProfileStore = defineStore('profile', { targetNameXML.setAttribute("ind1", indicators[0]) targetNameXML.setAttribute("ind2", indicators[1]) + // existingCodes not present in the update + let deleteCodes = Object.keys(existingCodes).map(code => { + if (!Object.keys(update).includes('subfield_' + code)){ + return code + } + }) + + console.info("deleteCodes: ", deleteCodes) + if (idx == 0){ for (let key of Object.keys(update)){ if (key.includes('subfield_')){ let subfield = key.split("_")[1] let value = update[key] + console.info("existingCodes: ", existingCodes) + console.info("update: ", update) + // if we're looking at the first update let target = existingCodes[subfield] if (target){ // if the subfield is existing update it target.innerHTML = value + for (let code of deleteCodes){ + if (code){ + console.info("code: ", code) + console.info("existingCodes: ", existingCodes) + console.info("delete: ", existingCodes[code]) + targetNameXML.removeChild(existingCodes[code]) + } + } }else { // otherwise, create it let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); newSubField.setAttribute("code", subfield) From adeb2152a9a2da85b65caa436ca72ee27a4bcd78 Mon Sep 17 00:00:00 2001 From: fo Date: Mon, 15 Jun 2026 15:13:29 +0000 Subject: [PATCH 10/94] More diffing --- src/stores/profile.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/stores/profile.js b/src/stores/profile.js index 7ab1010f..f0376dc7 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8774,7 +8774,7 @@ export const useProfileStore = defineStore('profile', { let targetNameOld = oldRec.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] let recordOldString = new XMLSerializer().serializeToString(targetNameOld); - let recordNew = newRec.getElementsByTagName('marcxml:record')[0] + let recordNew = newRec let targetNameNew = newRec.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] let recordNewString @@ -8790,6 +8790,22 @@ export const useProfileStore = defineStore('profile', { 'new': [recordNewString], } + console.info("recordNew: ", recordNew) + + // look at the children and see what's new + let childrenOriginal = [].slice.call(recordOld.children) + let childrenNew = [].slice.call(recordNew.children) + if (childrenOriginal.length != childrenNew.length){ + console.info('original: ', childrenOriginal) + for (let newChild of childrenNew){ + if (!childrenOriginal.includes(newChild)){ + console.info("diff: ", newChild) + } + } + } else { + console.info("same") + } + console.info("dif: ", diff) return diff From 144e9d30aa109de55b116394c8297bae89c98c1c Mon Sep 17 00:00:00 2001 From: fo Date: Tue, 16 Jun 2026 12:09:24 +0000 Subject: [PATCH 11/94] More diffing --- src/stores/profile.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/stores/profile.js b/src/stores/profile.js index f0376dc7..e1b4104f 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8795,17 +8795,23 @@ export const useProfileStore = defineStore('profile', { // look at the children and see what's new let childrenOriginal = [].slice.call(recordOld.children) let childrenNew = [].slice.call(recordNew.children) + + childrenOriginal = childrenOriginal.map(rec => new XMLSerializer().serializeToString(rec)) + childrenNew = childrenNew.map(rec => new XMLSerializer().serializeToString(rec)) + + let newPieces = [] if (childrenOriginal.length != childrenNew.length){ - console.info('original: ', childrenOriginal) - for (let newChild of childrenNew){ - if (!childrenOriginal.includes(newChild)){ - console.info("diff: ", newChild) + for (let nc of childrenNew){ + if (!childrenOriginal.includes(nc)){ + if (!diff.new.includes(nc)){ + diff.new.push(nc) + } } } - } else { - console.info("same") } + + console.info("dif: ", diff) return diff From ff1ed31a7baca2497c3260b89465210128253cd6 Mon Sep 17 00:00:00 2001 From: fo Date: Tue, 16 Jun 2026 14:13:49 +0000 Subject: [PATCH 12/94] Format, deleting --- .../panels/edit/modals/ComplexLookupModal.vue | 82 +++++++++++-------- src/stores/profile.js | 27 +++++- 2 files changed, 70 insertions(+), 39 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index c390c8c5..22a33e3b 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -227,7 +227,7 @@ this.marcData[0].indicators = this.indicators let targetNameXML = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] - this.xmlTarget = [targetTag, idx] + this.xmlTarget = [targetTag, idx, targetNameXML.children[0].innerHTML] for (let sub of targetNameXML.children){ let subfield = sub.getAttribute("code") @@ -280,7 +280,7 @@ // const diff = (oldVal, newVal) => newVal.split(oldVal).join('') console.info("marcXML: ", marcXML) - let comparison = this.compareAuthRecords(this.originalMarc, this.updatedRecord, target) + let comparison = this.compareAuthRecords(this.originalMarc, this.updatedRecord, target, updates) this.diffRecord = comparison console.info("comparison: ", comparison) @@ -1446,28 +1446,30 @@ -
    - - - - - - - - - - - - - - -
    BCP47LanguageScore
    - {{ code["bcp47code"] }} - - {{ code["name"] }} - - {{ code["score"] }} -
    +
    + + + + + + + + + + + + + + + +
    BCP47LanguageScore
    + {{ code["bcp47code"] }} + + {{ code["name"] }} + + {{ code["score"] }} +
    +
    New Value:

    {{ row.marcKey }}
    @@ -2128,6 +2130,13 @@ .authority-edit { padding: 8px; } +.bcp-selection-table { + height: 250px; + overflow: scroll; + display: block; +} + + table { border-collapse: collapse; border: 2px solid rgb(140 140 140); @@ -2176,16 +2185,16 @@ td { } .old-data { - width: 45%; - height: 200px; - float: left; + /* width: 45%; */ + height: 100px; + /* float: left; */ } .new-data { - width: 45%; - margin-left: 5%; + /* width: 45%; */ + /* margin-left: 5%; */ height: 200px; - float: right; + /* float: right; */ } .record-data { @@ -2193,11 +2202,14 @@ td { } pre { - white-space: pre-wrap; /* Since CSS 2.1 */ - white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ + /* white-space: pre-wrap; + white-space: -moz-pre-wrap; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + word-wrap: break-word; */ + + overflow: scroll; + margin-bottom: 5px; } diff --git a/src/stores/profile.js b/src/stores/profile.js index e1b4104f..514f604c 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8766,7 +8766,10 @@ export const useProfileStore = defineStore('profile', { return pp }, - compareAuthRecords: function(oldRec, newRec, target){ + compareAuthRecords: function(oldRec, newRec, target, updates){ + console.info("target: ", target) + let hasDeletions = updates.some(u => u.delete) + console.info("hasDeletions: ", hasDeletions) let diff = {} @@ -8778,12 +8781,21 @@ export const useProfileStore = defineStore('profile', { let targetNameNew = newRec.querySelectorAll('[tag="' + target[0] +'"]')[target[1]] let recordNewString + try { recordNewString = new XMLSerializer().serializeToString(targetNameNew); + if (!recordNewString.includes(target[2])){ + if (hasDeletions){ + recordNewString = 'DELETED' + } + } } catch(err){ - recordNewString = 'DELETED' + if (hasDeletions){ + recordNewString = 'DELETED' + } } + // change to target name diff = { 'old': [recordOldString], @@ -8800,7 +8812,7 @@ export const useProfileStore = defineStore('profile', { childrenNew = childrenNew.map(rec => new XMLSerializer().serializeToString(rec)) let newPieces = [] - if (childrenOriginal.length != childrenNew.length){ + // if (childrenOriginal.length != childrenNew.length){ for (let nc of childrenNew){ if (!childrenOriginal.includes(nc)){ if (!diff.new.includes(nc)){ @@ -8808,7 +8820,7 @@ export const useProfileStore = defineStore('profile', { } } } - } + // } @@ -8817,6 +8829,11 @@ export const useProfileStore = defineStore('profile', { return diff }, + setCharAt: function(str, index, chr) { + if(index > str.length-1) return str; + return str.substring(0,index) + chr + str.substring(index+1); + }, + adjustAuthRecord: function(marcXML, updates, target){ console.info("adjusting") console.info("\tmarcXML: ", marcXML) @@ -8853,6 +8870,7 @@ export const useProfileStore = defineStore('profile', { for (let [idx, update] of updates.entries()){ if (update.delete){ + console.info("delete: ", targetNameXML) record.removeChild(targetNameXML) } else { @@ -8928,6 +8946,7 @@ export const useProfileStore = defineStore('profile', { } } + console.info("adjusted record: ", record) return record }, From 1046527c7901bf852957561bea1c1945197e2a76 Mon Sep 17 00:00:00 2001 From: fo Date: Tue, 16 Jun 2026 14:22:47 +0000 Subject: [PATCH 13/94] seperate $7s --- src/components/panels/edit/modals/ComplexLookupModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index 22a33e3b..85fc56ff 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -336,7 +336,7 @@ this.marcData[this.activeIndex]['subfield_7'] = '' for (let c of this.marcData[this.activeIndex].bcpSelection){ - this.marcData[this.activeIndex]['subfield_7'] = this.marcData[this.activeIndex]['subfield_7'] + " (bcp47)" + this.bcpCodes[c].bcp47code + this.marcData[this.activeIndex]['subfield_7'] = this.marcData[this.activeIndex]['subfield_7'] + " $7 (bcp47)" + this.bcpCodes[c].bcp47code } for (let sub of Object.keys(this.marcData[this.activeIndex])) { @@ -344,7 +344,7 @@ key = key + "$" + sub.split("_")[1] + this.marcData[this.activeIndex][sub] } } - marcKey = marcKey + key + " $7" + this.marcData[this.activeIndex]['subfield_7'] + marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'] this.marcData[this.activeIndex]['displayName'] = key this.marcData[this.activeIndex]['marcKey'] = marcKey From eba3f7df4e1ab3e69ee9e0fb30b998f54f592ff6 Mon Sep 17 00:00:00 2001 From: fo Date: Wed, 17 Jun 2026 14:39:13 +0000 Subject: [PATCH 14/94] Split $7s --- .../panels/edit/modals/ComplexLookupModal.vue | 11 ++-- src/stores/profile.js | 54 ++++++++++++++----- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index 85fc56ff..63e6f453 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -334,9 +334,11 @@ // } } - this.marcData[this.activeIndex]['subfield_7'] = '' + // this.marcData[this.activeIndex]['subfield_7'] = '' + this.marcData[this.activeIndex]['subfield_7'] = [] for (let c of this.marcData[this.activeIndex].bcpSelection){ - this.marcData[this.activeIndex]['subfield_7'] = this.marcData[this.activeIndex]['subfield_7'] + " $7 (bcp47)" + this.bcpCodes[c].bcp47code + //this.marcData[this.activeIndex]['subfield_7'] = this.marcData[this.activeIndex]['subfield_7'] + "(bcp47)" + this.bcpCodes[c].bcp47code + this.marcData[this.activeIndex]['subfield_7'].push("(bcp47)" + this.bcpCodes[c].bcp47code) } for (let sub of Object.keys(this.marcData[this.activeIndex])) { @@ -344,7 +346,10 @@ key = key + "$" + sub.split("_")[1] + this.marcData[this.activeIndex][sub] } } - marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'] + + marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'].join(" $7 ") + + this.marcData[this.activeIndex]['displayName'] = key this.marcData[this.activeIndex]['marcKey'] = marcKey diff --git a/src/stores/profile.js b/src/stores/profile.js index 514f604c..cab96b44 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8909,11 +8909,21 @@ export const useProfileStore = defineStore('profile', { } } }else { // otherwise, create it - let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); - newSubField.setAttribute("code", subfield) - newSubField.innerHTML = value.trim() - // targetNameXML.appendChild(newSubField) - this.indentedAppend(targetNameXML, newSubField) + if (typeof value == 'string'){ + let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); + newSubField.setAttribute("code", subfield) + newSubField.innerHTML = value.trim() + // targetNameXML.appendChild(newSubField) + this.indentedAppend(targetNameXML, newSubField) + } else { + for (let bcp of value){ + let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); + newSubField.setAttribute("code", subfield) + newSubField.innerHTML = bcp.trim() + // targetNameXML.appendChild(newSubField) + this.indentedAppend(targetNameXML, newSubField) + } + } } } @@ -8932,13 +8942,31 @@ export const useProfileStore = defineStore('profile', { let subfield = key.split("_")[1] let value = update[key] - newSubField.setAttribute("code", subfield) - newSubField.innerHTML = value.trim() - if (idx == Object.keys(update).length - 1){ - this.indentedAppend(newField, newSubField, false, 'last') - } else { - this.indentedAppend(newField, newSubField, false) - } + + if (typeof value == 'string'){ + newSubField.setAttribute("code", subfield) + newSubField.innerHTML = value.trim() + // targetNameXML.appendChild(newSubField) + if (idx == Object.keys(update).length - 1){ + this.indentedAppend(newField, newSubField, false, 'last') + } else { + this.indentedAppend(newField, newSubField, false) + } + } else { + for (let i in value){ + let bcp = value[i] + let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); + newSubField.setAttribute("code", subfield) + newSubField.innerHTML = bcp.trim() + // targetNameXML.appendChild(newSubField) + if (i == value.length - 1){ + console.info(idx, ": ", update) + this.indentedAppend(newField, newSubField, false, 'last') + } else { + this.indentedAppend(newField, newSubField, false) + } + } + } } } @@ -8975,7 +9003,7 @@ export const useProfileStore = defineStore('profile', { parent.appendChild(child) parent.appendChild(document.createTextNode("\n" + indent)) } else { - console.info("new: ", child, "--", parent) + console.info("new: ", child, "--", parent, "--", next) parent.appendChild(document.createTextNode("\n" + indent)) parent.appendChild(child) if (next && next == 'last'){ From d2c8378a8fd39898f0c7fe8a74ddad8c0b47e751 Mon Sep 17 00:00:00 2001 From: fo Date: Wed, 17 Jun 2026 15:33:23 +0000 Subject: [PATCH 15/94] Add date from 1XX --- .../panels/edit/modals/ComplexLookupModal.vue | 53 +++++++++---------- src/stores/profile.js | 35 ++++-------- 2 files changed, 35 insertions(+), 53 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index 63e6f453..4b74a693 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -106,19 +106,16 @@ // editing 4XX showEdit4xxPanel: false, - marcDoc: {}, associatedLang: null, bcpCodes: {}, - bcpSelection: [0], marcData: [{}], - newMarcKeys: [{displayName: '', bcpSelection: []}], - newMarcKey: '', activeIndex: 0, xmlTarget: [], refEval: false, originalMarc: null, updatedRecord: null, diffRecord: [], + oneXXdollarD: false, } }, @@ -229,6 +226,13 @@ let targetNameXML = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] this.xmlTarget = [targetTag, idx, targetNameXML.children[0].innerHTML] + // get the $d for the 1XX + for (let child of targetNameXML.children){ + if (child.getAttribute('code') == 'd'){ + this.oneXXdollarD = child.innerHTML + } + } + for (let sub of targetNameXML.children){ let subfield = sub.getAttribute("code") let value = sub.innerHTML @@ -274,17 +278,12 @@ console.info("updatedRecord: ", this.updatedRecord) - // let xmlExisting = this.originalMarc let xmlUpdated = new XMLSerializer().serializeToString(this.updatedRecord); console.info("update: ", xmlUpdated) - // const diff = (oldVal, newVal) => newVal.split(oldVal).join('') - console.info("marcXML: ", marcXML) let comparison = this.compareAuthRecords(this.originalMarc, this.updatedRecord, target, updates) this.diffRecord = comparison console.info("comparison: ", comparison) - - }, addBcpCode: function(idx){ @@ -313,7 +312,6 @@ let userInput = this.marcData[this.activeIndex].displayName // split up the user input and use to populate the marcData - // let subfields = userInput.match(/(\$[a-z0-9])/g) let subfields = userInput.match(/.+?(?=\$[a-z0-9]|$|\n)/g) if (!subfields){ subfields = [''] @@ -321,17 +319,11 @@ } else { this.marcData[this.activeIndex].delete = false } - let subTags = subfields.map((sf) => {return sf.slice(0,2)}) - let existingSubfields = Object.keys(this.marcData[this.activeIndex]).filter(sub => sub.includes('subfield_')) for (let sub of subfields){ let field = sub.slice(1,2) let value = sub.slice(2) this.marcData[this.activeIndex]["subfield_" + field] = value - - // if (sub != '$'){ - // this.marcData[this.activeIndex]["subfield_" + field] = value - // } } // this.marcData[this.activeIndex]['subfield_7'] = '' @@ -349,8 +341,6 @@ marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'].join(" $7 ") - - this.marcData[this.activeIndex]['displayName'] = key this.marcData[this.activeIndex]['marcKey'] = marcKey @@ -371,6 +361,12 @@ JSON.parse(JSON.stringify(this.marcData[idx])) ) }, + + addDateFromOneXX: function(){ + this.marcData[this.activeIndex].displayName += " $d " + this.oneXXdollarD + this.buildNewMarcKey() + }, + removeBcpRow: function(row){ this.marcData.splice(row, 1); this.activeIndex = 0 @@ -387,15 +383,15 @@ }, sortResults: function(a,b){ - if (a.label.includes('Literal')){ - return -1 - } else if (a.label > b.label){ - return 1 - } else if(a.label < b.label){ - return -1 - } else { - return 0 - } + if (a.label.includes('Literal')){ + return -1 + } else if (a.label > b.label){ + return 1 + } else if(a.label < b.label){ + return -1 + } else { + return 0 + } }, checkLcOnly: function(){ let config = useConfigStore() @@ -1447,6 +1443,7 @@ +
    @@ -2169,7 +2166,7 @@ td { background-color: rgb(131, 131, 255); } .bcp-input{ - width: 80%; + width: 75%; font-size: 1.3em; } .bcp-icon { diff --git a/src/stores/profile.js b/src/stores/profile.js index cab96b44..10227549 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8767,9 +8767,7 @@ export const useProfileStore = defineStore('profile', { }, compareAuthRecords: function(oldRec, newRec, target, updates){ - console.info("target: ", target) let hasDeletions = updates.some(u => u.delete) - console.info("hasDeletions: ", hasDeletions) let diff = {} @@ -8795,15 +8793,12 @@ export const useProfileStore = defineStore('profile', { } } - // change to target name diff = { 'old': [recordOldString], 'new': [recordNewString], } - console.info("recordNew: ", recordNew) - // look at the children and see what's new let childrenOriginal = [].slice.call(recordOld.children) let childrenNew = [].slice.call(recordNew.children) @@ -8812,19 +8807,13 @@ export const useProfileStore = defineStore('profile', { childrenNew = childrenNew.map(rec => new XMLSerializer().serializeToString(rec)) let newPieces = [] - // if (childrenOriginal.length != childrenNew.length){ - for (let nc of childrenNew){ - if (!childrenOriginal.includes(nc)){ - if (!diff.new.includes(nc)){ - diff.new.push(nc) - } + for (let nc of childrenNew){ + if (!childrenOriginal.includes(nc)){ + if (!diff.new.includes(nc)){ + diff.new.push(nc) } } - // } - - - - console.info("dif: ", diff) + } return diff }, @@ -8848,6 +8837,7 @@ export const useProfileStore = defineStore('profile', { // Get the existing subfields let existingCodes = {} + // for (let child of targetNameXML.children){ for (let child of targetNameXML.children){ let code = child.getAttribute("code") existingCodes[code] = child @@ -8857,7 +8847,6 @@ export const useProfileStore = defineStore('profile', { * TODO: * - remove 667? under what conditions? $a >Non-Latin script references not evaluated.? * - flag for preferred? - * - deleted names */ if (updates.refEval){ @@ -8868,12 +8857,10 @@ export const useProfileStore = defineStore('profile', { } for (let [idx, update] of updates.entries()){ - if (update.delete){ console.info("delete: ", targetNameXML) record.removeChild(targetNameXML) } else { - let indicators = update.indicators.split("") targetNameXML.setAttribute("ind1", indicators[0]) targetNameXML.setAttribute("ind2", indicators[1]) @@ -8893,19 +8880,17 @@ export const useProfileStore = defineStore('profile', { let subfield = key.split("_")[1] let value = update[key] - console.info("existingCodes: ", existingCodes) - console.info("update: ", update) - // if we're looking at the first update let target = existingCodes[subfield] if (target){ // if the subfield is existing update it target.innerHTML = value + console.info("\t\tsetting Value: ", value) for (let code of deleteCodes){ if (code){ - console.info("code: ", code) - console.info("existingCodes: ", existingCodes) - console.info("delete: ", existingCodes[code]) targetNameXML.removeChild(existingCodes[code]) + console.info("\t\tDeleting: ", code) + console.info("\t\t existingCodes[code]: ", existingCodes[code]) + console.info("\t\t targetNameXML: ", targetNameXML) } } }else { // otherwise, create it From 3b97a3237abd2c77d3324dbb2348a636820289f0 Mon Sep 17 00:00:00 2001 From: fo Date: Wed, 17 Jun 2026 16:32:06 +0000 Subject: [PATCH 16/94] Add unit tests --- public/twain.xml | 290 ++++++++++++++++++ .../panels/edit/modals/ComplexLookupModal.vue | 8 +- src/stores/__tests__/profiles.test.js | 104 ++++++- src/stores/profile.js | 18 +- 4 files changed, 406 insertions(+), 14 deletions(-) create mode 100644 public/twain.xml diff --git a/public/twain.xml b/public/twain.xml new file mode 100644 index 00000000..019d2637 --- /dev/null +++ b/public/twain.xml @@ -0,0 +1,290 @@ + + 04185cz a2200781n 4500 + n79021164 + DLC + 20250804195926.6 + 790418n| azannaabn |b aaa + + n 79021164 + sh 89001267 + no 98029431 + + + DLC + eng + rda + DLC + DLC + MdU + DLC + InU + DLC + PPiU + DLC + OCoLC + InU + OCoLC + ICU + OCoLC + UPB + DLC + NjP + DLC + WaU + IEN + WU + DLC + MdRoLAC + DLC + ICRL + OCoLC + HU + + + 1835-11-30 + 1910-04-21 + edtf + + + PS1300 + PS1348 + + + Twain, Mark, + 1835-1910 + + + Americans + lcsh + + + Florida (Mo.) + + + Redding (Conn.) + United States + Hannibal (Mo.) + naf + + + Literature + Humor + lcgft + + + Wit and humor + lcsh + + + Authors + Lecturers + Humorists + lcsh + + + eng + + + Tvėn, Mark, + 1835-1910 + + + Tuėĭn, Mark, + 1835-1910 + + + Tuwayn, Mārk, + 1835-1910 + + + Twayn, Mārk, + 1835-1910 + + + Tʻu-wen, Ma-kʻo, + 1835-1910 + + + Tven, M. + (Mark), + 1835-1910 + + + Touen, Makū, + 1835-1910 + + + Twain, Marek, + 1835-1910 + + + Make Tuwen, + 1835-1910 + + + Tuwen, Make, + 1835-1910 + + + Make Teviin, + 1835-1910 + + + Твен, Марк, + 1835-1910 + + + Touain, Mark, + 1835-1910 + + + טבןַ, מרק, + 1835-1910 + + + טוויין, מארק, + 1835-1910 + + + טוויין, מרק, + 1835-1910 + + + טווין, מארק, + 1835-1910 + + + טווין, מרק, + 1835-1910 + + + טווען, מארק, + 1835-1910 + + + טוין, מרק, + 1835-1910 + + + 馬克吐温, + 1835-1910 + + + Tuvāyn, Mārk, + 1835-1910 + + + Tvāyn, Mārk, + 1835-1910 + + + تواين، مارک + + + Tivāyn, Mārk, + 1835-1910 + + + Tʻuēyn, Markʻ, + 1835-1910 + + + T'ŭwein, Mak'ŭ, + 1835-1910 + + + 트웨인, 마크, + 1835-1910 + + + nnnc + Clemens, Samuel Langhorne, + 1835-1910 + + + nnnc + Snodgrass, Quintus Curtius, + 1835-1910 + + + nnnc + Conte, Louis de, + 1835-1910 + + + For works of this author written under other names, search also under + Clemens, Samuel Langhorne, 1835-1910, + Snodgrass, Quintus Curtius, 1835-1910 + Conte, Louis de, 1835-1910, + Alden, Jean François, 1835-1910 + + + Machine-derived non-Latin script reference project. + + + Non-Latin script references not evaluated. + + + Pseudonym not established: Jean François Alden + + + Geviksman, V. A. Print︠s︡ i nishchiĭ, 1984: + t.p. (M. Tvena) + + + Makū Touen tanpenshū, 1961. + + + Personal recollections of Joan of Arc, 1923: + v. 1-2, t.p. (the Sieur Louis de Conte; Jean François Alden) spine (Mark Twain) + + + DAB, 1930 + (Clemens, Samuel Langhorne, 1835-1910; better known under pseud. Mark Twain; also used name Quintus Curtius Snodgrass) + + + Mark Twain's personal recollections of Joan of Arc, 1997: + CIP t.p. (Sieur Louis de Conte) p. vii (Sieur Louis de Conte shared ... initials with Samuel L. Clemens) + + + Przygody Huck'a, 1912: + t.p. (Marek Twain) + + + Alda-bar ȯnggelegsen erin caġ, 1985: + v. 1, t.p. (Make Teveiin) colophon (Make Tuwen) + + + Wikipedia, Oct. 18, 2011 + (b. November 30, 1835 in Florida, Missouri; grew up in Hannibal, Missouri; d. April 21, 1910 in Redding, Connecticut; a writer and lecturer; wrote in genres of fiction, historical fiction, children's literature, non-fiction, travel literature, satire, essay, philosophical literature, social commentary, literary criticism) + + + Vasilopoulo kai zētianopoulo, 1953: + t.p. (Mark Touain) + + + Mājarāhā-yi Hākil Birī Fīn, 1967: + t.p. (مارک تواين = Mārk Tuvāyn) t.p. verso (Mark Twain [in rom.]) + + + Hatěntir patmwatskʻner, 1963: + title page (Markʻ Tʻuēyn) + + + OCLC, May 13, 2024: + (access point: Twain, Mark, 1835-1910; usage: 마크 트웨인 = Mak'u T'ŭwein) + + \ No newline at end of file diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index 4b74a693..b6d6d796 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -268,17 +268,19 @@ alert("A name is missing a language Selection. Add one before continuing.") return } - this.marcData.refEval = this.refEval + this.marcData[this.activeIndex].refEval = this.refEval const marcXML = this.xmlDoc let updates = this.marcData let target = this.xmlTarget + console.info("this.marcData: ", this.marcData) + this.updatedRecord = this.adjustAuthRecord(this.xmlDoc, this.marcData, this.xmlTarget) console.info("updatedRecord: ", this.updatedRecord) - let xmlUpdated = new XMLSerializer().serializeToString(this.updatedRecord); + let xmlUpdated = new XMLSerializer().serializeToString(this.updatedRecord) console.info("update: ", xmlUpdated) console.info("marcXML: ", marcXML) let comparison = this.compareAuthRecords(this.originalMarc, this.updatedRecord, target, updates) @@ -363,7 +365,7 @@ }, addDateFromOneXX: function(){ - this.marcData[this.activeIndex].displayName += " $d " + this.oneXXdollarD + this.marcData[this.activeIndex].displayName += "$d" + this.oneXXdollarD this.buildNewMarcKey() }, diff --git a/src/stores/__tests__/profiles.test.js b/src/stores/__tests__/profiles.test.js index ccce2b1f..8dbd81f4 100644 --- a/src/stores/__tests__/profiles.test.js +++ b/src/stores/__tests__/profiles.test.js @@ -5,6 +5,7 @@ import { createApp } from 'vue' import { mockMonographProfile } from './xml/mockProfile.json' + const fs = require("fs") const pinia = createPinia() const app = createApp() @@ -14,11 +15,9 @@ app.use(pinia) // we generated this data in the globalSetup, because it requires a network call, so just want to do it once useProfileStore().profiles = JSON.parse(fs.readFileSync("public/profiles.json", "utf8")) useProfileStore().rtLookup = JSON.parse(fs.readFileSync("public/rtLookup.json", "utf8")) - +const twainXml = fs.readFileSync("public/twain.xml", "utf8") describe('methods', () => { - - describe('isEmptyComponent', () => { let notEmpty = {"mandatory":"false","repeatable":"true","type":"resource","resourceTemplates":[],"valueConstraint":{"valueTemplateRefs":["lc:RT:bf2:Agents:Contribution"],"useValuesFrom":[],"defaults":[],"valueDataType":{"dataTypeURI":"http://id.loc.gov/ontologies/bibframe/Contribution"}},"propertyURI":"http://id.loc.gov/ontologies/bibframe/contribution","propertyLabel":"Contributors","remark":"","parent":"lc:profile:bf2:Monographlc:RT:bf2:Monograph:Workdaaecaf9-6802-4881-9fd3-f8cb900ed605","parentId":"lc:RT:bf2:Monograph:Work","userValue":{"@root":"http://id.loc.gov/ontologies/bibframe/contribution","http://id.loc.gov/ontologies/bibframe/contribution":[{"@guid":"17Xy5bfFESj6XFbu6ZgAmn","@type":"http://id.loc.gov/ontologies/bibframe/Family","http://id.loc.gov/ontologies/bibframe/agent":[{"@guid":"sU6qxGjgQDZTMLs1VMZvnb","@type":"http://www.loc.gov/mads/rdf/v1#FamilyName","@id":"http://id.loc.gov/authorities/names/no2021062575","http://www.w3.org/2000/01/rdf-schema#label":[{"@guid":"cQ5pgYKwJYRUnXqq5HzKmu","http://www.w3.org/2000/01/rdf-schema#label":"\nMiller (Family : New Bern, N.C.)\n "}],"http://id.loc.gov/ontologies/bflc/marcKey":[{"@guid":"b87bPAVQ56m8EmU8TkzpLL","http://id.loc.gov/ontologies/bflc/marcKey":"\n1003 $aMiller (Family :$cNew Bern, N.C.)\n "}]}]}]},"@guid":"xhsrN76GjEBJDP4GWaZv6s","canBeHidden":false,"preferenceId":"http://id.loc.gov/ontologies/bibframe/contribution|http://id.loc.gov/ontologies/bibframe/Contribution","id":"id_loc_gov_ontologies_bibframe_contribution__contributors","hashCode":-1158362988,"hashCodeId":"lc:RT:bf2:Monograph:Work|http://id.loc.gov/ontologies/bibframe/contribution|http://id.loc.gov/ontologies/bibframe/Contribution","hasData":true,"deepHierarchy":false,"xmlSource":"\n \n \n \n \n \nMiller (Family : New Bern, N.C.)\n \n \n1003 $aMiller (Family :$cNew Bern, N.C.)\n \n \n \n \n ","xmlHash":-1833430515,"dataLoaded":true} @@ -111,5 +110,104 @@ describe('methods', () => { }) + describe('Adding BCP Codes', () => { + it('Update NAR for BCP Code addition', async () => { + let marcXML = twainXml + let parser = new DOMParser() + marcXML = parser.parseFromString(marcXML, "text/xml") + const updates = [{"tag":"400","indicators":"11","bcpSelection":[0],"marcKey":"40011$aטבןַ, מרק,$d1835-1910(bcp47)he","displayName":"$aטבןַ, מרק,$d1835-1910","delete":false,"subfield_a":"טבןַ, מרק,","subfield_d":"1835-1910","subfield_7":["(bcp47)he"]}] + const target = ["400",13,"טבןַ, מרק,"] + let update = await useProfileStore().adjustAuthRecord(marcXML, updates, target) + update = new XMLSerializer().serializeToString(update) + + expect(update).toContain('') + expect(update).toContain('טבןַ, מרק,') + expect(update).toContain('1835-1910') + expect(update).toContain('(bcp47)he') + }); + + it('Update NAR for BCP Code addition with update to 008/29', async () => { + let marcXML = twainXml + let parser = new DOMParser() + marcXML = parser.parseFromString(marcXML, "text/xml") + const updates = [{"tag":"400","indicators":"11","bcpSelection":[0],"marcKey":"40011$aטבןַ, מרק,$d1835-1910(bcp47)he","displayName":"$aטבןַ, מרק,$d1835-1910","delete":false,"subfield_a":"טבןַ, מרק,","subfield_d":"1835-1910","subfield_7":["(bcp47)he"], "refEval":true}] + const target = ["400",13,"טבןַ, מרק,"] + let update = await useProfileStore().adjustAuthRecord(marcXML, updates, target) + update = new XMLSerializer().serializeToString(update) + + expect(update).toContain('') + expect(update).toContain('טבןַ, מרק,') + expect(update).toContain('1835-1910') + expect(update).toContain('(bcp47)he') + expect(update).toContain('790418n| azannaabn |a aaa ') + }); + + it('Update NAR delete $d', async () => { + let marcXML = twainXml + let parser = new DOMParser() + marcXML = parser.parseFromString(marcXML, "text/xml") + const updates = [{"tag":"400","indicators":"11","bcpSelection":[0],"marcKey":"40011$aטבןַ, מרק,(bcp47)he","displayName":"$aטבןַ, מרק,","delete":false,"subfield_a":"טבןַ, מרק,","subfield_7":["(bcp47)he"],"refEval":false}] + const target = ["400",13,"טבןַ, מרק,"] + let update = await useProfileStore().adjustAuthRecord(marcXML, updates, target) + update = new XMLSerializer().serializeToString(update) + update = update.replace(/[\n\r\s\s]+/g, ' ') + + expect(update).toContain('') + expect(update).toContain('טבןַ, מרק, (bcp47)he') + }); + + it('Update NAR DELETE 4XX', async () => { + let marcXML = twainXml + let parser = new DOMParser() + marcXML = parser.parseFromString(marcXML, "text/xml") + const updates = [{"tag":"400","indicators":"11","bcpSelection":[0],"marcKey":"40011$(bcp47)he","displayName":"$","delete":true,"subfield_":"","subfield_7":["(bcp47)he"],"refEval":false}] + const target = ["400",13,"טבןַ, מרק,"] + let update = await useProfileStore().adjustAuthRecord(marcXML, updates, target) + update = new XMLSerializer().serializeToString(update) + update = update.replace(/[\n\r\s\s]+/g, ' ') + + expect(update).not.toContain('') + expect(update).not.toContain('טבןַ, מרק, 1835-1910') + expect(update).not.toContain('(bcp47)he') + }); + + it('Update NAR for mulitple BCP Code additions', async () => { + let marcXML = twainXml + let parser = new DOMParser() + marcXML = parser.parseFromString(marcXML, "text/xml") + const updates = [{"tag":"400","indicators":"11","bcpSelection":[0,1],"marcKey":"40011$a트웨인, 마크,$d1835-1910(bcp47)ko $7 (bcp47)ko-jamo","displayName":"$a트웨인, 마크,$d1835-1910","delete":false,"subfield_a":"트웨인, 마크,","subfield_d":"1835-1910","subfield_7":["(bcp47)ko","(bcp47)ko-jamo"],"refEval":false}] + const target = ["400",27,"트웨인, 마크,"] + let update = await useProfileStore().adjustAuthRecord(marcXML, updates, target) + update = new XMLSerializer().serializeToString(update) + update = update.replace(/[\n\r\s\s]+/g, ' ') + + expect(update).toContain('') + expect(update).toContain('트웨인, 마크,') + expect(update).toContain('1835-1910') + expect(update).toContain('(bcp47)ko (bcp47)ko-jamo') + }); + + it('Update NAR with BCP plus an additional form', async () => { + let marcXML = twainXml + let parser = new DOMParser() + marcXML = parser.parseFromString(marcXML, "text/xml") + const updates = [{"tag":"400","indicators":"11","bcpSelection":[0,1],"marcKey":"40011$a트웨인, 마크,$d1835-1910(bcp47)ko $7 (bcp47)ko-jamo","displayName":"$a트웨인, 마크,$d1835-1910","delete":false,"subfield_a":"트웨인, 마크,","subfield_d":"1835-1910","subfield_7":["(bcp47)ko","(bcp47)ko-jamo"],"refEval":false},{"tag":"400","indicators":"11","bcpSelection":[3],"marcKey":"40011$aTest(bcp47)oko-hang","displayName":"$aTest","delete":false,"subfield_a":"Test","subfield_7":["(bcp47)oko-hang"],"refEval":false}] + const target = ["400",27,"트웨인, 마크,"] + let update = await useProfileStore().adjustAuthRecord(marcXML, updates, target) + update = new XMLSerializer().serializeToString(update) + update = update.replace(/[\n\r\s\s]+/g, ' ') + + expect(update).toContain('') + expect(update).toContain('트웨인, 마크,') + expect(update).toContain('1835-1910') + expect(update).toContain('(bcp47)ko') + + expect(update).toContain('Test (bcp47)oko-hang') + }); + + + }) + + }) diff --git a/src/stores/profile.js b/src/stores/profile.js index 10227549..9675bfaa 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8826,8 +8826,8 @@ export const useProfileStore = defineStore('profile', { adjustAuthRecord: function(marcXML, updates, target){ console.info("adjusting") console.info("\tmarcXML: ", marcXML) - console.info("\ttarget: ", target) - console.info("\tupdates: ", updates) + console.info("\ttarget: ", JSON.stringify(target)) + console.info("\tupdates: ", JSON.stringify(updates)) let record = marcXML.getElementsByTagName('marcxml:record')[0] record = record.cloneNode(true) @@ -8849,14 +8849,16 @@ export const useProfileStore = defineStore('profile', { * - flag for preferred? */ - if (updates.refEval){ - let zeroZeroEight = marcXML.querySelectorAll('[tag="008"]')[0] - let currentValue = zeroZeroEight.innerHTML - let updatedValue = this.setCharAt(currentValue, 29, 'a') - zeroZeroEight.innerHTML = updatedValue - } for (let [idx, update] of updates.entries()){ + if (update.refEval){ + console.info("UPDATE 008") + let zeroZeroEight = record.querySelectorAll('[tag="008"]')[0] + let currentValue = zeroZeroEight.innerHTML + let updatedValue = this.setCharAt(currentValue, 29, 'a') + zeroZeroEight.innerHTML = updatedValue + console.info("008>>>", zeroZeroEight) + } if (update.delete){ console.info("delete: ", targetNameXML) record.removeChild(targetNameXML) From 0483c4f993a9bd86b1b0291552af7a40a9c6b25d Mon Sep 17 00:00:00 2001 From: fo Date: Wed, 17 Jun 2026 17:07:04 +0000 Subject: [PATCH 17/94] Add validation --- .../panels/edit/modals/ComplexLookupModal.vue | 77 ++++++++++++++++++- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index b6d6d796..2ad302c5 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -116,6 +116,8 @@ updatedRecord: null, diffRecord: [], oneXXdollarD: false, + validating: false, + validationResult: {}, } }, @@ -192,8 +194,23 @@ return str.substring(0,index) + chr + str.substring(index+1); }, + resetBcp: function(){ + this.showEdit4xxPanel = false + this.associatedLang = null + this.bcpCodes = {} + this.marcData = [{}] + this.activeIndex = 0 + this.xmlTarget = [] + this.refEval = false + this.originalMarc = null + this.updatedRecord = null + this.diffRecord = [] + this.oneXXdollarD = false + }, + // initial 4XX edit4XX: async function(data, idx){ + this.resetBcp() // Get MarcKey for 1XX let marcKey = data.extra.marcKeys[0] this.tag = marcKey.slice(0,3) @@ -263,7 +280,7 @@ hideBCP: function(){ this.showEdit4xxPanel = false }, - submitEdit: function(){ + submitEdit: async function(){ if (this.marcData.some(d => {return d.bcpSelection.length == 0})){ alert("A name is missing a language Selection. Add one before continuing.") return @@ -281,6 +298,16 @@ console.info("updatedRecord: ", this.updatedRecord) let xmlUpdated = new XMLSerializer().serializeToString(this.updatedRecord) + + // validate the update + this.validating = true + this.validationResult = await utilsNetwork.validateNar(xmlUpdated) + this.validating = false + + if (this.validationResult.validation[0].level == 'ERROR'){ + return + } + console.info("update: ", xmlUpdated) console.info("marcXML: ", marcXML) let comparison = this.compareAuthRecords(this.originalMarc, this.updatedRecord, target, updates) @@ -341,7 +368,11 @@ } } - marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'].join(" $7 ") + if (this.marcData[this.activeIndex]['subfield_7'].length > 1){ + marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'].join(" $7 ") + } else { + marcKey = marcKey + key + " $7 " + this.marcData[this.activeIndex]['subfield_7'] + } this.marcData[this.activeIndex]['displayName'] = key this.marcData[this.activeIndex]['marcKey'] = marcKey @@ -1475,8 +1506,18 @@
- New Value:

-
{{ row.marcKey }}
+ New Value(s):

+
{{ row.marcKey }}
+ +


@@ -2216,5 +2257,33 @@ pre { margin-bottom: 5px; } +.new-marc-data{ + width: fit-content; + padding: 5px; + border-radius: 25px; + background-color: whitesmoke; + margin-bottom: 5px; +} + +.validation-error, +.validation-success { + list-style: none; + width: fit-content; + margin-bottom: 5px; + padding: .75rem 1.25rem; + border-radius: 25px; +} + +.validation-error{ + color: #721c24; + background-color: #f8d7da; + border-color: #f5c6cb; +} + +.validation-success{ + color: #155724; + background-color: #d4edda; + border-color: #c3e6cb; +} From 30a8e39853befbe1b685866a1f4fc577c2457a7a Mon Sep 17 00:00:00 2001 From: fo Date: Wed, 17 Jun 2026 19:56:31 +0000 Subject: [PATCH 18/94] Gather 667, don't show `$d` button when it's false --- .../panels/edit/modals/ComplexLookupModal.vue | 64 +++++++++++-------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index 2ad302c5..6ecf7679 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -243,9 +243,13 @@ let targetNameXML = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] this.xmlTarget = [targetTag, idx, targetNameXML.children[0].innerHTML] - // get the $d for the 1XX + let marc667List = this.xmlDoc.querySelectorAll('[tag="667"]') + console.info("marc667List: ", marc667List) + + // get the $d for the 1XX, as long as there is no $t + let childFields = [].slice.call(targetNameXML.children).map(field => field.getAttribute('code')) for (let child of targetNameXML.children){ - if (child.getAttribute('code') == 'd'){ + if (child.getAttribute('code') == 'd' && !childFields.includes('t')){ this.oneXXdollarD = child.innerHTML } } @@ -1476,7 +1480,7 @@ - +
@@ -1506,38 +1510,40 @@
- New Value(s):

-
{{ row.marcKey }}
+
+ New Value(s):

+
{{ row.marcKey }}
- + +
-


- - -

- - +
+ + +

+ + +
Original 
-  {{ data }}
+  {{ data.replace('xmlns:marcxml="http://www.loc.gov/MARC21/slim"', "") }}
Updated 
-  {{ data}}
+  {{ data.replace('xmlns:marcxml="http://www.loc.gov/MARC21/slim"', "")  }}
@@ -2223,10 +2229,8 @@ td { } .record-comp { - width: 100%; + /* max-width: 80%; */ height: 200px; - margin: auto; - } .old-data { @@ -2255,9 +2259,12 @@ pre { overflow: scroll; margin-bottom: 5px; + /* max-width: 80%; */ + line-height: 20px; } .new-marc-data{ + width: fit-content; padding: 5px; border-radius: 25px; @@ -2286,4 +2293,11 @@ pre { border-color: #c3e6cb; } +.button-container, +.new-value-container { + margin-top: 5px; + background-color: rgb(201, 199, 199); + padding: 5px; +} + From 54b489f9137f50aeadfb67a7cbdd90a8170a82de Mon Sep 17 00:00:00 2001 From: fo Date: Thu, 18 Jun 2026 11:25:55 +0000 Subject: [PATCH 19/94] Capture `667` incase something needs to happen with it. --- .../panels/edit/modals/ComplexLookupModal.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index 6ecf7679..a2c8296f 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -243,8 +243,15 @@ let targetNameXML = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] this.xmlTarget = [targetTag, idx, targetNameXML.children[0].innerHTML] + // Get the 667s, do these need adjustment? let marc667List = this.xmlDoc.querySelectorAll('[tag="667"]') - console.info("marc667List: ", marc667List) + let target667 = false + for (let sixSixSeven of marc667List){ + if (sixSixSeven.innerHTML.includes('Non-Latin script references not evaluated.')){ + target667 = sixSixSeven + } + } + console.info("target667: ", target667) // get the $d for the 1XX, as long as there is no $t let childFields = [].slice.call(targetNameXML.children).map(field => field.getAttribute('code')) @@ -400,7 +407,7 @@ }, addDateFromOneXX: function(){ - this.marcData[this.activeIndex].displayName += "$d" + this.oneXXdollarD + this.marcData[this.activeIndex].displayName += ", $d" + this.oneXXdollarD this.buildNewMarcKey() }, @@ -1581,9 +1588,6 @@
view on ID - -
- view MARCXML
From a0533ad41a975fd9a864c07391291210cf5a242f Mon Sep 17 00:00:00 2001 From: fo Date: Tue, 23 Jun 2026 14:01:44 +0000 Subject: [PATCH 20/94] Fix date from 1xx, address existing $7 - Pasting the $d was coming from the variant instead of the 1xx - If there is existing $7 information, delete it --- .../panels/edit/modals/ComplexLookupModal.vue | 22 +++++++-- src/stores/profile.js | 46 ++++++++++++++----- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index a2c8296f..7d94cc89 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -241,8 +241,19 @@ this.marcData[0].indicators = this.indicators let targetNameXML = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] + let oneXX = this.xmlDoc.querySelectorAll('[tag="' + this.tag +'"]')[0] this.xmlTarget = [targetTag, idx, targetNameXML.children[0].innerHTML] + let hasBcp = false + for (let child of targetNameXML.children){ + if (child.getAttribute('code') == '7' && child.innerHTML.includes('bcp47')){ + hasBcp = true + this.marcData[0]["hasBCP"] = true //child.innerHTML + } + } + + console.info("BCP? this.marcData: ", JSON.parse(JSON.stringify(this.marcData))) + // Get the 667s, do these need adjustment? let marc667List = this.xmlDoc.querySelectorAll('[tag="667"]') let target667 = false @@ -254,8 +265,8 @@ console.info("target667: ", target667) // get the $d for the 1XX, as long as there is no $t - let childFields = [].slice.call(targetNameXML.children).map(field => field.getAttribute('code')) - for (let child of targetNameXML.children){ + let childFields = [].slice.call(oneXX.children).map(field => field.getAttribute('code')) + for (let child of oneXX.children){ if (child.getAttribute('code') == 'd' && !childFields.includes('t')){ this.oneXXdollarD = child.innerHTML } @@ -302,7 +313,7 @@ let updates = this.marcData let target = this.xmlTarget - console.info("this.marcData: ", this.marcData) + console.info("this.marcData: ", JSON.parse(JSON.stringify(this.marcData))) this.updatedRecord = this.adjustAuthRecord(this.xmlDoc, this.marcData, this.xmlTarget) @@ -344,7 +355,8 @@ 'indicators': this.indicators, 'bcpSelection': this.marcData[this.activeIndex].bcpSelection, 'marcKey': this.marcData[this.activeIndex].marcKey, - 'displayName': this.marcData[this.activeIndex].displayName + 'displayName': this.marcData[this.activeIndex].displayName, + 'hasBCP': this.marcData[this.activeIndex].hasBCP, } let key = '' @@ -2241,6 +2253,7 @@ td { /* width: 45%; */ height: 100px; /* float: left; */ + overflow: scroll; } .new-data { @@ -2248,6 +2261,7 @@ td { /* margin-left: 5%; */ height: 200px; /* float: right; */ + overflow: scroll; } .record-data { diff --git a/src/stores/profile.js b/src/stores/profile.js index 9675bfaa..c49314c8 100644 --- a/src/stores/profile.js +++ b/src/stores/profile.js @@ -8840,17 +8840,21 @@ export const useProfileStore = defineStore('profile', { // for (let child of targetNameXML.children){ for (let child of targetNameXML.children){ let code = child.getAttribute("code") - existingCodes[code] = child + if (existingCodes[code]){ + existingCodes[code].push(child) + } else { + existingCodes[code] = [child] + } } /** * TODO: * - remove 667? under what conditions? $a >Non-Latin script references not evaluated.? - * - flag for preferred? */ for (let [idx, update] of updates.entries()){ + console.info("\t\tupdate: ", update) if (update.refEval){ console.info("UPDATE 008") let zeroZeroEight = record.querySelectorAll('[tag="008"]')[0] @@ -8874,6 +8878,14 @@ export const useProfileStore = defineStore('profile', { } }) + if (update.hasBCP){ + // delete existing $7 + for (let existing7 of existingCodes['7']){ + targetNameXML.removeChild(existing7) + } + delete existingCodes['7'] + } + console.info("deleteCodes: ", deleteCodes) if (idx == 0){ @@ -8882,17 +8894,26 @@ export const useProfileStore = defineStore('profile', { let subfield = key.split("_")[1] let value = update[key] + console.info("existingCodes: ", existingCodes) + // if we're looking at the first update - let target = existingCodes[subfield] - if (target){ // if the subfield is existing update it - target.innerHTML = value - console.info("\t\tsetting Value: ", value) - for (let code of deleteCodes){ - if (code){ - targetNameXML.removeChild(existingCodes[code]) - console.info("\t\tDeleting: ", code) - console.info("\t\t existingCodes[code]: ", existingCodes[code]) - console.info("\t\t targetNameXML: ", targetNameXML) + let targets = existingCodes[subfield] + + if (targets){ // if the subfield is existing update it + for (let target of targets){ + target.innerHTML = value + console.info("\t\tsetting Value: ", value) + for (let code of deleteCodes){ + if (code){ + for (let element of existingCodes[code]){ + console.info("\t\tDeleting: ", code) + console.info("\t\t element: ", element) + console.info("\t\t targetNameXML: ", targetNameXML) + if (targetNameXML.contains(element)){ + targetNameXML.removeChild(element) + } + } + } } } }else { // otherwise, create it @@ -8903,6 +8924,7 @@ export const useProfileStore = defineStore('profile', { // targetNameXML.appendChild(newSubField) this.indentedAppend(targetNameXML, newSubField) } else { + console.info("working on BCPs") for (let bcp of value){ let newSubField = document.createElementNS('http://www.loc.gov/MARC21/slim', 'marcxml:subfield'); newSubField.setAttribute("code", subfield) From 05b203ac2a9af58fa0d00d64d3025b1823c03a09 Mon Sep 17 00:00:00 2001 From: fo Date: Tue, 23 Jun 2026 18:37:25 +0000 Subject: [PATCH 21/94] Update layout All variantes loaded at once --- .../panels/edit/modals/ComplexLookupModal.vue | 187 +++++++++++------- 1 file changed, 117 insertions(+), 70 deletions(-) diff --git a/src/components/panels/edit/modals/ComplexLookupModal.vue b/src/components/panels/edit/modals/ComplexLookupModal.vue index 7d94cc89..fec2d075 100644 --- a/src/components/panels/edit/modals/ComplexLookupModal.vue +++ b/src/components/panels/edit/modals/ComplexLookupModal.vue @@ -108,7 +108,7 @@ showEdit4xxPanel: false, associatedLang: null, bcpCodes: {}, - marcData: [{}], + marcData: {}, activeIndex: 0, xmlTarget: [], refEval: false, @@ -186,6 +186,10 @@ this.activeComplexSearch = [] this.doSearch() }, + + activeIndex: async function(){ + await this.getBcpSuggestions() + } }, methods: { @@ -198,7 +202,7 @@ this.showEdit4xxPanel = false this.associatedLang = null this.bcpCodes = {} - this.marcData = [{}] + this.marcData = {} this.activeIndex = 0 this.xmlTarget = [] this.refEval = false @@ -209,8 +213,10 @@ }, // initial 4XX - edit4XX: async function(data, idx){ + edit4XX: async function(data){ this.resetBcp() + console.info("data: ", data) + // Get MarcKey for 1XX let marcKey = data.extra.marcKeys[0] this.tag = marcKey.slice(0,3) @@ -230,6 +236,15 @@ this.originalMarc = this.xmlDoc.cloneNode(true) this.associatedLang = this.xmlDoc.querySelectorAll('[tag="377"]') + // get the $d for the 1XX, as long as there is no $t + let oneXX = this.xmlDoc.querySelectorAll('[tag="' + this.tag +'"]')[0] + let childFields = [].slice.call(oneXX.children).map(field => field.getAttribute('code')) + for (let child of oneXX.children){ + if (child.getAttribute('code') == 'd' && !childFields.includes('t')){ + this.oneXXdollarD = child.innerHTML + } + } + if (this.associatedLang.length == 1){ this.associatedLang = this.associatedLang[0].textContent.trim() } @@ -237,22 +252,46 @@ let targetTag = "4" + this.tag.slice(1,3) this.tag = targetTag - this.marcData[0].tag = targetTag - this.marcData[0].indicators = this.indicators - let targetNameXML = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[idx] - let oneXX = this.xmlDoc.querySelectorAll('[tag="' + this.tag +'"]')[0] - this.xmlTarget = [targetTag, idx, targetNameXML.children[0].innerHTML] + for (let varIdx in variants){ + let variant = variants[varIdx] + if (!this.isLatin(variant)){ + let localMarc = {} + // if (!localMarc) { this.marcData[varIdx] = {}} + localMarc.tag = targetTag + localMarc.indicators = this.indicators + localMarc.bcpSelection = [] + + let targetNameXML = this.xmlDoc.querySelectorAll('[tag="' + targetTag +'"]')[varIdx] + this.xmlTarget = [targetTag, varIdx, targetNameXML.children[0].innerHTML] + + let hasBcp = false + for (let child of targetNameXML.children){ + if (child.getAttribute('code') == '7' && child.innerHTML.includes('bcp47')){ + hasBcp = true + localMarc["hasBCP"] = true //child.innerHTML + } + } + + for (let sub of targetNameXML.children){ + let subfield = sub.getAttribute("code") + let value = sub.innerHTML + localMarc["subfield_" + subfield] = value + } - let hasBcp = false - for (let child of targetNameXML.children){ - if (child.getAttribute('code') == '7' && child.innerHTML.includes('bcp47')){ - hasBcp = true - this.marcData[0]["hasBCP"] = true //child.innerHTML + localMarc.displayName = '' + for (let sf of Object.keys(localMarc)){ + if (sf.startsWith('subfield_')){ + localMarc.displayName = localMarc.displayName + "$" + sf.split("_")[1] + localMarc[sf] + } + } + localMarc.idx = varIdx + this.marcData[varIdx] = localMarc + this.activeIndex = varIdx + this.buildNewMarcKey() } } - console.info("BCP? this.marcData: ", JSON.parse(JSON.stringify(this.marcData))) // Get the 667s, do these need adjustment? let marc667List = this.xmlDoc.querySelectorAll('[tag="667"]') @@ -262,37 +301,6 @@ target667 = sixSixSeven } } - console.info("target667: ", target667) - - // get the $d for the 1XX, as long as there is no $t - let childFields = [].slice.call(oneXX.children).map(field => field.getAttribute('code')) - for (let child of oneXX.children){ - if (child.getAttribute('code') == 'd' && !childFields.includes('t')){ - this.oneXXdollarD = child.innerHTML - } - } - - for (let sub of targetNameXML.children){ - let subfield = sub.getAttribute("code") - let value = sub.innerHTML - this.marcData[0]["subfield_" + subfield] = value - } - - // BCP suggestions - this.bcpCodes = await utilsNetwork.fetchBCP47Codes(this.marcData[0]["subfield_a"], this.associatedLang) - this.marcData[this.activeIndex].bcpSelection = [0] - for (let c of this.marcData[this.activeIndex].bcpSelection){ - this.marcData[0]['subfield_7'] = "(bcp47)" + this.bcpCodes[c].bcp47code - } - - this.marcData[0].displayName = '' - for (let sf of Object.keys(this.marcData[0])){ - if (sf.startsWith('subfield_')){ - this.marcData[0].displayName = this.marcData[0].displayName + "$" + sf.split("_")[1] + this.marcData[0][sf] - } - } - - this.buildNewMarcKey() // swap out left panel for form this.showEdit4xxPanel = true @@ -303,6 +311,7 @@ this.showEdit4xxPanel = false }, submitEdit: async function(){ + return if (this.marcData.some(d => {return d.bcpSelection.length == 0})){ alert("A name is missing a language Selection. Add one before continuing.") return @@ -337,12 +346,20 @@ console.info("comparison: ", comparison) }, + getBcpSuggestions: async function(){ + this.bcpCodes = await utilsNetwork.fetchBCP47Codes(this.marcData[this.activeIndex]["subfield_a"], this.associatedLang) + if (!this.marcData[this.activeIndex].bcpSelection){ + this.marcData[this.activeIndex].bcpSelection = [] + } + }, + addBcpCode: function(idx){ - // activeIndex + console.info("add BCP to ", this.marcData[this.activeIndex], "--", this.activeIndex) + console.info("\t", idx) if (!this.marcData[this.activeIndex].bcpSelection){ this.marcData[this.activeIndex].bcpSelection = [] } - if (this.marcData[this.activeIndex].bcpSelection.includes(idx)){ // remove it + if (this.marcData[this.activeIndex].bcpSelection && this.marcData[this.activeIndex].bcpSelection.includes(idx)){ // remove it this.marcData[this.activeIndex].bcpSelection = this.marcData[this.activeIndex].bcpSelection.filter(item => item != idx) } else { this.marcData[this.activeIndex].bcpSelection.push(idx) @@ -350,7 +367,9 @@ }, buildNewMarcKey: function(){ - this.marcData[this.activeIndex] = { // reset to make deletions easier to handle + console.info("BUILD: ", this.marcData[this.activeIndex]) + // reset to make deletions easier to handle + this.marcData[this.activeIndex] = { 'tag': this.tag, 'indicators': this.indicators, 'bcpSelection': this.marcData[this.activeIndex].bcpSelection, @@ -359,6 +378,7 @@ 'hasBCP': this.marcData[this.activeIndex].hasBCP, } + let key = '' let marcKey = this.marcData[this.activeIndex].tag + this.marcData[this.activeIndex].indicators let userInput = this.marcData[this.activeIndex].displayName @@ -373,32 +393,55 @@ } for (let sub of subfields){ + console.info("sub: ", sub) let field = sub.slice(1,2) let value = sub.slice(2) this.marcData[this.activeIndex]["subfield_" + field] = value } - // this.marcData[this.activeIndex]['subfield_7'] = '' - this.marcData[this.activeIndex]['subfield_7'] = [] - for (let c of this.marcData[this.activeIndex].bcpSelection){ - //this.marcData[this.activeIndex]['subfield_7'] = this.marcData[this.activeIndex]['subfield_7'] + "(bcp47)" + this.bcpCodes[c].bcp47code - this.marcData[this.activeIndex]['subfield_7'].push("(bcp47)" + this.bcpCodes[c].bcp47code) + // this.marcData[this.activeIndex]['subfield_7'] = [] + // for (let c of this.marcData[this.activeIndex].bcpSelection){ + // this.marcData[this.activeIndex]['subfield_7'].push("(bcp47)" + this.bcpCodes[c].bcp47code) + // } + + + this.marcData[this.activeIndex]['subfield_7'] = '' + if (this.marcData[this.activeIndex].bcpSelection.length > 0){ + for (let c of this.marcData[this.activeIndex].bcpSelection){ + this.marcData[this.activeIndex]['subfield_7'] = this.marcData[this.activeIndex]['subfield_7'] + "$7(bcp47)" + this.bcpCodes[c].bcp47code + } } + // else if (this.marcData[this.activeIndex]['subfield_7'] != undefined) { + // console.info("else: ", this.marcData[this.activeIndex]) + // this.marcData[this.activeIndex]['subfield_7'] = "$7" + this.marcData[this.activeIndex]['subfield_7'] + // } + //$7test for (let sub of Object.keys(this.marcData[this.activeIndex])) { if (sub.startsWith("subfield_") && sub != "subfield_7"){ key = key + "$" + sub.split("_")[1] + this.marcData[this.activeIndex][sub] + } else if (sub == "subfield_7" && this.marcData[this.activeIndex][sub] != ""){ + key = key + this.marcData[this.activeIndex][sub] + + + // if (this.marcData[this.activeIndex][sub].length > 0){ + // for (let val of this.marcData[this.activeIndex][sub]){ + // key = key + "$" + sub.split("_")[1] + val + // } + // } else if (this.marcData[this.activeIndex].displayName.includes('$7')) { + // key = key + "$" + sub.split("_")[1] + // } } } - if (this.marcData[this.activeIndex]['subfield_7'].length > 1){ - marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'].join(" $7 ") - } else { - marcKey = marcKey + key + " $7 " + this.marcData[this.activeIndex]['subfield_7'] - } + // if (this.marcData[this.activeIndex]['subfield_7'].length > 1){ + // marcKey = marcKey + key + this.marcData[this.activeIndex]['subfield_7'].join(" $7 ") + // } else { + // marcKey = marcKey + key + " $7 " + this.marcData[this.activeIndex]['subfield_7'] + // } this.marcData[this.activeIndex]['displayName'] = key - this.marcData[this.activeIndex]['marcKey'] = marcKey + // this.marcData[this.activeIndex]['marcKey'] = marcKey + key console.info("this.marcData: ", this.marcData) }, @@ -418,8 +461,8 @@ ) }, - addDateFromOneXX: function(){ - this.marcData[this.activeIndex].displayName += ", $d" + this.oneXXdollarD + addDateFromOneXX: function(idx){ + this.marcData[idx].displayName += ", $d" + this.oneXXdollarD this.buildNewMarcKey() }, @@ -434,6 +477,7 @@ }, handleInput: function(event){ + console.info("handleInput: ", event.target.value) this.marcData[this.activeIndex].displayName = event.target.value this.buildNewMarcKey() }, @@ -1499,8 +1543,8 @@ - - + +
@@ -1514,7 +1558,7 @@ - + {{ code["bcp47code"] }} @@ -1530,8 +1574,8 @@
- New Value(s):

-
{{ row.marcKey }}
+