fixup doc and tests with INT/EXT modifier

mdavidsaver · Nov 26, 2023 · b2040f7 · b2040f7
1 parent fea37b6
commit b2040f7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/modules/database/src/std/rec/aSubRecord.dbd.pod b/modules/database/src/std/rec/aSubRecord.dbd.pod
@@ -2342,7 +2342,7 @@ need a database fragment that might look something like this:
         ...
         field(FTA, "LONG")
         field(NOA, "100")
-        field(INPA, "myWaveform_1 NPP NMS")
+        field(INPA, "myWaveform_1 NPP NMS EXT")
         ...
     }
 

diff --git a/modules/database/src/template/top/exampleApp/Db/dbExample1.db b/modules/database/src/template/top/exampleApp/Db/dbExample1.db
@@ -1,7 +1,7 @@
 record(ai, "$(user):aiExample")
 {
 	field(DESC, "Analog input")
-	field(INP, "$(user):calcExample.VAL  NPP NMS")
+	field(INP, "$(user):calcExample.VAL  NPP NMS EXT")
 	field(EGUF, "10")
 	field(EGU, "Counts")
 	field(HOPR, "10")
@@ -21,7 +21,7 @@ record(calc, "$(user):calcExample")
 	field(SCAN,"1 second")
 	field(FLNK, "$(user):aiExample")
 	field(CALC, "(A<B)?(A+C):D")
-	field(INPA, "$(user):calcExample.VAL  NPP NMS")
+	field(INPA, "$(user):calcExample.VAL  NPP NMS EXT")
 	field(INPB, "9")
 	field(INPC, "1")
 	field(INPD, "0")

diff --git a/modules/database/src/template/top/exampleApp/Db/dbExample2.db b/modules/database/src/template/top/exampleApp/Db/dbExample2.db
@@ -5,7 +5,7 @@ record(calc, "$(user):calcExample$(no)")
 	field(SCAN,"$(scan)")
 	field(FLNK, "$(user):aiExample$(no)")
 	field(CALC, "(A<B)?(A+C):D")
-	field(INPA, "$(user):calcExample$(no).VAL NPP NMS")
+	field(INPA, "$(user):calcExample$(no).VAL NPP NMS EXT")
 	field(INPB, "9")
 	field(INPC, "1")
 	field(INPD, "0")
@@ -23,7 +23,7 @@ record(calc, "$(user):calcExample$(no)")
 record(ai, "$(user):aiExample$(no)")
 {
 	field(DESC, "Analog input No. $(no)")
-	field(INP, "$(user):calcExample$(no).VAL NPP NMS")
+	field(INP, "$(user):calcExample$(no).VAL NPP NMS EXT")
 	field(EGUF, "10")
 	field(EGU, "Counts")
 	field(HOPR, "10")

diff --git a/modules/database/test/ioc/db/dbPutGetTest.c b/modules/database/test/ioc/db/dbPutGetTest.c
@@ -245,21 +245,21 @@ void testLongLink(void)
 {
     testDiag("testLonkLink()");
 
-    testdbGetFieldEqual("lnktest.INP", DBR_STRING, "lnktarget NPP NMS");
-    testdbGetFieldEqual("lnktest.INP$", DBR_STRING, "lnktarget NPP NMS");
+    testdbGetFieldEqual("lnktest.INP", DBR_STRING, "lnktarget NPP NMS EXT");
+    testdbGetFieldEqual("lnktest.INP$", DBR_STRING, "lnktarget NPP NMS EXT");
     testDiag("dbGet() w/ nRequest==1 gets only trailing nil");
     testdbGetFieldEqual("lnktest.INP$", DBR_CHAR, '\0');
-    testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 19, 18, "lnktarget NPP NMS");
+    testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 23, 22, "lnktarget NPP NMS EXT");
 
     testDiag("get w/ truncation");
     testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 0, 0, NULL);
     testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 1, 1, "");
     testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 2, 2, "l");
     testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 3, 3, "ln");
     testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 17, 17, "lnktarget NPP NM");
-    testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 18, 18, "lnktarget NPP NMS");
+    testdbGetArrFieldEqual("lnktest.INP$", DBR_CHAR, 22, 22, "lnktarget NPP NMS EXT");
 
-    testdbGetArrFieldEqual("lnktest.INP", DBR_STRING, 2, 1, "lnktarget NPP NMS");
+    testdbGetArrFieldEqual("lnktest.INP", DBR_STRING, 2, 1, "lnktarget NPP NMS EXT");
 }
 
 static

diff --git a/modules/database/test/ioc/db/dbPutGetTest.db b/modules/database/test/ioc/db/dbPutGetTest.db
@@ -37,7 +37,7 @@ record(x, "recmax") {
 record(x, "lnktarget") {}
 
 record(x, "lnktest") {
-    field(INP, "lnktarget NPP NMS")
+    field(INP, "lnktarget NPP NMS EXT")
 }
 
 record(arr, "arr") {

diff --git a/modules/database/test/ioc/db/dbPutLinkTest.c b/modules/database/test/ioc/db/dbPutLinkTest.c
@@ -279,11 +279,11 @@ void testInitLocal()
     testIocInitOk();
     eltc(1);
 
-    testdbGetFieldEqual("il1src0.INP", DBF_STRING, "no:such:pv NPP NMS");
-    testdbGetFieldEqual("il1src1.INP", DBF_STRING, "il1tgt NPP NMS");
-    testdbGetFieldEqual("il1src2.INP", DBF_STRING, "il1tgt NPP NMS");
-    testdbGetFieldEqual("il1src3.INP", DBF_STRING, "no:such:pv NPP NMS");
-    testdbGetFieldEqual("il1src4.INP", DBF_STRING, "no:such:pv NPP NMS");
+    testdbGetFieldEqual("il1src0.INP", DBF_STRING, "no:such:pv NPP NMS EXT");
+    testdbGetFieldEqual("il1src1.INP", DBF_STRING, "il1tgt NPP NMS EXT");
+    testdbGetFieldEqual("il1src2.INP", DBF_STRING, "il1tgt NPP NMS INT");
+    testdbGetFieldEqual("il1src3.INP", DBF_STRING, "no:such:pv NPP NMS EXT");
+    testdbGetFieldEqual("il1src4.INP", DBF_STRING, "no:such:pv NPP NMS EXT");
 
     testInitLocalLink("il1src0", pvlOptSrcExt, pvlOptSrcAuto);
     testInitLocalLink("il1src1", pvlOptSrcInt, pvlOptSrcExt );
@@ -645,7 +645,7 @@ void testJLink(void)
     testdbGetFieldEqual("j1.VAL", DBF_LONG, 1);
     testdbGetFieldEqual("j2.INP", DBF_STRING, "{\"z\":{'good':2}}");
     testdbGetFieldEqual("j2.VAL", DBF_LONG, 2);
-    testdbGetFieldEqual("j2.TSEL", DBF_STRING, "j1.TIME NPP NMS");
+    testdbGetFieldEqual("j2.TSEL", DBF_STRING, "j1.TIME NPP NMS EXT");
     testdbGetFieldEqual("j3.VAL", DBF_LONG, 3);
 
     testNumZ(6);

diff --git a/modules/database/test/std/rec/linkRetargetLinkTest.c b/modules/database/test/std/rec/linkRetargetLinkTest.c
@@ -44,7 +44,7 @@ static void testRetarget(void)
     testMonitorWait(lnkmon);
 
     testdbGetFieldEqual("rec:ai", DBR_DOUBLE, 0.0);
-    testdbGetFieldEqual("rec:ai.INP", DBR_STRING, "rec:src1 NPP NMS");
+    testdbGetFieldEqual("rec:ai.INP", DBR_STRING, "rec:src1 NPP NMS EXT");
 
     /* trigger a read from rec:ai.INP */
     testdbPutFieldOk("rec:ai.PROC", DBF_LONG, 0);
@@ -60,7 +60,7 @@ static void testRetarget(void)
     testMonitorWait(valmon);
 
     testdbGetFieldEqual("rec:ai", DBR_DOUBLE, 2.0);
-    testdbGetFieldEqual("rec:ai.INP", DBR_STRING, "rec:src2 CP NMS");
+    testdbGetFieldEqual("rec:ai.INP", DBR_STRING, "rec:src2 CP NMS EXT");
 
     testMonitorDestroy(lnkmon);
     testMonitorDestroy(valmon);

diff --git a/modules/database/test/std/rec/regressLinkMS.db b/modules/database/test/std/rec/regressLinkMS.db
@@ -7,7 +7,7 @@ record(ai, "alarm") {
 }
 
 record(calc, "latch") {
-    field(INPA, "alarm NPP MS")
-    field(INPB, "latch NPP MS")
+    field(INPA, "alarm NPP MS EXT")
+    field(INPB, "latch NPP MS EXT")
     field(CALC, "A")
 }