Load all default formats prior to loading custom format map for an in…

…dexing profile to ensure default values are available when translating values
Aspen-Discovery · May 15, 2024 · 5ff365d · 5ff365d
1 parent 4ae3341
commit 5ff365d
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 11 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
@@ -347,16 +347,30 @@ private void loadTranslationMaps(Connection dbConn, BaseIndexingLogEntry logEntr
 					translationMap.put(value, translation);
 				}
 				mapValuesRS.close();
-				translationMaps.put(mapName, translationMap);
+				if (translationMaps.containsKey(mapName)) {
+					translationMaps.get(mapName).putAll(translationMap);
+				}else{
+					translationMaps.put(mapName, translationMap);
+				}
 			}
 			translationMapsRS.close();
 
 			PreparedStatement getFormatMapStmt = dbConn.prepareStatement("SELECT * from format_map_values WHERE indexingProfileId = ?");
 			getFormatMapStmt.setLong(1, id);
 			ResultSet formatMapRS = getFormatMapStmt.executeQuery();
 			HashMap <String, String> formatMap = new HashMap<>();
-			translationMaps.put("format", formatMap);
+			if (translationMaps.containsKey("format")) {
+				formatMap = translationMaps.get("format");
+			}else{
+				translationMaps.put("format", formatMap);
+			}
 			HashMap <String, String> formatCategoryMap = new HashMap<>();
+			if (translationMaps.containsKey("format_category")) {
+				formatCategoryMap = translationMaps.get("format_category");
+			}else{
+				translationMaps.put("format_category", formatCategoryMap);
+			}
+
 			translationMaps.put("format_category", formatCategoryMap);
 			while (formatMapRS.next()){
 				String format = formatMapRS.getString("value");
@@ -1061,15 +1075,6 @@ public SierraExportFieldMapping getSierraExportFieldMappings() {
 		return sierraExportFieldMappings;
 	}
 
-	public boolean hasTranslation(String mapName, String value) {
-		HashMap<String, String> translationMap = translationMaps.get(mapName);
-		if (translationMap != null){
-			return translationMap.containsKey(value.toLowerCase());
-		}else{
-			return false;
-		}
-	}
-
 	public String translateValue(String mapName, String value) {
 		value = value.toLowerCase();
 		HashMap<String, String> translationMap = translationMaps.get(mapName);

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/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
@@ -0,0 +1,10 @@
+## Aspen Discovery Updates
+### Axis 360 updates
+- Provide default format boost for Axis 360 comics. (*MDN*)
+
+### Indexing Updates
+- 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*)
+
+## 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
diff --git a/sites/default/translation_maps/format_boost_axis360_map.properties b/sites/default/translation_maps/format_boost_axis360_map.properties
@@ -3,3 +3,4 @@
 #
 eBook               = 10
 eAudiobook          = 8
+eComic              = 8