Merge pull request Aspen-Discovery#2076 from K-Alette/24.09.01

Indexing Woes
PTFS-Europe · Sep 27, 2024 · a82c7af · a82c7af
2 parents 676c3bb + 3260332
commit a82c7af
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 2 deletions.
diff --git a/code/axis_360_export/axis_360_export.jar b/code/axis_360_export/axis_360_export.jar
diff --git a/code/carlx_export/carlx_export.jar b/code/carlx_export/carlx_export.jar
diff --git a/code/cloud_library_export/cloud_library_export.jar b/code/cloud_library_export/cloud_library_export.jar
diff --git a/code/events_indexer/events_indexer.jar b/code/events_indexer/events_indexer.jar
diff --git a/code/evergreen_export/evergreen_export.jar b/code/evergreen_export/evergreen_export.jar
diff --git a/code/evolve_export/evolve_export.jar b/code/evolve_export/evolve_export.jar
diff --git a/code/hoopla_export/hoopla_export.jar b/code/hoopla_export/hoopla_export.jar
diff --git a/code/koha_export/koha_export.jar b/code/koha_export/koha_export.jar
diff --git a/code/oai_indexer/oai_indexer.jar b/code/oai_indexer/oai_indexer.jar
diff --git a/code/overdrive_extract/overdrive_extract.jar b/code/overdrive_extract/overdrive_extract.jar
diff --git a/.../palace_project_export/src/org/aspendiscovery/palace_project/PalaceProjectExportMain.java b/.../palace_project_export/src/org/aspendiscovery/palace_project/PalaceProjectExportMain.java
@@ -323,7 +323,7 @@ private static void removePalaceProjectTitleFromCollection(long availabilityId,
 				getGroupedWorkIndexer().processGroupedWork(result.permanentId);
 			} else if (result.deleteWork) {
 				//Delete the work from solr and the database
-				getGroupedWorkIndexer().deleteRecord(result.permanentId);
+				getGroupedWorkIndexer().deleteRecord(result.permanentId, result.groupedWorkId);
 			}
 		}
 	}
@@ -818,7 +818,7 @@ private static void processRecordsToReload(PalaceProjectExportLogEntry logEntry)
 						getGroupedWorkIndexer().processGroupedWork(result.permanentId);
 					} else if (result.deleteWork) {
 						//Delete the work from solr and the database
-						getGroupedWorkIndexer().deleteRecord(result.permanentId);
+						getGroupedWorkIndexer().deleteRecord(result.permanentId, result.groupedWorkId);
 					}
 					markRecordToReloadAsProcessedStmt.setLong(1, recordToReloadId);
 					markRecordToReloadAsProcessedStmt.executeUpdate();

diff --git a/code/polaris_export/polaris_export.jar b/code/polaris_export/polaris_export.jar
diff --git a/code/reindexer/reindexer.jar b/code/reindexer/reindexer.jar
diff --git a/code/reindexer/src/org/aspen_discovery/grouping/RecordGroupingProcessor.java b/code/reindexer/src/org/aspen_discovery/grouping/RecordGroupingProcessor.java
@@ -850,6 +850,9 @@ public String groupAxis360Record(JSONObject itemDetails, String axis360Id, Strin
 		String title = getAxis360FieldValue(itemDetails, "title");
 		String formatType = itemDetails.getString("formatType");
 		String language = getAxis360FieldValue(itemDetails, "language");
+		if (language.length() > 3) {
+			language = translateValue("language_to_three_letter_code", language);
+		}
 
 		RecordIdentifier primaryIdentifier = new RecordIdentifier("axis360", axis360Id);
 

diff --git a/code/sideload_processing/sideload_processing.jar b/code/sideload_processing/sideload_processing.jar
diff --git a/code/sierra_export_api/sierra_export_api.jar b/code/sierra_export_api/sierra_export_api.jar
diff --git a/code/symphony_export/symphony_export.jar b/code/symphony_export/symphony_export.jar
diff --git a/code/user_list_indexer/user_list_indexer.jar b/code/user_list_indexer/user_list_indexer.jar
diff --git a/code/web/release_notes/24.09.01.MD b/code/web/release_notes/24.09.01.MD
@@ -5,6 +5,10 @@
 ### Self Check Tester
 - Add additional checking if for blank values from getActiveLocation in addition to null values and add additional debugging to self check tester. (*MDN*)
 
+### Indexing updates
+- Use language codes for Boundless titles instead of the full language when building Grouped Work permanent_id (*KL*)
+- Fix issue where method deleteRecord() is not found in the Palace Project Export, causing it to stall (*KL*)
+
 ### Other updates
 - Disabled the 'Show This Branch In Available At and Owning Location Facets' filter and setting as it is interacting poorly with facet labels. (*CZ*)
 - Increased the length for debuginfo column in the grouped_work_debug_info table (Ticket 138696) (*KL*)

diff --git a/code/web_indexer/web_indexer.jar b/code/web_indexer/web_indexer.jar