Allow determination of format to take into account both Collection Co…

…de and the translated Collection
Aspen-Discovery · May 15, 2024 · 4f7efec · 4f7efec
1 parent 6b2ec93
commit 4f7efec
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 6 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/course_reserves_indexer/course_reserves_indexer.jar b/code/course_reserves_indexer/course_reserves_indexer.jar
diff --git a/code/cron/cron.jar b/code/cron/cron.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/java_shared_libraries/src/com/turning_leaf_technologies/indexing/IndexingProfile.java b/code/java_shared_libraries/src/com/turning_leaf_technologies/indexing/IndexingProfile.java
@@ -344,7 +344,7 @@ private void loadTranslationMaps(Connection dbConn, BaseIndexingLogEntry logEntr
 					String value = mapValuesRS.getString("value");
 					String translation = mapValuesRS.getString("translation");
 
-					translationMap.put(value, translation);
+					translationMap.put(value.toLowerCase(), translation);
 				}
 				mapValuesRS.close();
 				if (translationMaps.containsKey(mapName)) {
@@ -370,12 +370,20 @@ private void loadTranslationMaps(Connection dbConn, BaseIndexingLogEntry logEntr
 			}else{
 				translationMaps.put("format_category", formatCategoryMap);
 			}
+			HashMap <String, String> formatBoostMap = new HashMap<>();
+			if (translationMaps.containsKey("format_boost")) {
+				formatBoostMap = translationMaps.get("format_boost");
+			}else{
+				translationMaps.put("format_boost", formatBoostMap);
+			}
 
 			translationMaps.put("format_category", formatCategoryMap);
 			while (formatMapRS.next()){
 				String format = formatMapRS.getString("value");
-				formatMap.put(format.toLowerCase(), formatMapRS.getString("format"));
-				formatCategoryMap.put(format.toLowerCase(), formatMapRS.getString("formatCategory"));
+				String formatLower = format.toLowerCase();
+				formatMap.put(formatLower, formatMapRS.getString("format"));
+				formatCategoryMap.put(formatLower, formatMapRS.getString("formatCategory"));
+				formatBoostMap.put(formatLower, formatMapRS.getString("formatBoost"));
 			}
 			formatMapRS.close();
 		}catch (Exception e){

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/code/palace_project_export/palace_project_export.jar b/code/palace_project_export/palace_project_export.jar
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/format_classification/KohaRecordFormatClassifier.java b/code/reindexer/src/org/aspen_discovery/format_classification/KohaRecordFormatClassifier.java
@@ -60,15 +60,31 @@ public FormatInfo getFormatInfoForItem(DataField itemField, BaseIndexingSettings
 		if (!foundFormatFromShelfLocation && !foundFormatFromSublocation && collectionCode != null) {
 			collectionCode = collectionCode.toLowerCase().trim();
 			if (profile.hasTranslation("format", collectionCode)) {
-				String translatedLocation = profile.translateValue("format", collectionCode);
-				if (translatedLocation != null && !translatedLocation.isEmpty()) {
+				String translatedFormat = profile.translateValue("format", collectionCode);
+				if (translatedFormat != null && !translatedFormat.isEmpty()) {
 					foundFormatFromCollection = true;
-					formatInfo.format = translatedLocation;
+					formatInfo.format = translatedFormat;
 					formatInfo.formatCategory = profile.translateValue("format_category", collectionCode);
 					if (profile.hasTranslation("format_boost", collectionCode)) {
 						formatBoost = profile.translateValue("format_boost", collectionCode);
 					}
 				}
+			}else{
+				//Check to see if the translated collection code is used
+				if (profile.hasTranslation("collection", collectionCode)) {
+					String translatedCollection = profile.translateValue("collection", collectionCode);
+					if (profile.hasTranslation("format", translatedCollection)) {
+						String translatedFormat = profile.translateValue("format", translatedCollection);
+						if (translatedFormat != null && !translatedFormat.isEmpty()) {
+							foundFormatFromCollection = true;
+							formatInfo.format = translatedFormat;
+							formatInfo.formatCategory = profile.translateValue("format_category", translatedCollection);
+							if (profile.hasTranslation("format_boost", translatedCollection)) {
+								formatBoost = profile.translateValue("format_boost", translatedCollection);
+							}
+						}
+					}
+				}
 			}
 		}
 

diff --git a/code/reindexer/src/org/aspen_discovery/grouping/GroupedWork.java b/code/reindexer/src/org/aspen_discovery/grouping/GroupedWork.java
@@ -340,6 +340,7 @@ public void setGroupingCategory(String groupingCategory) {
 		groupingCategory = groupingCategory.toLowerCase();
 		if (!validCategories.matcher(groupingCategory).matches()) {
 			logEntry.incErrors("Invalid grouping category " + groupingCategory);
+			this.groupingCategory = "other";
 		}else {
 			this.groupingCategory = groupingCategory;
 		}

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.05.01.MD b/code/web/release_notes/24.05.01.MD
@@ -6,6 +6,9 @@
 - Load all default formats prior to loading custom format map for an indexing profile to ensure default values are available when translating values. (Ticket 132034) (*MDN*)
 - Add Manga to default format maps. (*MDN*)
 
+### Koha Updates
+- Allow determination of format to take into account both Collection Code and the translated Collection. (Tickets 132079, 130358) (*MDN*)
+
 ## This release includes code contributions from
 - ByWater Solutions
   - Mark Noble (MDN)
diff --git a/code/web_indexer/web_indexer.jar b/code/web_indexer/web_indexer.jar