The server may even run on another host now

diff --git a/allParam/rpc/rpcParam.c b/allParam/rpc/rpcParam.c
index 494f630ad5bb78409a33641379cd056a73908854..29750531d264089c43aacf5339bf30e655c47db3 100644 (file)
--- a/allParam/rpc/rpcParam.c
+++ b/allParam/rpc/rpcParam.c
@@ -1,5 +1,5 @@
 static const char rcsId[] =
-       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/rpc/rpcParam.c,v 1.3 2004-04-07 12:58:28 muench Exp $";
+       "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/rpc/rpcParam.c,v 1.4 2004-04-07 13:26:10 muench Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -32,6 +32,7 @@ int conSetupParam(Param *my, const char *setup)
 {
        int retVal = 0;
        RpcParam *rpcParam;
+       char *server;
 
        my->strerror = NULL;
 
@@ -42,16 +43,21 @@ int conSetupParam(Param *my, const char *setup)
                my->setup = NULL;
        }
 
-       rpcParam = malloc(sizeof(RpcParam));
-       rpcParam->cl = clnt_create("localhost", RPCPARAMPROG, RPCPARAMVERS, "tcp");
-       if (rpcParam->cl == NULL) {
-               clnt_pcreateerror("localhost");
+       server = getenv("PARAM_RPCPAS_ADDR");
+       if (server == NULL) {
                retVal = -1;
        } else {
-               char *arg;
-
-               arg = my->setup == NULL ? "" : my->setup;
-               rpcParam->remParam = *con_1(&arg, rpcParam->cl);
+               rpcParam = malloc(sizeof(RpcParam));
+               rpcParam->cl = clnt_create(server, RPCPARAMPROG, RPCPARAMVERS, "tcp");
+               if (rpcParam->cl == NULL) {
+                       clnt_pcreateerror(server);
+                       retVal = -1;
+               } else {
+                       char *arg;
+
+                       arg = my->setup == NULL ? "" : my->setup;
+                       rpcParam->remParam = *con_1(&arg, rpcParam->cl);
+               }
        }
 
        my->specParam = rpcParam;
@@ -88,7 +94,9 @@ int Param_getInt(const Param *my, const char *name, const char *idx,
        args.param = rpcParam->remParam;
        args.name = name;
        args.idx = idx;
+
        res = *getint_1(&args, rpcParam->cl);
+
        *row = res.rows;
        *val = res.value;
 
@@ -106,7 +114,9 @@ int Param_getString(const Param *my, const char *name, const char *idx,
        args.param = rpcParam->remParam;
        args.name = name;
        args.idx = idx;
+
        res = *getstring_1(&args, rpcParam->cl);
+
        *row = res.rows;
        strcpy(val, res.value);
 
@@ -126,7 +136,9 @@ int Param_getFilename(const Param *my, const char *name, const char *idx,
        args.param = rpcParam->remParam;
        args.name = name;
        args.idx = idx;
+
        res = *getfilename_1(&args, rpcParam->cl);
+
        *row = res.rows;
        strcpy(val, res.value);
 
@@ -149,9 +161,10 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx,
        args.name = name;
        args.idx = idx;
        args.maxrows = maxrows;
+
        res = *getintarray_1(&args, rpcParam->cl);
-       *rows = res.value.value_len;
 
+       *rows = res.value.value_len;
        for (i = 0; i < res.value.value_len; i++) {
                val[i] = res.value.value_val[i];
        }
@@ -175,9 +188,10 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx,
        args.name = name;
        args.idx = idx;
        args.maxrows = maxrows;
+
        res = *getstringarray_1(&args, rpcParam->cl);
-       *rows = res.value.value_len;
 
+       *rows = res.value.value_len;
        for (i = 0; i < res.value.value_len; i++) {
                strcpy(val[i], res.value.value_val[i]);
        }
@@ -202,9 +216,10 @@ int Param_getFilenameArray(const Param *my, const char *name,
        args.name = name;
        args.idx = idx;
        args.maxrows = maxrows;
+
        res = *getfilenamearray_1(&args, rpcParam->cl);
-       *rows = res.value.value_len;
 
+       *rows = res.value.value_len;
        for (i = 0; i < res.value.value_len; i++) {
                strcpy(val[i], res.value.value_val[i]);
        }
@@ -250,6 +265,7 @@ int Param_storeInt(const Param *my, const char *name, const char *idx,
        args.name = name;
        args.idx = idx;
        args.value = value;
+
        res = *storeint_1(&args, rpcParam->cl);
 
        return res;
@@ -267,6 +283,7 @@ int Param_storeString(const Param *my, const char *name, const char *idx,
        args.name = name;
        args.idx = idx;
        args.value = value;
+
        res = *storestring_1(&args, rpcParam->cl);
 
        return res;

diff --git a/allParam/test/bin/post_rpc_test.sh b/allParam/test/bin/post_rpc_test.sh
new file mode 100644 (file)
index 0000000..e31a57b
--- /dev/null
+++ b/allParam/test/bin/post_rpc_test.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Cleaned up after rpc_test."
+

diff --git a/allParam/test/bin/pre_rpc_test.sh b/allParam/test/bin/pre_rpc_test.sh
new file mode 100644 (file)
index 0000000..b1b95df
--- /dev/null
+++ b/allParam/test/bin/pre_rpc_test.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "Starting rpc_test ..."
+
+rm -f *_s.tcl
+