Merge pull request Aspen-Discovery#1774 from K-Alette/24.05.00

Axis360 Availability
PTFS-Europe · Apr 23, 2024 · e4ab968 · e4ab968
2 parents c09c70a + a3bee1a
commit e4ab968
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/code/reindexer/src/org/aspen_discovery/reindexer/Axis360Processor.java b/code/reindexer/src/org/aspen_discovery/reindexer/Axis360Processor.java
@@ -130,22 +130,22 @@ void processRecord(AbstractGroupedWorkSolr groupedWork, String identifier, BaseI
 				String isbn = getFieldValue(rawResponse, "isbn");
 				groupedWork.addIsbn(isbn, primaryFormat);
 
-				ItemInfo itemInfo = new ItemInfo();
-				itemInfo.seteContentSource("Boundless");
-				itemInfo.setIsEContent(true);
-				itemInfo.setShelfLocation("Online Boundless Collection");
-				itemInfo.setDetailedLocation("Online Boundless Collection");
-				itemInfo.setCallNumber("Online Boundless");
-				itemInfo.setSortableCallNumber("Online Boundless");
-				itemInfo.setFormat(primaryFormat);
-				itemInfo.setFormatCategory(formatCategory);
-
-				Date dateAdded = new Date(productRS.getLong("dateFirstDetected") * 1000);
-				itemInfo.setDateAdded(dateAdded);
-
 				getAvailabilityStmt.setLong(1, aspenId);
 				ResultSet availabilityRS = getAvailabilityStmt.executeQuery();
 				while (availabilityRS.next()) {
+					ItemInfo itemInfo = new ItemInfo();
+					itemInfo.seteContentSource("Boundless");
+					itemInfo.setIsEContent(true);
+					itemInfo.setShelfLocation("Online Boundless Collection");
+					itemInfo.setDetailedLocation("Online Boundless Collection");
+					itemInfo.setCallNumber("Online Boundless");
+					itemInfo.setSortableCallNumber("Online Boundless");
+					itemInfo.setFormat(primaryFormat);
+					itemInfo.setFormatCategory(formatCategory);
+
+					Date dateAdded = new Date(productRS.getLong("dateFirstDetected") * 1000);
+					itemInfo.setDateAdded(dateAdded);
+
 					boolean available = availabilityRS.getBoolean("available");
 					int ownedQty = availabilityRS.getInt("ownedQty");
 					itemInfo.setNumCopies(ownedQty);
@@ -193,10 +193,9 @@ void processRecord(AbstractGroupedWorkSolr groupedWork, String identifier, BaseI
 							scopingInfo.setLocallyOwned(true);
 						}
 					}
+					axis360Record.addItem(itemInfo);
 				}
 				availabilityRS.close();
-				axis360Record.addItem(itemInfo);
-
 			}
 			productRS.close();
 		} catch (NullPointerException e) {

diff --git a/code/web/release_notes/24.05.00.MD b/code/web/release_notes/24.05.00.MD
@@ -80,9 +80,12 @@
 ### Events
 - Added new events integration with Assabet Interactive (*KL*)
 
+### Boundless Updates
+- Fix issue with availability when there are multiple settings for Boundless (Ticket 114846) (*KL*)
+
 ### Other Updates
 - Added a toggle that allows/disallows masquerading using a username (Ticket 130373) (*KL*)
-- 
+
 #### New Settings
 - Library Systems > ILS/Account Integration > Masquerade Mode > Allow Masquerading Using Username