Bugfixes.

	-- Benjamin Sailer

diff --git a/allParam/ca/server/paramBlobRecord.cc b/allParam/ca/server/paramBlobRecord.cc
index cbeafec0c23d48a38763c550e21f12e741c6d3d9..939cf457cdb6d9fb1fdf81661af62bd680e58762 100644 (file)
--- a/allParam/ca/server/paramBlobRecord.cc
+++ b/allParam/ca/server/paramBlobRecord.cc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramBlobRecord.cc,v 1.14 2003-05-19 11:01:55 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramBlobRecord.cc,v 1.15 2003-05-19 16:30:48 sailer Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -47,6 +47,7 @@ ParamBlobRecord::ParamBlobRecord(caServer& cas, const Param *p, const char *rn,
        funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh);
        funcTable.installReadFunc("controlLow", &Record::readControlLow);
        funcTable.installReadFunc("controlHigh", &Record::readControlHigh);
+       funcTable.installReadFunc("enums", &Record::readEnums);
        funcTable.installReadFunc("precision", &Record::readPrecision);
 
        funcTable.installReadFunc("value", &ParamBlobRecord::readValue);

diff --git a/allParam/ca/server/paramFilenameRecord.cc b/allParam/ca/server/paramFilenameRecord.cc
index eddc5b1810054aa714eea7dfbdd7a0b8d84138e8..db9439f760f9797babd40ca5801de0fc2c433a1b 100644 (file)
--- a/allParam/ca/server/paramFilenameRecord.cc
+++ b/allParam/ca/server/paramFilenameRecord.cc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramFilenameRecord.cc,v 1.10 2003-05-19 11:01:55 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramFilenameRecord.cc,v 1.11 2003-05-19 16:30:48 sailer Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -46,6 +46,7 @@ ParamFilenameRecord::ParamFilenameRecord(caServer& cas, const Param *p, const ch
        funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh);
        funcTable.installReadFunc("controlLow", &Record::readControlLow);
        funcTable.installReadFunc("controlHigh", &Record::readControlHigh);
+       funcTable.installReadFunc("enums", &Record::readEnums);
        funcTable.installReadFunc("precision", &Record::readPrecision);
 
        funcTable.installReadFunc("value", &ParamFilenameRecord::readValue);

diff --git a/allParam/ca/server/paramIntRecord.cc b/allParam/ca/server/paramIntRecord.cc
index 0138b057cb6963b7b4673bce568a09df114e121b..1e90842c4b49560fc72b5948fecb2bb45f6c182b 100644 (file)
--- a/allParam/ca/server/paramIntRecord.cc
+++ b/allParam/ca/server/paramIntRecord.cc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramIntRecord.cc,v 1.13 2003-05-19 11:01:55 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramIntRecord.cc,v 1.14 2003-05-19 16:30:48 sailer Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -43,6 +43,7 @@ ParamIntRecord::ParamIntRecord(caServer& cas, const Param *p, const char *rn, co
        funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh);
        funcTable.installReadFunc("controlLow", &Record::readControlLow);
        funcTable.installReadFunc("controlHigh", &Record::readControlHigh);
+       funcTable.installReadFunc("enums", &Record::readEnums);
        funcTable.installReadFunc("precision", &Record::readPrecision);
 
        funcTable.installReadFunc("value", &ParamIntRecord::readValue);

diff --git a/allParam/ca/server/paramStringRecord.cc b/allParam/ca/server/paramStringRecord.cc
index 65c2024f55e03f1ed6cf8ec97fb8ead744ef3654..68ba14938ab02edaf501eb162be065733f7f9b68 100644 (file)
--- a/allParam/ca/server/paramStringRecord.cc
+++ b/allParam/ca/server/paramStringRecord.cc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramStringRecord.cc,v 1.12 2003-05-19 11:01:55 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramStringRecord.cc,v 1.13 2003-05-19 16:30:48 sailer Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -46,6 +46,7 @@ ParamStringRecord::ParamStringRecord(caServer& cas, const Param *p, const char *
        funcTable.installReadFunc("graphicHigh", &Record::readGraphicHigh);
        funcTable.installReadFunc("controlLow", &Record::readControlLow);
        funcTable.installReadFunc("controlHigh", &Record::readControlHigh);
+       funcTable.installReadFunc("enums", &Record::readEnums);
        funcTable.installReadFunc("precision", &Record::readPrecision);
 
        funcTable.installReadFunc("value", &ParamStringRecord::readValue);

diff --git a/allParam/ca/server/record.cc b/allParam/ca/server/record.cc
index 366a89cd16c5b3f52a21686b6f659cbe219f579f..d7208f733d60590e1df9e154708553f1fbed37da 100644 (file)
--- a/allParam/ca/server/record.cc
+++ b/allParam/ca/server/record.cc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/record.cc,v 1.5 2003-05-19 11:01:56 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/record.cc,v 1.6 2003-05-19 16:30:48 sailer Exp $";
 #define _POSIX_C_SOURCE 199506L
 
 #if HAVE_CONFIG_H
@@ -31,7 +31,7 @@ Record::Record(caServer &cas, const Param *p, const char *n, const char *u, aitE
        alarmStatus = epicsAlarmNone;
        alarmSeverity = epicsSevNone;
 
-       if(sscanf(pPVName, "HAD:P%*c:%[^:]:%[^:]:%[^:]", buf1, buf2, buf3) != 4) {
+       if(sscanf(pPVName, "HAD:P%*c:%[^:]:%[^:]:%[^:]", buf1, buf2, buf3) != 3) {
                strcpy(name, buf1);
                strcpy(idx, buf2);
        } else {