From 315abcde86feb42c1b0f6297c829b47b2733dd26 Mon Sep 17 00:00:00 2001 From: "Ouellette Jonathan (CSC FI SPS MESLEO)" Date: Fri, 17 Oct 2025 00:35:15 +0000 Subject: [PATCH] Merged PR 28616: Added flags to switch whether or not to add the records to the next queue. Added flags to switch whether or not to add the records to the next queue. --- LSL2/STPROC/ARCHIVE_SERVICES.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/LSL2/STPROC/ARCHIVE_SERVICES.txt b/LSL2/STPROC/ARCHIVE_SERVICES.txt index f32cd08..e41cd67 100644 --- a/LSL2/STPROC/ARCHIVE_SERVICES.txt +++ b/LSL2/STPROC/ARCHIVE_SERVICES.txt @@ -303,7 +303,7 @@ Service ProcessArchiveQueue() readnext ArchiveQueueId else Done = 1 until Done ArchiveId = XLATE('ARCHIVE_QUEUE', ArchiveQueueId, ARCHIVE_QUEUE_ARCHIVE_ID$, 'X') - Archive_Services('ArchiveRecords', ArchiveId) + Archive_Services('ArchiveRecords', ArchiveId, True$) If Error_Services('HasError') then ProcessError = Error_Services('GetMessage') Error_Services('Clear') @@ -355,7 +355,7 @@ Step 2.2 of data archiving procedures. Parameters - ArchiveId - The key ID to the ARCHIVE record being processed. */ -Service ArchiveRecords(ArchiveId) +Service ArchiveRecords(ArchiveId, AddToDeleteQ) ErrorMsg = '' @@ -401,9 +401,11 @@ Service ArchiveRecords(ArchiveId) end Next Record If ErrorMsg EQ '' then - Archive_Services('AddToDeleteQueue', ArchiveId) - If Error_Services('HasError') then - ErrorMsg = Error_Services('GetMessage') + if AddToDeleteQ then + Archive_Services('AddToDeleteQueue', ArchiveId) + If Error_Services('HasError') then + ErrorMsg = Error_Services('GetMessage') + end end end end else @@ -1604,3 +1606,4 @@ return +