From 61435345ad0f6ad8fff35ecad1d1de3fb45b6e71 Mon Sep 17 00:00:00 2001
From: "Infineon\\StieberD" <daniel.stieber@infineon.com>
Date: Wed, 19 Mar 2025 11:42:32 -0700
Subject: [PATCH] added mona ok status call if no emails in queue to send

---
 LSL2/STPROC/OBJ_NOTES.txt | 70 ++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/LSL2/STPROC/OBJ_NOTES.txt b/LSL2/STPROC/OBJ_NOTES.txt
index d6cb424..a6a7df4 100644
--- a/LSL2/STPROC/OBJ_NOTES.txt
+++ b/LSL2/STPROC/OBJ_NOTES.txt
@@ -360,37 +360,45 @@ ForwardEMail:
     Lock hSysLists, ServiceKeyID then
         rv   = Set_Status(0)
         RList('SELECT EMAIL_BOX BY NOTE_KEY', 5, '', '', '')
-        Done = False$
-        LOOP
-            ReadNext eMailBoxKey else Done = True$
-        UNTIL Done
-            mbParms = 'EMAIL_BOX':@RM:eMailBoxKey
-            eMailBoxRec = obj_Tables('ReadRec',mbParms)
-            If @File_Error EQ '' then
-                eMailAddr	= eMailBoxRec<EMAIL_BOX_EMAIL_ADDR$>
-                eMailText	= eMailBoxRec<EMAIL_BOX_EMAIL_TEXT$>
-                eMailHeader	= eMailBoxRec<EMAIL_BOX_EMAIL_HEADER$>
-                OISentFrom	= eMailBoxRec<EMAIL_BOX_FROM_USER$>
-                SentFrom    = 'oinotify@infineon.com'
-                SendTo      = eMailAddr
-                IF OISentFrom = 'OI_ERROR' THEN SendTo :=  XLATE('SEC_GROUPS', 'OI_ADMIN', 'USER', 'X')
-                Success     = Email_Services('SendEmail', SentFrom, SendTo, eMailHeader, eMailText)
-                If Success then
-                	LogData    = ''
-                	LogData<1> = LoggingDtm
-                	LogData<2> = 'Successfully sent email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText
-                	Logging_Services('AppendLog', objLog, LogData, @RM, @FM)                	
-                	Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'ok')
-                end else
-                	LogData    = ''
-                	LogData<1> = LoggingDtm
-                	LogData<2> = 'Failed to send email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText:' Error message: ':Error_Services('GetMessage')
-                	Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
-                	Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'critical')
-                end
-                obj_Tables('DeleteRec',mbParms)
-            end
-        REPEAT
+        If @RecCount GT 0 then 
+			Done = False$
+			Loop
+				ReadNext eMailBoxKey else Done = True$
+			Until Done
+				mbParms = 'EMAIL_BOX':@RM:eMailBoxKey
+				eMailBoxRec = obj_Tables('ReadRec',mbParms)
+				If @File_Error EQ '' then
+					eMailAddr	= eMailBoxRec<EMAIL_BOX_EMAIL_ADDR$>
+					eMailText	= eMailBoxRec<EMAIL_BOX_EMAIL_TEXT$>
+					eMailHeader	= eMailBoxRec<EMAIL_BOX_EMAIL_HEADER$>
+					OISentFrom	= eMailBoxRec<EMAIL_BOX_FROM_USER$>
+					SentFrom    = 'oinotify@infineon.com'
+					SendTo      = eMailAddr
+					IF OISentFrom = 'OI_ERROR' THEN SendTo :=  XLATE('SEC_GROUPS', 'OI_ADMIN', 'USER', 'X')
+					Success     = Email_Services('SendEmail', SentFrom, SendTo, eMailHeader, eMailText)
+					If Success then
+						LogData    = ''
+						LogData<1> = LoggingDtm
+						LogData<2> = 'Successfully sent email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText
+						Logging_Services('AppendLog', objLog, LogData, @RM, @FM)                	
+						Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'ok')
+					end else
+						LogData    = ''
+						LogData<1> = LoggingDtm
+						LogData<2> = 'Failed to send email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText:' Error message: ':Error_Services('GetMessage')
+						Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
+						Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'critical')
+					end
+					obj_Tables('DeleteRec',mbParms)
+				end
+			Repeat
+		end else
+			LogData    = ''
+			LogData<1> = LoggingDtm
+			LogData<2> = 'No emails to send...'
+			Logging_Services('AppendLog', objLog, LogData, @RM, @FM)                	
+			Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'ok')			
+		end
         Unlock hSysLists, ServiceKeyID else Null
     end