*** empty log message ***

diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 5e6cbe7382017f61be52df4cdfdc3f56cf3f881a..d7602c5e53609077929e2c373b5a7279f176219c 100644 (file)
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -1,3 +1,4 @@
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.23 2002-05-28 08:58:30 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #include <ctype.h>
@@ -6,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/utsname.h>
 
 #include <oraca.h>
 #include <sqlca.h>
@@ -23,6 +25,8 @@ typedef struct OraParamS {
 
 int conSetupParam(Param *my, const char *setup)
 {
+       int row = 0;
+       struct utsname bufferS, *buffer = &bufferS;
        EXEC SQL BEGIN DECLARE SECTION;
        const char* un;
        const char* pw;
@@ -44,6 +48,14 @@ int conSetupParam(Param *my, const char *setup)
 
        EXEC SQL CONNECT :un IDENTIFIED BY :pw;
 
+       my->basedir = malloc(PARAM_MAX_VALUE_LEN);
+       uname(buffer);
+       if(Param_getString(my, buffer->nodename, "basedir", &row, my->basedir) || (row != 1)) {
+               strcpy(my->basedir, "");
+       } else if (strlen(my->basedir)) {
+               strcat(my->basedir, "/");
+       }
+
        return 0;
 }
 
@@ -57,6 +69,7 @@ void desParam(Param *my)
        EXEC SQL COMMIT RELEASE;
 
        free(my->specParam);
+       free(my->basedir);
        if(my->setup != NULL) {
                free(my->setup);
        }
@@ -107,9 +120,9 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
        }
 
        if (my->setup != NULL) {
-               EXEC SQL SELECT value INTO :value FROM daq_oper.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+               EXEC SQL SELECT value INTO :value FROM daq.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
        } else {
-               EXEC SQL SELECT value INTO :value FROM daq_oper.param_int WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+               EXEC SQL SELECT value INTO :value FROM daq.param_int WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
        }
 
        *rows = sqlca.sqlerrd[2];
@@ -155,9 +168,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
        }
 
        if (my->setup != NULL) {
-               EXEC SQL SELECT value INTO :value FROM daq_oper.param_string WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+               EXEC SQL SELECT value INTO :value FROM daq.param_string WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
        } else {
-               EXEC SQL SELECT value INTO :value FROM daq_oper.param_string WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+               EXEC SQL SELECT value INTO :value FROM daq.param_string WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
        }
 
        *rows = sqlca.sqlerrd[2];
@@ -168,9 +181,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
                EXEC SQL END DECLARE SECTION;
 
                if (my->setup != NULL) {
-                       EXEC SQL SELECT value INTO :intvalue FROM daq_oper.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+                       EXEC SQL SELECT value INTO :intvalue FROM daq.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
                } else {
-                       EXEC SQL SELECT value INTO :intvalue FROM daq_oper.param_int WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+                       EXEC SQL SELECT value INTO :intvalue FROM daq.param_int WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
                }
 
                *rows = sqlca.sqlerrd[2];
@@ -200,7 +213,6 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 int Param_getFilenameArray(const Param *my, const char *name, const char *idx, int maxrows, int *rows, char **val)
 {
        int retVal = 0;
-       int row = 0;
        int i;
        char *value[PARAM_MAX_ARRAY_LEN];
 
@@ -209,16 +221,9 @@ int Param_getFilenameArray(const Param *my, const char *name, const char *idx, i
        }
 
        if (((retVal = Param_getStringArray(my, name, idx, maxrows, rows, value)) == 0) && (*rows > 0)) {
-               char basedir[PARAM_MAX_VALUE_LEN];
-
-               if ((Param_getString(my, "glob", "basedir", &row, basedir) == 0) && (row == 1)) {
-                       strcat(basedir, "/");
-               } else {
-                       strcpy(basedir, "");
-               }
                for (i = 0 ; i < *rows ; i++) {
                        if (value[i][0] != '/') {
-                               strcpy(val[i], basedir);
+                               strcpy(val[i], my->basedir);
                        } else {
                                strcpy(val[i], "");
                        }
@@ -288,7 +293,7 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
 
        EXEC SQL EXECUTE
                BEGIN
-                       daq_oper.store_param.store_param_int ( :sqlsetup, :sqlname, :sqlidx, :value );
+                       daq.store_param.store_param_int ( :sqlsetup, :sqlname, :sqlidx, :value );
                END;
        END-EXEC;
 
@@ -328,7 +333,7 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const
 
        EXEC SQL EXECUTE
                BEGIN
-                       daq_oper.store_param.store_param_string ( :sqlsetup, :sqlname, :sqlidx, :value );
+                       daq.store_param.store_param_string ( :sqlsetup, :sqlname, :sqlidx, :value );
                END;
        END-EXEC;
        EXEC SQL COMMIT;