Skip to content

BXC-5560 remove -z from collection ID for matching purposes #145

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
sharonluong merged 1 commit into from
Jan 21, 2026
Merged

BXC-5560 remove -z from collection ID for matching purposes #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/main/java/edu/unc/lib/boxc/migration/cdm/services/AspaceRefIdService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,12 @@ private Map<String,String> getIdsAndHookIds() {
while (rs.next()) {
// if dmrecord, descri, and contri fields are not blank,
// add dmrecord and descri_contri (hook id when combined) to map
if (!rs.getString(1).isBlank() && !rs.getString(2).isBlank() && !rs.getString(3).isBlank()) {
idsAndHookIds.put(rs.getString(1), rs.getString(2) + "_" + rs.getString(3));
var dmrecord = rs.getString(1);
var descri = rs.getString(2);
var contri = rs.getString(3);
if (!dmrecord.isBlank() && !descri.isBlank() && !contri.isBlank()) {
// remove -v from descri for matching purposes
idsAndHookIds.put(dmrecord, descri.replace("-z", "") + "_" + contri);
}
}
return idsAndHookIds;
Expand Down
23 changes: 23 additions & 0 deletions src/test/java/edu/unc/lib/boxc/migration/cdm/services/AspaceRefIdServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,29 @@ public void generateFromHookIdRefIdCsvNoRefIdTest() throws Exception {
}
}

@Test
public void generateFromHookIdRefIdCsvWithZTest() throws Exception {
// export collection with -z at the end of the collection ID
testHelper.indexExportData(Paths.get("src/test/resources/findingaid_fields.csv"), "03883-z");
service.setHookIdRefIdMapPath(Paths.get("src/test/resources/hookid_to_refid_map.csv"));
service.generateAspaceRefIdMappingFromHookIdRefIdCsv();

assertTrue(Files.exists(project.getAspaceRefIdMappingPath()));
try (CSVParser csvParser = parser()) {
List<CSVRecord> rows = csvParser.getRecords();
assertEquals("0", rows.get(0).get(AspaceRefIdInfo.RECORD_ID_FIELD));
assertEquals("03883_folder_5", rows.get(0).get(AspaceRefIdInfo.HOOK_ID_FIELD));
assertEquals("8578708eda77e378b3a844a2166b815b", rows.get(0).get(AspaceRefIdInfo.REF_ID_FIELD));
assertEquals("548", rows.get(1).get(AspaceRefIdInfo.RECORD_ID_FIELD));
assertEquals("03883_folder_9", rows.get(1).get(AspaceRefIdInfo.HOOK_ID_FIELD));
assertEquals("4c1196b46a06b21b1184fba0de1e84bd", rows.get(1).get(AspaceRefIdInfo.REF_ID_FIELD));
assertEquals("549", rows.get(2).get(AspaceRefIdInfo.RECORD_ID_FIELD));
assertEquals("03883_folder_9", rows.get(2).get(AspaceRefIdInfo.HOOK_ID_FIELD));
assertEquals("4c1196b46a06b21b1184fba0de1e84bd", rows.get(2).get(AspaceRefIdInfo.REF_ID_FIELD));
assertEquals(3, rows.size());
}
}

@Test
public void generateFromHookIdRefIdCsvNoContriDescriTest() throws Exception {
testHelper.indexExportData(Paths.get("src/test/resources/monograph_fields.csv"), "monograph");
Expand Down
225 changes: 225 additions & 0 deletions src/test/resources/descriptions/03883-z/index/description/desc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
<collec>Roy M. Brown Papers, 1924-1956</collec>
<descri>03883-z</descri>
<findin>http://finding-aids.lib.unc.edu/03883/</findin>
<locati>Roy M. Brown Papers, 1924-1956 and undated.</locati>
<title>Folder 5: 1950-1956: Scan 25</title>
<prefer>[Identification of item], in the Roy M. Brown Papers, #3883, Southern Historical Collection, The Wilson Library, University of North Carolina at Chapel Hill.</prefer>
<creato>folder</creato>
<contri>folder_5</contri>
<relatid>03883_0005_0025.tif</relatid>
<file>03883_0005_0025.tif</file>
<titlea></titlea>
<altern></altern>
<creata></creata>
<contra></contra>
<creati></creati>
<date></date>
<descra></descra>
<subjec></subjec>
<subjea></subjea>
<subjeb></subjeb>
<subjed></subjed>
<subjee></subjee>
<coordi></coordi>
<geonam></geonam>
<digita></digita>
<reposi></reposi>
<host></host>
<usage>For copyright information or permissions questions, see our intellectual property statement http://www.lib.unc.edu/wilson/shc/dshc/ipstatement.html</usage>
<copyri></copyri>
<additi></additi>
<transc></transc>
<captio></captio>
<notes></notes>
<titleb></titleb>
<contrb></contrb>
<sponso></sponso>
<relate></relate>
<author></author>
<publis></publis>
<place></place>
<catalo></catalo>
<is></is>
<has></has>
<form></form>
<resour></resour>
<medium></medium>
<condit></condit>
<langub></langub>
<physic></physic>
<creatb></creatb>
<stylep></stylep>
<volume></volume>
<scale></scale>
<projec></projec>
<map></map>
<mapa></mapa>
<curren></curren>
<path></path>
<local></local>
<creatc></creatc>
<search></search>
<pagina></pagina>
<sort></sort>
<stream></stream>
<duracl></duracl>
<fullrs>Volume1/03883_0005_0025.tif</fullrs>
<find>231.jp2</find>
<dmaccess></dmaccess>
<dmimage></dmimage>
<dmad1></dmad1>
<dmad2></dmad2>
<dmoclcno></dmoclcno>
<dmcreated>2012-02-03</dmcreated>
<dmmodified>2012-02-03</dmmodified>
<dmrecord>0</dmrecord>
<collec>Roy M. Brown Papers, 1924-1956</collec>
<descri>03883-z</descri>
<findin>http://finding-aids.lib.unc.edu/03883/</findin>
<locati>Roy M. Brown Papers, 1924-1956 and undated.</locati>
<title>Folder 9: Reports and writings on social work: Scan 51</title>
<prefer>[Identification of item], in the Roy M. Brown Papers, #3883, Southern Historical Collection, The Wilson Library, University of North Carolina at Chapel Hill.</prefer>
<creato>folder</creato>
<contri>folder_9</contri>
<relatid>03883_0009_0051.tif</relatid>
<file>03883_0009_0051.tif</file>
<titlea></titlea>
<altern></altern>
<creata></creata>
<contra></contra>
<creati></creati>
<date></date>
<descra></descra>
<subjec></subjec>
<subjea></subjea>
<subjeb></subjeb>
<subjed></subjed>
<subjee></subjee>
<coordi></coordi>
<geonam></geonam>
<digita></digita>
<reposi></reposi>
<host></host>
<usage>For copyright information or permissions questions, see our intellectual property statement http://www.lib.unc.edu/wilson/shc/dshc/ipstatement.html</usage>
<copyri></copyri>
<additi></additi>
<transc></transc>
<captio></captio>
<notes></notes>
<titleb></titleb>
<contrb></contrb>
<sponso></sponso>
<relate></relate>
<author></author>
<publis></publis>
<place></place>
<catalo></catalo>
<is></is>
<has></has>
<form></form>
<resour></resour>
<medium></medium>
<condit></condit>
<langub></langub>
<physic></physic>
<creatb></creatb>
<stylep></stylep>
<volume></volume>
<scale></scale>
<projec></projec>
<map></map>
<mapa></mapa>
<curren></curren>
<path></path>
<local></local>
<creatc></creatc>
<search></search>
<pagina></pagina>
<sort></sort>
<stream></stream>
<duracl></duracl>
<fullrs>Volume1/03883_0009_0051.tif</fullrs>
<find>711.jp2</find>
<dmaccess></dmaccess>
<dmimage></dmimage>
<dmad1></dmad1>
<dmad2></dmad2>
<dmoclcno></dmoclcno>
<dmcreated>2012-03-03</dmcreated>
<dmmodified>2012-03-03</dmmodified>
<dmrecord>548</dmrecord>
<collec>Roy M. Brown Papers, 1924-1956</collec>
<descri>03883-z</descri>
<findin>http://finding-aids.lib.unc.edu/03883/</findin>
<locati>Roy M. Brown Papers, 1924-1956 and undated.</locati>
<title>Folder 9: Reports and writings on social work: Scan 51</title>
<prefer>[Identification of item], in the Roy M. Brown Papers, #3883, Southern Historical Collection, The Wilson Library, University of North Carolina at Chapel Hill.</prefer>
<creato>folder</creato>
<contri>folder_9</contri>
<relatid>03883_0009_0051.tif</relatid>
<file>03883_0009_0051.tif</file>
<titlea></titlea>
<altern></altern>
<creata></creata>
<contra></contra>
<creati></creati>
<date></date>
<descra></descra>
<subjec></subjec>
<subjea></subjea>
<subjeb></subjeb>
<subjed></subjed>
<subjee></subjee>
<coordi></coordi>
<geonam></geonam>
<digita></digita>
<reposi></reposi>
<host></host>
<usage>For copyright information or permissions questions, see our intellectual property statement http://www.lib.unc.edu/wilson/shc/dshc/ipstatement.html</usage>
<copyri></copyri>
<additi></additi>
<transc></transc>
<captio></captio>
<notes></notes>
<titleb></titleb>
<contrb></contrb>
<sponso></sponso>
<relate></relate>
<author></author>
<publis></publis>
<place></place>
<catalo></catalo>
<is></is>
<has></has>
<form></form>
<resour></resour>
<medium></medium>
<condit></condit>
<langub></langub>
<physic></physic>
<creatb></creatb>
<stylep></stylep>
<volume></volume>
<scale></scale>
<projec></projec>
<map></map>
<mapa></mapa>
<curren></curren>
<path></path>
<local></local>
<creatc></creatc>
<search></search>
<pagina></pagina>
<sort></sort>
<stream></stream>
<duracl></duracl>
<fullrs>Volume1/03883_0009_0051.tif</fullrs>
<find>711.jp2</find>
<dmaccess></dmaccess>
<dmimage></dmimage>
<dmad1></dmad1>
<dmad2></dmad2>
<dmoclcno></dmoclcno>
<dmcreated>2012-04-03</dmcreated>
<dmmodified>2012-04-03</dmmodified>
<dmrecord>549</dmrecord>