From: hades <hades>
Date: Fri, 30 Mar 2001 17:10:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=c165d551ee0e7d48ea7b24e1e3d4dae683d708cd;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c
index a5ed071..842f721 100644
--- a/allParam/ca/client/caParam.c
+++ b/allParam/ca/client/caParam.c
@@ -466,6 +466,9 @@ static void Param_copyIntsToAllocMem(struct event_handler_args args)
 	if(args.type == DBR_LONG && args.status == ECA_NORMAL) {
 		for(i = 0 ; i < *(result->rows) ; i++) {
 			(result->val)[i] = buffer[i];
+#if 0
+			fprintf(stderr, "val[%d] received: %ld\n", i, (result->val)[i]);
+#endif
 		}
 	} else {
 		Param_strerror((Param *) result->my, ca_message(args.status));
diff --git a/allParam/ca/server/paramIntRecord.cc b/allParam/ca/server/paramIntRecord.cc
index 84a843d..10fb61b 100644
--- a/allParam/ca/server/paramIntRecord.cc
+++ b/allParam/ca/server/paramIntRecord.cc
@@ -75,6 +75,9 @@ gddAppFuncTableStatus ParamIntRecord::readValue(gdd &value)
 		aitUint32 *intValue = new aitUint32[index];
 		for (unsigned int k = 0 ; k < index ; k++) {
 			intValue[k] = ourValue[k];
+#if 0
+			fprintf(stderr, "intValue[%d] put: %d\n", k, intValue[k]);
+#endif
 		}
 
 		value.putRef(intValue);
@@ -107,6 +110,9 @@ caStatus ParamIntRecord::scan()
 		aitUint32 *intValue = new aitUint32[index];
 		for (unsigned int k = 0 ; k < index ; k++) {
 			intValue[k] = ourValue[k];
+#if 0
+			fprintf(stderr, "intValue[%d] put: %d\n", k, intValue[k]);
+#endif
 		}
 
 		val = new gddAtomic(gddAppType_value, aitEnumUint32, 1, index);
diff --git a/allParam/ca/server/paramStringRecord.cc b/allParam/ca/server/paramStringRecord.cc
index 5d666f0..ab0cc66 100644
--- a/allParam/ca/server/paramStringRecord.cc
+++ b/allParam/ca/server/paramStringRecord.cc
@@ -133,7 +133,8 @@ caStatus ParamStringRecord::scan()
 
 		val = new gddAtomic(gddAppType_value, aitEnumString, 1, index);
 
-		val->putRef(stringValue, pDest);
+		val->putRef(stringValue);
+
 		retVal = S_casApp_success;
 	}
 
@@ -141,8 +142,10 @@ caStatus ParamStringRecord::scan()
 		delete [] ourValue[i];
 	}
 
+#if 0
 	val->setStat(epicsAlarmNone);
 	val->setSevr(epicsSevNone);
+#endif
 
 	if (this->interest == aitTrue && pCAS != NULL) {
 		casEventMask select(pCAS->valueEventMask|pCAS->logEventMask|pCAS->alarmEventMask);
diff --git a/allParam/file/fileParam.c b/allParam/file/fileParam.c
index fa09676..7dd0367 100644
--- a/allParam/file/fileParam.c
+++ b/allParam/file/fileParam.c
@@ -348,6 +348,7 @@ int Param_getBlob(const Param *my, const char *name, const char *idx, size_t *si
 int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned long int value)
 {
 	fprintf(((FileParam *) (my->specParam))->store, "set %s(%s)\t%lu\n", name, idx, value);
+	fflush(((FileParam *) (my->specParam))->store);
 	((FileParam *) (my->specParam))->nVals++;
 	((FileParam *) (my->specParam))->pname = realloc(((FileParam *) (my->specParam))->pname, ((FileParam *) (my->specParam))->nVals * sizeof(char *));
 	((FileParam *) (my->specParam))->value = realloc(((FileParam *) (my->specParam))->value, ((FileParam *) (my->specParam))->nVals * sizeof(char *));
diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c
index 3fce38e..b5ebee8 100644
--- a/allParam/tcl/tclParam.c
+++ b/allParam/tcl/tclParam.c
@@ -275,6 +275,7 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
 	char buf[strlen("set ()\t\n") + 2 * PARAM_MAX_NAME_LEN + PARAM_MAX_VALUE_LEN];
 	sprintf(buf, "set %s(%s)\t%lu\n", name, idx, value);
 	fprintf(((TclParam *) (my->specParam))->store, buf);
+	fflush(((TclParam *) (my->specParam))->store);
 	Tcl_Eval(((TclParam *) (my->specParam))->interp, buf);
 	return 0;
 }
@@ -284,6 +285,7 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const
 	char buf[strlen("set ()\t\n") + 2 * PARAM_MAX_NAME_LEN + PARAM_MAX_VALUE_LEN];
 	sprintf(buf, "set %s(%s)\t\"%s\"\n", name, idx, value);
 	fprintf(((TclParam *) (my->specParam))->store, buf);
+	fflush(((TclParam *) (my->specParam))->store);
 	Tcl_Eval(((TclParam *) (my->specParam))->interp, buf);
 	return 0;
 }
diff --git a/allParam/test/Makefile b/allParam/test/Makefile
index d89cde5..863eee8 100644
--- a/allParam/test/Makefile
+++ b/allParam/test/Makefile
@@ -54,7 +54,7 @@ blobobjs :
 filenameobjs :
 	cd filename ; $(MAKE) "CFLAGS=-Wall -I../../include"
 intobjs :
-	cd int ; $(MAKE) "CFLAGS=-Wall -DVERBOSE -I../../include"
+	cd int ; $(MAKE) "CFLAGS=-Wall -I../../include"
 stringobjs :
 	cd string ; $(MAKE) "CFLAGS=-Wall -I../../include"
 
diff --git a/allParam/test/bin/main.sh b/allParam/test/bin/main.sh
index eb0d6c4..814260c 100644
--- a/allParam/test/bin/main.sh
+++ b/allParam/test/bin/main.sh
@@ -13,7 +13,7 @@ done
 cat middle.c >> $SUITE
 
 for i in */*.c ; do
-	echo "	errors -= $(basename $i \.c)(\"$(dirname $i)/$(basename $i \.c)\");" >> $SUITE
+	echo "	errors -= $(basename $i \.c)(\"$(basename $i \.c)\");" >> $SUITE
 	echo "	tests++;" >> $SUITE
 done
 
diff --git a/allParam/test/f_lowercase_abs_p.tcl b/allParam/test/f_lowercase_abs_p.tcl
deleted file mode 100644
index 19d0002..0000000
--- a/allParam/test/f_lowercase_abs_p.tcl
+++ /dev/null
@@ -1,6 +0,0 @@
-set glob(basedir) blob
-
-set file(rname) test0.blob
-set file(aname) /test0.blob
-set file(rnamellarge) test1.blob
-set file(rnameodd) test2.blob
diff --git a/allParam/test/f_lowercase_rel_no_basedir_p.tcl b/allParam/test/f_lowercase_rel_no_basedir_p.tcl
index 72c3853..44b47da 100644
--- a/allParam/test/f_lowercase_rel_no_basedir_p.tcl
+++ b/allParam/test/f_lowercase_rel_no_basedir_p.tcl
@@ -2,62 +2,3 @@ set file(rname) test0.blob
 set file(aname) /test0.blob
 set file(rnamellarge) test1.blob
 set file(rnameodd) test2.blob
-
-set file(namea0) test1.blob
-set file(namea1) /test0.blob
-set file(namea2) test3.blob
-set file(namea3) /test2.blob
-set file(namea4) test5.blob
-set file(namea5) /test4.blob
-set file(namea6) test7.blob
-set file(namea7) /test6.blob
-set file(namea9) test10.blob
-
-set tname(twhitespace)	"test1000 whith whitespace"
-set tname(tstring) test1000
-
-set tname(tint) 1000
-
-set tname(tstringa0) test10
-set tname(tstringa1) test00
-set tname(tstringa2) test30
-set tname(tstringa3) test20
-set tname(tstringa4) test50
-set tname(tstringa5) test40
-set tname(tstringa6) test70
-set tname(tstringa7) test60
-set tname(tstringa9) test100
-
-set tname(tinta0) 10
-set tname(tinta1) 00
-set tname(tinta2) 30
-set tname(tinta3) 20
-set tname(tinta4) 50
-set tname(tinta5) 40
-set tname(tinta6) 70
-set tname(tinta7) 60
-set tname(tinta8) 90
-set tname(tinta9) 80
-set tname(tinta10) 110
-set tname(tinta11) 100
-set tname(tinta12) 130
-set tname(tinta13) 120
-set tname(tinta14) 150
-set tname(tinta15) 140
-set tname(tinta16) 170
-set tname(tinta17) 160
-set tname(tinta18) 190
-set tname(tinta19) 180
-set tname(tinta20) 210
-set tname(tinta21) 200
-set tname(tinta22) 230
-set tname(tinta23) 220
-set tname(tinta24) 250
-set tname(tinta25) 240
-set tname(tinta26) 270
-set tname(tinta27) 260
-set tname(tinta28) 290
-set tname(tinta29) 280
-set tname(tinta30) 310
-set tname(tinta31) 300
-
diff --git a/allParam/test/f_lowercase_rel_p.tcl b/allParam/test/f_lowercase_rel_p.tcl
deleted file mode 100644
index 19d0002..0000000
--- a/allParam/test/f_lowercase_rel_p.tcl
+++ /dev/null
@@ -1,6 +0,0 @@
-set glob(basedir) blob
-
-set file(rname) test0.blob
-set file(aname) /test0.blob
-set file(rnamellarge) test1.blob
-set file(rnameodd) test2.blob
diff --git a/allParam/test/fa_lowercase_no_basedir_p.tcl b/allParam/test/fa_lowercase_no_basedir_p.tcl
index 72c3853..e6347f0 100644
--- a/allParam/test/fa_lowercase_no_basedir_p.tcl
+++ b/allParam/test/fa_lowercase_no_basedir_p.tcl
@@ -1,8 +1,3 @@
-set file(rname) test0.blob
-set file(aname) /test0.blob
-set file(rnamellarge) test1.blob
-set file(rnameodd) test2.blob
-
 set file(namea0) test1.blob
 set file(namea1) /test0.blob
 set file(namea2) test3.blob
@@ -12,52 +7,3 @@ set file(namea5) /test4.blob
 set file(namea6) test7.blob
 set file(namea7) /test6.blob
 set file(namea9) test10.blob
-
-set tname(twhitespace)	"test1000 whith whitespace"
-set tname(tstring) test1000
-
-set tname(tint) 1000
-
-set tname(tstringa0) test10
-set tname(tstringa1) test00
-set tname(tstringa2) test30
-set tname(tstringa3) test20
-set tname(tstringa4) test50
-set tname(tstringa5) test40
-set tname(tstringa6) test70
-set tname(tstringa7) test60
-set tname(tstringa9) test100
-
-set tname(tinta0) 10
-set tname(tinta1) 00
-set tname(tinta2) 30
-set tname(tinta3) 20
-set tname(tinta4) 50
-set tname(tinta5) 40
-set tname(tinta6) 70
-set tname(tinta7) 60
-set tname(tinta8) 90
-set tname(tinta9) 80
-set tname(tinta10) 110
-set tname(tinta11) 100
-set tname(tinta12) 130
-set tname(tinta13) 120
-set tname(tinta14) 150
-set tname(tinta15) 140
-set tname(tinta16) 170
-set tname(tinta17) 160
-set tname(tinta18) 190
-set tname(tinta19) 180
-set tname(tinta20) 210
-set tname(tinta21) 200
-set tname(tinta22) 230
-set tname(tinta23) 220
-set tname(tinta24) 250
-set tname(tinta25) 240
-set tname(tinta26) 270
-set tname(tinta27) 260
-set tname(tinta28) 290
-set tname(tinta29) 280
-set tname(tinta30) 310
-set tname(tinta31) 300
-
diff --git a/allParam/test/int/ia_long_array.c b/allParam/test/int/ia_long_array.c
index 536bd3a..a906c15 100644
--- a/allParam/test/int/ia_long_array.c
+++ b/allParam/test/int/ia_long_array.c
@@ -36,7 +36,11 @@ int ia_long_array(const char *testid) {
 		printf("%s : Passed.\n", testid);
 	} else {
 #ifdef VERBOSE
-		printf("%s : Failed. Rows: %d, return Value: %d\n", testid, rows, retVal);
+		printf("%s : Failed. Rows: %d, result array:\n", testid, rows);
+		for(i = 0 ; i < NUM6 ; i++) {
+			printf("result[%d]: %ld.\n", i, result[i]);
+		}
+		printf("return Value: %d.\n", retVal);
 		printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 		printf("%s : Failed.\n", testid);
diff --git a/allParam/test/int/ia_short_array.c b/allParam/test/int/ia_short_array.c
index 3ab5ce0..e9ce9f3 100644
--- a/allParam/test/int/ia_short_array.c
+++ b/allParam/test/int/ia_short_array.c
@@ -36,7 +36,11 @@ int ia_short_array(const char *testid) {
 		printf("%s : Passed.\n", testid);
 	} else {
 #ifdef VERBOSE
-		printf("%s : Failed. Rows: %d, return Value: %d\n", testid, rows, retVal);
+		printf("%s : Failed. Rows: %d, result array:\n", testid, rows);
+		for(i = 0 ; i < NUM2 ; i++) {
+			printf("result[%d]: %ld.\n", i, result[i]);
+		}
+		printf("return Value: %d.\n", retVal);
 		printf("%s : Error string: %s\n", testid, Param_getErrStr(param));
 #else
 		printf("%s : Failed.\n", testid);
diff --git a/allParam/test/int/ia_string_available.c b/allParam/test/int/ia_string_available.c
index 292c914..a00f00f 100644
--- a/allParam/test/int/ia_string_available.c
+++ b/allParam/test/int/ia_string_available.c
@@ -25,7 +25,7 @@ int ia_string_available(const char *testid) {
 	conSetupParam(param, testid);
 
 	retVal = Param_getIntArray(param, name, idx, NUM1, &rows, result);
-	if ((rows == 0) && (retVal == -1)) {
+	if ((rows == 0) && ((retVal == -1) || (retVal == 0))) {
 		myRetVal = 0;
 		printf("%s : Passed.\n", testid);
 	} else {