diff --git a/code/cloud_library_export/cloud_library_export.jar b/code/cloud_library_export/cloud_library_export.jar index 42aae40291..5176835657 100644 Binary files a/code/cloud_library_export/cloud_library_export.jar and b/code/cloud_library_export/cloud_library_export.jar differ diff --git a/code/cloud_library_export/src/com/turning_leaf_technologies/cloud_library/CloudLibraryMarcHandler.java b/code/cloud_library_export/src/com/turning_leaf_technologies/cloud_library/CloudLibraryMarcHandler.java index cb82d8c523..b113a6b300 100644 --- a/code/cloud_library_export/src/com/turning_leaf_technologies/cloud_library/CloudLibraryMarcHandler.java +++ b/code/cloud_library_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 index 2bf7a61ef5..9f9617a2ef 100644 Binary files a/code/reindexer/reindexer.jar and b/code/reindexer/reindexer.jar differ diff --git a/code/reindexer/src/org/aspen_discovery/reindexer/CloudLibraryProcessor.java b/code/reindexer/src/org/aspen_discovery/reindexer/CloudLibraryProcessor.java index aa1e604d07..583d5e9de4 100644 --- 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);