*** empty log message ***

diff --git a/allParam/file/fileParam.c b/allParam/file/fileParam.c
index 295100a2879dd90591a1dec6fd74b6016226cd2e..ee68b97a8055a9bbe1cad4daf294987ddbd48c56 100644 (file)
--- a/allParam/file/fileParam.c
+++ b/allParam/file/fileParam.c
@@ -64,6 +64,7 @@ int Param_getInt(const Param *my, const char *name, const char *idx, int *row, u
        int retVal;
        char valstr[PARAM_MAX_VALUE_LEN];
        char *endptr;
+
        if ((retVal = Param_getString(my, name, idx, row, valstr)) != 0) {
                return retVal;
        }
@@ -80,8 +81,8 @@ int Param_getString(const Param *my, const char *name, const char *idx, int *row
 {
        int i;
        int n;
-       char lname[strlen(name) + 1];
-       char lidx[strlen(idx) + 1];
+       char lname[PARAM_MAX_NAME_LEN];
+       char lidx[PARAM_MAX_NAME_LEN];
 
        for(i = 0 ; i <=strlen(name) ; i++) {
                lname[i] = tolower(name[i]);
@@ -109,6 +110,7 @@ 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);
@@ -128,6 +130,7 @@ 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);

diff --git a/allParam/ora/Makefile b/allParam/ora/Makefile
index ac3dc911b65772294efa9c1d4cb77403aed35c6f..d18e07aa963da79e6cee79fb170b0070dd51285b 100644 (file)
--- a/allParam/ora/Makefile
+++ b/allParam/ora/Makefile
@@ -1,6 +1,6 @@
 CFLAGS = -g -I$(ORACLE_HOME)/precomp/public/
 
-ORA_USER = hades/hades@db-hades.gsi.de
+ORA_USER = daq/daqall@db-hades.gsi.de
 
 PROC = $(ORACLE_HOME)/bin/proc
 PROCFLAGS = oraca=yes parse=partial sqlcheck=semantics \

diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 0c3629b9e64a4bee41a00abdb71cf1a72a926781..820c143e94f5ea33e460279fb7e7bfdcc42c34a2 100644 (file)
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -1,6 +1,7 @@
 #define _POSIX_C_SOURCE 199509L
 
 #include <string.h>
+#include <ctype.h>
 
 #include <oraca.h>
 #include <sqlca.h>
@@ -34,23 +35,15 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
        int retVal;
        int i;
        char *endptr;
+
+       EXEC SQL WHENEVER SQLERROR DO Param_strerror(my, "Some Oracle error occured.\n");
        EXEC SQL BEGIN DECLARE SECTION;
-       char *value[PARAM_MAX_NVALS];
+       char value[PARAM_MAX_NVALS][PARAM_MAX_VALUE_LEN];
        char sqlname[PARAM_MAX_NAME_LEN];
        char sqlidx[PARAM_MAX_NAME_LEN];
        EXEC SQL END DECLARE SECTION;
-       for(i = 0 ; i < PARAM_MAX_NVALS ; i++) {
-               value[i] = malloc(PARAM_MAX_VALUE_LEN * sizeof(char));
-       }
-       for (i = 0 ; i <= strlen(name) ; i++) {
-               sqlname[i] = tolower(name[i]);
-       }
-       for (i = 0 ; i <= strlen(idx) ; i++) {
-               sqlidx[i] = tolower(idx[i]);
-       }
 
-       EXEC SQL WHENEVER SQLERROR DO Param_strerror(my, "Some Oracle error occured.\n");
-       EXEC SQL SELECT VALUE INTO :value FROM daq.params WHERE NAME = ':sqlname' AND IDX = ':sqlidx' ORDER BY SEQ_NUM;
+       EXEC SQL SELECT value INTO :value FROM daq.params WHERE name = ':sqlname' AND idx = ':sqlidx' ORDER BY seq_num;
        *rows = sqlca.sqlerrd[2];
 
        if (*rows > maxrows) {
@@ -86,23 +79,15 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 {
        int retVal;
        int i;
+
+       EXEC SQL WHENEVER SQLERROR DO Param_strerror(my, "Some Oracle error occured.\n");
        EXEC SQL BEGIN DECLARE SECTION;
-       char *value[PARAM_MAX_NVALS];
+       char value[PARAM_MAX_NVALS][PARAM_MAX_VALUE_LEN];
        char sqlname[PARAM_MAX_NAME_LEN];
        char sqlidx[PARAM_MAX_NAME_LEN];
        EXEC SQL END DECLARE SECTION;
-       for(i = 0 ; i < PARAM_MAX_NVALS ; i++) {
-               value[i] = malloc(PARAM_MAX_VALUE_LEN * sizeof(char));
-       }
-       for (i = 0 ; i <= strlen(name) ; i++) {
-               sqlname[i] = tolower(name[i]);
-       }
-       for (i = 0 ; i <= strlen(idx) ; i++) {
-               sqlidx[i] = tolower(idx[i]);
-       }
 
-       EXEC SQL WHENEVER SQLERROR DO Param_strerror(my, "Some Oracle error occured.\n");
-       EXEC SQL SELECT VALUE INTO :value FROM daq.params WHERE NAME = ':sqlname' AND IDX = ':sqlidx' ORDER BY SEQ_NUM;
+       EXEC SQL SELECT value INTO :value FROM daq.params WHERE name = ':sqlname' AND idx = ':sqlidx' ORDER BY seq_num;
        *rows = sqlca.sqlerrd[2];
 
        if (*rows > maxrows) {

diff --git a/allParam/psql/psqlParam.c b/allParam/psql/psqlParam.c
index c43dfbf46e32c136e09f89b391886c8fe40504b2..5ca270b8baaa156e01184e8fc21219290ef6e863 100644 (file)
--- a/allParam/psql/psqlParam.c
+++ b/allParam/psql/psqlParam.c
@@ -39,8 +39,8 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
        char whereClause[PG_MAX_CLAUSE_LEN];
        char query[PG_MAX_QUERY_LEN];
        char *endptr;
-       char lname[strlen(name) + 1];
-       char lidx[strlen(idx) + 1];
+       char lname[PARAM_MAX_NAME_LEN];
+       char lidx[PARAM_MAX_NAME_LEN];
 
        for(i = 0 ; i <=strlen(name) ; i++) {
                lname[i] = tolower(name[i]);
@@ -88,8 +88,8 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
        PGresult *result;
        char whereClause[PG_MAX_CLAUSE_LEN];
        char query[PG_MAX_QUERY_LEN];
-       char lname[strlen(name) + 1];
-       char lidx[strlen(idx) + 1];
+       char lname[PARAM_MAX_NAME_LEN];
+       char lidx[PARAM_MAX_NAME_LEN];
 
        for(i = 0 ; i <=strlen(name) ; i++) {
                lname[i] = tolower(name[i]);

diff --git a/allParam/tcl/tclParam.c b/allParam/tcl/tclParam.c
index 028fff7edf6a1bef938aa9a6e49ebd4221fecef5..49d18e8c73381b7084aace2405016058e519701f 100644 (file)
--- a/allParam/tcl/tclParam.c
+++ b/allParam/tcl/tclParam.c
@@ -71,8 +71,8 @@ int Param_getString(const Param *my, const char *name, const char *idx, int *row
 {
        int retVal;
        int i;
-       char lname[strlen(name) + 1];
-       char lidx[strlen(idx) + 1];
+       char lname[PARAM_MAX_NAME_LEN];
+       char lidx[PARAM_MAX_NAME_LEN];
 
        for(i = 0 ; i <=strlen(name) ; i++) {
                lname[i] = tolower(name[i]);
@@ -96,6 +96,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
        int i;
        int row;
        char index[PARAM_MAX_NAME_LEN];
+
        *rows = 0;
        for (i = 0 ; i < maxrows ; i++) {
                sprintf(index,"%s%d", idx, i);
@@ -115,6 +116,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
        int i;
        int row;
        char index[PARAM_MAX_NAME_LEN];
+
        *rows = 0;
        for (i = 0 ; i < maxrows ; i++) {
                sprintf(index,"%s%d", idx, i);