Merge pull request Aspen-Discovery#1817 from K-Alette/24.06.00

Target Audience & Manga vs Manga Graphic Novels
PTFS-Europe · May 23, 2024 · 3f33929 · 3f33929
2 parents d607ace + e8e131f
commit 3f33929
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/...ava_shared_libraries/src/com/turning_leaf_technologies/indexing/BaseIndexingSettings.java b/...ava_shared_libraries/src/com/turning_leaf_technologies/indexing/BaseIndexingSettings.java
@@ -163,17 +163,17 @@ private void loadSystemTranslationMaps(String serverName, BaseIndexingLogEntry l
 			for (File curFile : defaultTranslationMapFiles) {
 				String mapName = curFile.getName().replace(".properties", "");
 				mapName = mapName.replace("_map", "");
-				if (mapName.startsWith("format")) {
+				/*if (mapName.startsWith("format")) {*/
 					translationMaps.put(mapName, loadSystemTranslationMap(curFile, logEntry));
-				}
+				/*}*/
 			}
 			if (serverTranslationMapFiles != null) {
 				for (File curFile : serverTranslationMapFiles) {
 					String mapName = curFile.getName().replace(".properties", "");
 					mapName = mapName.replace("_map", "");
-					if (mapName.startsWith("format")) {
+					/*if (mapName.startsWith("format")) {*/
 						translationMaps.put(mapName, loadSystemTranslationMap(curFile, logEntry));
-					}
+					/*}*/
 				}
 			}
 		}
@@ -263,7 +263,7 @@ String translateValue(String mapName, String value, String identifier, BaseIndex
 		return translatedValue;
 	}
 
-	LinkedHashSet<String> translateCollection(String mapName, Set<String> values, String identifier, BaseIndexingLogEntry logEntry, Logger logger, boolean logUnableToTranslateWarnings) {
+	public LinkedHashSet<String> translateCollection(String mapName, Set<String> values, String identifier, BaseIndexingLogEntry logEntry, Logger logger, boolean logUnableToTranslateWarnings) {
 		LinkedHashSet<String> translatedCollection = new LinkedHashSet<>();
 		for (String value : values){
 			String translatedValue = translateValue(mapName, value, identifier, logEntry, logger, logUnableToTranslateWarnings);

diff --git a/code/reindexer/src/org/aspen_discovery/format_classification/MarcRecordFormatClassifier.java b/code/reindexer/src/org/aspen_discovery/format_classification/MarcRecordFormatClassifier.java
@@ -332,7 +332,7 @@ public void getFormatFromSubjects(org.marc4j.marc.Record record, Set<String> res
 							result.add("BoardBook");
 						}else if (subfieldData.contains("pop-up")) {
 							result.add("Pop-UpBook");
-						}else if (subfieldData.startsWith("manga graphic novel")) {
+						}else if (subfieldData.startsWith("manga graphic novel") || subfieldData.equals("manga")) {
 							result.add("Manga");
 						}else if (subfieldData.contains("graphic novel")) {
 							boolean okToAdd = false;

diff --git a/code/reindexer/src/org/aspen_discovery/reindexer/MarcRecordProcessor.java b/code/reindexer/src/org/aspen_discovery/reindexer/MarcRecordProcessor.java
@@ -653,13 +653,13 @@ protected void loadTargetAudiences(AbstractGroupedWorkSolr groupedWork, org.marc
 			targetAudiences.add(unknownAudienceLabel);
 		}
 
-		LinkedHashSet<String> translatedAudiences = indexer.translateSystemCollection("target_audience", targetAudiences, identifier);
+		LinkedHashSet<String> translatedAudiences = settings.translateCollection("target_audience", targetAudiences, identifier, indexer.getLogEntry(), logger, true);
 		if (!unknownAudienceLabel.equals("Unknown") && translatedAudiences.contains("Unknown")){
 			translatedAudiences.remove("Unknown");
 			translatedAudiences.add(unknownAudienceLabel);
 		}
 		groupedWork.addTargetAudiences(translatedAudiences);
-		LinkedHashSet<String> translatedAudiencesFull = indexer.translateSystemCollection("target_audience_full", targetAudiences, identifier);
+		LinkedHashSet<String> translatedAudiencesFull = settings.translateCollection("target_audience_full", targetAudiences, identifier, indexer.getLogEntry(), logger, true);
 		if (!unknownAudienceLabel.equals("Unknown") && translatedAudiencesFull.contains("Unknown")){
 			translatedAudiencesFull.remove("Unknown");
 			translatedAudiencesFull.add(unknownAudienceLabel);

diff --git a/code/web/release_notes/24.06.00.MD b/code/web/release_notes/24.06.00.MD
@@ -68,6 +68,9 @@
 ### Searching Updates
 - Fixed issue where multiselect facets were not allowing multiple values to be selected when searching (Tickets 131841, 131923) (*KL, MDN*)
 
+### Indexing Updates
+- Add format match on 655a where if it equals "manga" the format "Manga" will be added (*KL*)
+- Fixed issue where target audiences were not being mapped with the correct translation map values (Ticket 131935) (*KL*)
 
 //other