*** empty log message ***

diff --git a/allParam/file/fileParam.c b/allParam/file/fileParam.c
index 4992e1328e2c75e241c5af12e82dee386f5241d7..77b542aa8a3602cdf267b18636d41bd2a2fc861a 100644 (file)
--- a/allParam/file/fileParam.c
+++ b/allParam/file/fileParam.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "param.h"
 
@@ -20,11 +21,13 @@ int conParam(Param *my)
        char *fileName;
        FILE *f;
        char buf[BUFFERSIZE];
+
+       printf("Being in contstructor of Param.\n");
        my->strerror = NULL;
 
        fileName = getenv("DAQSLOW_PARAM_FILE");
        if (fileName == NULL) {
-               strcpy(fileName, "param.tcl");
+               fileName = "param.tcl";
        }
        if (NULL == (f = fopen(fileName, "r"))) {
                return -1;
@@ -50,6 +53,7 @@ int conParam(Param *my)
                my->nVals = i;
                fclose(f);
        }
+       printf("Reached end of contstructor of Param.\n");
        return retVal;
 }
 
@@ -66,8 +70,9 @@ int Param_getInt(const Param *my, const char *name, const char *idx, int *row, u
                return retVal;
        }
        *val = strtoul(valstr, &endptr, 0);
-       if (*endptr == '\0') {
+       if (*endptr != '\0') {
                Param_strerror((Param *) my, "Value seems to be no integer.\n");
+               *row = 0;
                retVal = -1;
        }
        return retVal;
@@ -75,8 +80,25 @@ int Param_getInt(const Param *my, const char *name, const char *idx, int *row, u
 
 int Param_getString(const Param *my, const char *name, const char *idx, int *row, char *val)
 {
+       char lname[strlen(name) + 1];
+       char lidx[strlen(idx) + 1];
+       int i;
        int n;
-       n = Param_getParamNumber(my, name, idx);
+
+       i = 0;
+       while (name[i] != '\0') {
+               lname[i] = tolower(name[i]);
+               i++;
+       }
+       lname[i] = '\0';
+       i = 0;
+       while (idx[i] != '\0') {
+               lidx[i] = tolower(idx[i]);
+               i++;
+       }
+       lidx[i] = '\0';
+       
+       n = Param_getParamNumber(my, lname, lidx);
        if (n == -1) {
                strcpy(val, "");
                Param_strerror((Param *) my, "Parameter not found.\n");
@@ -94,12 +116,13 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
        int retVal = 0;
        int i;
        char index[PARAM_MAX_NAME_LEN];
+       *rows = 0;
        for (i = 0 ; i < maxrows ; i++) {
                sprintf(index,"%s%d", idx, i);
-               if(retVal |= Param_getInt(my, name, index, &row, val + i) == 0) {
-                       *rows += row;
+               if(((retVal |= Param_getInt(my, name, index, &row, &val[i])) == 0) && (row == 1)) {
+                       (*rows)++;
                } else {
-                       i = maxrows;
+                       return retVal;
                }
        }
        
@@ -112,12 +135,13 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
        int retVal = 0;
        int i;
        char index[PARAM_MAX_NAME_LEN];
+       *rows = 0;
        for (i = 0 ; i < maxrows ; i++) {
                sprintf(index,"%s%d", idx, i);
-               if(retVal |= Param_getString(my, name, index, &row, val[i]) == 0) {
-                       *rows += row;
+               if(((retVal |= Param_getString(my, name, index, &row, val[i])) == 0) && (row == 1)) {
+                       (*rows)++;
                } else {
-                       i = maxrows;
+                       return retVal;
                }
        }
 

diff --git a/allParam/test/Makefile b/allParam/test/Makefile
index b1d419f726e6813df285db22548945f412fd4f41..5a1e6a77ea79d74fff0336954177df5ab3bb9094 100644 (file)
--- a/allParam/test/Makefile
+++ b/allParam/test/Makefile
@@ -32,7 +32,13 @@ TESTS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 \
 
 OBJS = suite.o $(addsuffix .o,$(TESTS))
 
-suite : ca_suite file_suite ora_suite psql_suite tcl_suite
+LIBS = ca file ora psql tcl
+
+suite : $(addsuffix _suite,$(LIBS))
+
+$(addsuffix _suite_new,$(LIBS)) :
+       $(RM) $(patsubst %_new,%,$@)
+       $(MAKE) $(patsubst %_new,%,$@)
 
 ca_suite : $(addprefix ca_,$(OBJS))
        $(CC) $(LDFLAGS) $(addprefix ca_,$(OBJS)) $(LOADCALIBES) -o $@