From 107988ce5317a76e57fc2412116a6169c8dddc0c Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 1 Sep 2000 08:57:14 +0000 Subject: [PATCH] *** empty log message *** --- allParam/file/fileParam.c | 7 +++++-- allParam/ora/Makefile | 2 +- allParam/ora/oraParam.pc | 33 +++++++++------------------------ allParam/psql/psqlParam.c | 8 ++++---- allParam/tcl/tclParam.c | 6 ++++-- 5 files changed, 23 insertions(+), 33 deletions(-) diff --git a/allParam/file/fileParam.c b/allParam/file/fileParam.c index 295100a..ee68b97 100644 --- 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 ac3dc91..d18e07a 100644 --- 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 0c3629b..820c143 100644 --- a/allParam/ora/oraParam.pc +++ b/allParam/ora/oraParam.pc @@ -1,6 +1,7 @@ #define _POSIX_C_SOURCE 199509L #include +#include #include #include @@ -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 c43dfbf..5ca270b 100644 --- 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 028fff7..49d18e8 100644 --- 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); -- 2.43.0