some cosmetics, already tested

realized that getFilename does not work, since hostname of server is used

diff --git a/allParam/rpc/pcache.c b/allParam/rpc/pcache.c
index 84999396384d13c7b079c00f2b50dd594bfdf774..b0cb705a68c6d632a98683a0c70658d9e91eaeb5 100644 (file)
--- a/allParam/rpc/pcache.c
+++ b/allParam/rpc/pcache.c
@@ -101,26 +101,23 @@ static PData *find(const PCache *my, const char *name, const char *idx)
        return retVal;
 }
 
-int PCache_storeInt(PCache **my, const char *name, const char *idx, unsigned long int value)
+PCache *PCache_storeInt(PCache *my, const char *name, const char *idx, unsigned long int value)
 {
-
-       *my = insert(*my, name, idx, value);
-
-       return 0;
+       return insert(my, name, idx, value);
 }
 
-int PCache_getInt(const PCache *my, const char *name, const char *idx, unsigned long int *value)
+int PCache_getInt(const PCache *my, const char *name, const char *idx, int *row, unsigned long int *value)
 {
-       int retVal;
        const PData *data;
 
        data = find(my, name, idx);
+
        if (data == NULL) {
-               *value = 0;
-               retVal = -1;
+               *row = 0;
        } else {
+               *row = 1;
                *value = data->value.PInt;
-               retVal = 0;
        }
-       return retVal;
+
+       return 0;
 }

diff --git a/allParam/rpc/pcache.h b/allParam/rpc/pcache.h
index 82019cc3c7ccffe58d77a42d02703179183932e4..e2a346f4366b95af56a72fcfcb3f4f188c12a5e2 100644 (file)
--- a/allParam/rpc/pcache.h
+++ b/allParam/rpc/pcache.h
@@ -33,7 +33,7 @@ struct PCacheS {
 };
 typedef struct PCacheS PCache;
 
-int PCache_storeInt(PCache **my, const char *name, const char *idx, unsigned long int value);
-int PCache_getInt(const PCache *my, const char *name, const char *idx, unsigned long int *value);
+PCache *PCache_storeInt(PCache *my, const char *name, const char *idx, unsigned long int value);
+int PCache_getInt(const PCache *my, const char *name, const char *idx, int *row, unsigned long int *value);
 
 #endif

diff --git a/allParam/rpc/rpcParam.c b/allParam/rpc/rpcParam.c
index 109fff707c7c1cd3b597aee66cfdc07ab53a4077..01cc486a9de5472b00ef803f03aaddfb02c968b9 100644 (file)
--- a/allParam/rpc/rpcParam.c
+++ b/allParam/rpc/rpcParam.c
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/rpc/rpcParam.c,v 1.8 2004-05-10 11:20:30 hadaq Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/rpc/rpcParam.c,v 1.9 2004-05-13 15:03:58 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -92,8 +92,8 @@ int Param_getInt(const Param * my, const char *name, const char *idx, int *row,
        int retVal;
        RpcParam *rpcParam = my->specParam;
 
-       retVal = PCache_getInt(rpcParam->cache, name, idx, val);
-       if (retVal != 0) {
+       retVal = PCache_getInt(rpcParam->cache, name, idx, row, val);
+       if (retVal != 0 || *row == 0) {
                GetScalarArgs args;
                GetIntRes res;
 
@@ -107,9 +107,9 @@ int Param_getInt(const Param * my, const char *name, const char *idx, int *row,
                *val = res.value;
 
                retVal =  res.ret;
-               PCache_storeInt(&rpcParam->cache, name, idx, *val);
-       } else {
-               *row = 1;
+               if (retVal == 0) {
+                       rpcParam->cache = PCache_storeInt(rpcParam->cache, name, idx, *val);
+               }
        }
        return retVal;
 }