From bb5423171db00518cdb6ffa27e6e9e67780afe65 Mon Sep 17 00:00:00 2001
From: Hinko Kocevar <hinko.kocevar@ess.eu>
Date: Mon, 24 Jun 2024 16:11:53 +0200
Subject: [PATCH] remove warning and error messages, fix duplicate flag setting

---
 modules/database/src/ioc/dbStatic/dbLexRoutines.c  |  9 +++------
 modules/database/test/ioc/db/dbStaticTest.c        |  2 ++
 modules/database/test/ioc/db/dbStaticTestRemove.db | 11 ++++++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/database/src/ioc/dbStatic/dbLexRoutines.c b/modules/database/src/ioc/dbStatic/dbLexRoutines.c
index 7efde6cf0..b42196143 100644
--- a/modules/database/src/ioc/dbStatic/dbLexRoutines.c
+++ b/modules/database/src/ioc/dbStatic/dbLexRoutines.c
@@ -1123,15 +1123,12 @@ static void dbRecordHead(char *recordType, char *name, int visible)
         status = dbFindRecord(pdbentry, name);
         if (status == 0) {
             dbDeleteRecord(pdbentry);
-            fprintf(stderr, ERL_WARNING ": Record \"%s\" DELETED!\n", name);
-            return; /* done */
+            popFirstTemp();
+            dbFreeEntry(pdbentry);
+            duplicate = TRUE;
         }
-        fprintf(stderr, ERL_ERROR ": Record \"%s\" not found\n", name);
-        yyerror(NULL);
-        duplicate = TRUE;
         return;
     }
-
     status = dbFindRecordType(pdbentry, recordType);
     if (status) {
         fprintf(stderr, "Record \"%s\" is of unknown type \"%s\"\n",
diff --git a/modules/database/test/ioc/db/dbStaticTest.c b/modules/database/test/ioc/db/dbStaticTest.c
index 6bc836aae..9a4b45268 100644
--- a/modules/database/test/ioc/db/dbStaticTest.c
+++ b/modules/database/test/ioc/db/dbStaticTest.c
@@ -393,6 +393,7 @@ MAIN(dbStaticTest)
     testEntryRemoved("testdelalias7");
     testEntryRemoved("testdelalias77");
     testEntryRemoved("testdelrec8");
+    testEntryRemoved("testdelrec11");
 
     eltc(0);
     testIocInitOk();
@@ -424,6 +425,7 @@ MAIN(dbStaticTest)
     testEntryRemoved("testdelalias7");
     testEntryRemoved("testdelalias77");
     testEntryRemoved("testdelrec8");
+    testEntryRemoved("testdelrec11");
 
     testDbVerify("testrec");
 
diff --git a/modules/database/test/ioc/db/dbStaticTestRemove.db b/modules/database/test/ioc/db/dbStaticTestRemove.db
index cd5f76bc1..6c5f1c822 100644
--- a/modules/database/test/ioc/db/dbStaticTestRemove.db
+++ b/modules/database/test/ioc/db/dbStaticTestRemove.db
@@ -35,11 +35,16 @@ record(x, "testdelrec8") {
 }
 
 record("#", "testdelrec1") { }
-record("#", "testdelrec2") { }
-record("#", "testdelrec3") { }
+record("#", "testdelrec2") {
+    field("INP", "foobar2")
+}
+record("#", "testdelrec3") {
+    field("INP", "foobar2")
+    field("VAL", "1")
+}
 record("#", "testdelrec4") { }
 record("#", "testdelrec5") { }
 record("#", "testdelalias6") { }
 record("#", "testdelrec7") { }
 record("#", "testdelrec8") { }
-
+record("#", "testdelrec11") { }