Skip to content

DIS-1199: QA Changes #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdnoble73 merged 1 commit into from
Oct 9, 2026
Merged

DIS-1199: QA Changes #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/reindexer/src/org/aspen_discovery/reindexer/SymphonyRecordProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ protected void loadOnOrderItems(AbstractGroupedWorkSolr groupedWork, RecordInfo
loadOnOrderIds();

String recordIdentifier = recordInfo.getRecordIdentifier();
if (onOrderIds.contains(recordIdentifier)) {
if (onOrderIds.contains(recordIdentifier) && !hasTangibleItems) {
ItemInfo itemInfo = new ItemInfo();
itemInfo.setLocationCode("multi");
itemInfo.setItemIdentifier(recordIdentifier);
Expand All @@ -244,7 +244,7 @@ protected void loadOnOrderItems(AbstractGroupedWorkSolr groupedWork, RecordInfo
recordInfo.addItem(itemInfo);
groupedWork.addPopularity(1);

if (recordInfo.getNumCopiesOnOrder() > 0 && !hasTangibleItems){
if (recordInfo.getNumCopiesOnOrder() > 0){
groupedWork.addKeywords("On Order");
groupedWork.addKeywords("Coming Soon");
if (groupedWork.isDebugEnabled()) {
Expand Down
14 changes: 13 additions & 1 deletion code/symphony_export/src/com/turning_leaf_technologies/symphony/SymphonyExportMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,11 +773,18 @@ private static int updateRecords(Connection dbConn){
File[] exportedMarcFiles = marcExportPath.listFiles((dir, name) -> name.endsWith("mrc") || name.endsWith("marc"));
ArrayList<File> filesToProcess = new ArrayList<>();
File latestFile = null;
File ordersFile = null;
long latestMarcFile = 0;
boolean hasFullExportFile = false;
File fullExportFile = null;
if (exportedMarcFiles != null){
for (File exportedMarcFile : exportedMarcFiles) {
//orders.mrc handling, don't delete
if (exportedMarcFile.getName().equals("orders.mrc")){
ordersFile = exportedMarcFile;
continue;
}
//Full export file handling
//Remove any files that are older than the last time we processed files.
if (exportedMarcFile.lastModified() / 1000 < lastUpdateFromMarc){
if (exportedMarcFile.delete()){
Expand All @@ -802,6 +809,11 @@ private static int updateRecords(Connection dbConn){
fullExportFile = latestFile;
}

//Add orders.mrc to filesToProcess if we have a full export file
if (hasFullExportFile && ordersFile != null && ordersFile.length() > 0){
filesToProcess.add(ordersFile);
}

//Get a list of marc deltas since the last marc record
File marcDeltaPath = new File(marcExportPath.getParentFile() + "/marc_delta");

Expand Down Expand Up @@ -1130,7 +1142,7 @@ private static int updateRecordsUsingMarcExtract(ArrayList<File> exportedMarcFil
logEntry.saveResults();
}

if (!logEntry.hasErrors()) {
if (!logEntry.hasErrors() && !curBibFile.getName().equals("orders.mrc")) {
// Delete the file if we did not have errors processing the file.
if (!curBibFile.delete()) {
logEntry.addNote("Could not delete " + curBibFile + " after processing");
Expand Down
12 changes: 12 additions & 0 deletions code/web/release_notes/26.10.00/DIS-1199.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Jira: DIS-1199
Type: Enhancement
Developer: Kodi Lein (KL), David Dowling (DD)
Contributing Org: Grove For Libraries
Sponsor: Prairie Lakes
GroveRelease: 26.10.00
CommunityRelease: 26.11.00
Component: Symphony
Description:
- Allow for on-order records without items to display for Symphony ILS
New Settings:
New Permissions:
Loading