Cloud Library indexing updates

PTFS-Europe · Apr 29, 2024 · 4bdfe24 · 4bdfe24
1 parent e66dd74
commit 4bdfe24
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/code/cloud_library_export/cloud_library_export.jar b/code/cloud_library_export/cloud_library_export.jar
diff --git a/...brary_export/src/com/turning_leaf_technologies/cloud_library/CloudLibraryMarcHandler.java b/...brary_export/src/com/turning_leaf_technologies/cloud_library/CloudLibraryMarcHandler.java
@@ -223,30 +223,28 @@ private void processMarcRecord() {
 		checksumCalculator.reset();
 		String rawAvailabilityTypeResponse = null;
 		long availabilityTypeChecksum = 0;
-		if (availabilityType != null) {
-			rawAvailabilityTypeResponse = availabilityType.getRawResponse();
-			if (rawAvailabilityTypeResponse == null) {
-				rawAvailabilityTypeResponse = "";
-			}
-			checksumCalculator.update(rawAvailabilityTypeResponse.getBytes());
-			availabilityTypeChecksum = checksumCalculator.getValue();
-			try {
-				getExistingCloudLibraryAvailabilityStmt.setString(1, cloudLibraryId);
-				ResultSet getExistingAvailabilityRS = getExistingCloudLibraryAvailabilityStmt.executeQuery();
-				if (getExistingAvailabilityRS.next()) {
-					long existingTypeChecksum = getExistingAvailabilityRS.getLong("typeRawChecksum");
-					logger.debug("Availability type already exists");
-					if (existingTypeChecksum != availabilityTypeChecksum) {
-						logger.debug("Updating availability type details");
-						availabilityChanged = true;
-					}
-				} else {
-					logger.debug("Adding availability type for " + cloudLibraryId);
+		rawAvailabilityTypeResponse = availabilityType.getRawResponse();
+		if (rawAvailabilityTypeResponse == null) {
+			rawAvailabilityTypeResponse = "";
+		}
+		checksumCalculator.update(rawAvailabilityTypeResponse.getBytes());
+		availabilityTypeChecksum = checksumCalculator.getValue();
+		try {
+			getExistingCloudLibraryAvailabilityStmt.setString(1, cloudLibraryId);
+			ResultSet getExistingAvailabilityRS = getExistingCloudLibraryAvailabilityStmt.executeQuery();
+			if (getExistingAvailabilityRS.next()) {
+				long existingTypeChecksum = getExistingAvailabilityRS.getLong("typeRawChecksum");
+				logger.debug("Availability type already exists");
+				if (existingTypeChecksum != availabilityTypeChecksum) {
+					logger.debug("Updating availability type details");
 					availabilityChanged = true;
 				}
-			} catch (SQLException e) {
-				logEntry.incErrors("Error loading availability type", e);
+			} else {
+				logger.debug("Adding availability type for " + cloudLibraryId);
+				availabilityChanged = true;
 			}
+		} catch (SQLException e) {
+			logEntry.incErrors("Error loading availability type", e);
 		}
 
 
@@ -328,6 +326,9 @@ private void processMarcRecord() {
 							}
 						}
 					}
+					if (format.equals("eComic")) {
+						break;
+					}
 				}
 			}
 		}

diff --git a/code/reindexer/reindexer.jar b/code/reindexer/reindexer.jar
diff --git a/code/reindexer/src/org/aspen_discovery/reindexer/CloudLibraryProcessor.java b/code/reindexer/src/org/aspen_discovery/reindexer/CloudLibraryProcessor.java
@@ -143,7 +143,7 @@ public void processRecord(AbstractGroupedWorkSolr groupedWork, String identifier
 				//get target audience from Marc
 				targetAudience = productRS.getString("targetAudience");
 				if (targetAudience.equals("ADULT")) {
-					targetAudience.equals("Adult");
+					targetAudience = "Adult";
 				}
 				groupedWork.addTargetAudience(targetAudience);