*** empty log message ***

diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c
index 7965d35677df6c1e4d33f97739549e5ff275be91..aa88c6740e95b21e2ea673507a4e34d5d8455aff 100644 (file)
--- a/allParam/ca/client/caParam.c
+++ b/allParam/ca/client/caParam.c
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.17 2002-05-27 13:29:52 hadaq Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/client/caParam.c,v 1.18 2002-06-03 10:46:21 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #include <unistd.h>
@@ -333,6 +333,7 @@ int Param_getFilenameArray(const Param *my, const char *name, const char *idx, i
 {
        int isReady;
        int retVal = 0;
+       int hasPrefix = 0;
        int status;
        int found = 1;
        chid chan;
@@ -340,6 +341,7 @@ int Param_getFilenameArray(const Param *my, const char *name, const char *idx, i
        int i;
        char *prefixVal[PARAM_MAX_ARRAY_LEN];
        char buf[PARAM_MAX_NAME_LEN];
+       char prefix[PARAM_MAX_VALUE_LEN];
        *rows = 0;
 
        if(Param_getStringArrayCache(my, name, idx, maxrows, rows, val) || (*rows != maxrows)) {

diff --git a/allParam/ca/server/Makefile b/allParam/ca/server/Makefile
index 36696289efa5fc2aa8e2d03279436c509ca9fdc4..e49cf3aa0a68b44b689ac2b77976b45661854496 100644 (file)
--- a/allParam/ca/server/Makefile
+++ b/allParam/ca/server/Makefile
@@ -35,7 +35,7 @@ daq_psql_param_cas : $(OBJS) ../../psql/libpsqlParam.a
 
 daq_tcl_param_cas : $(OBJS) ../../tcl/libtclParam.a
        $(MAKE) daq_param_cas \
-         "LOADLIBES=-L../../tcl -ltclParam -ltcl -lm $(LOADLIBES) -lnetinet"
+         "LOADLIBES=-L../../tcl -ltclParam -ltcl -lm $(LOADLIBES)"
        $(MV) daq_param_cas $@
 
 daq_param_cas :

diff --git a/allParam/ca/server/paramFilenameRecord.cc b/allParam/ca/server/paramFilenameRecord.cc
index 468bf8a9d8eab25929b537c2ad0aca5fe8dfefb8..48ff04ca184ef6d75faf3c608cf43dccc045df85 100644 (file)
--- a/allParam/ca/server/paramFilenameRecord.cc
+++ b/allParam/ca/server/paramFilenameRecord.cc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramFilenameRecord.cc,v 1.7 2002-05-23 01:50:27 hadaq Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/paramFilenameRecord.cc,v 1.8 2002-06-03 10:46:12 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 extern "C" {
@@ -83,7 +83,7 @@ gddAppFuncTableStatus ParamFilenameRecord::readValue(gdd &value)
                ourValue[i] = new char[PARAM_MAX_VALUE_LEN];
        }
 
-       pretVal = Param_getFilenameArray(param, name, idx, PARAM_MAX_ARRAY_LEN, &rows, ourValue);
+       pretVal = Param_getStringArray(param, name, idx, PARAM_MAX_ARRAY_LEN, &rows, ourValue);
        if((pretVal != 0) || ((index = (unsigned int) rows ) == 0)) {
                retVal = S_cas_noRead; 
        } else if(index == 1) {
@@ -120,7 +120,7 @@ caStatus ParamFilenameRecord::scan()
                ourValue[i] = new char[PARAM_MAX_VALUE_LEN];
        }
 
-       pretVal = Param_getFilenameArray(param, name, idx, PARAM_MAX_ARRAY_LEN, &rows, ourValue);
+       pretVal = Param_getStringArray(param, name, idx, PARAM_MAX_ARRAY_LEN, &rows, ourValue);
        if((pretVal != 0) || ((index = (unsigned int) rows ) == 0)) {
                retVal = S_cas_noRead; 
        } else if(index == 1) {

diff --git a/allParam/examples/Makefile b/allParam/examples/Makefile
index 67bf8d1e643411c9dd3bc64a65dc946e45ba1582..bd379a9c965a9b26d09d2c94e53aa3757846df8d 100644 (file)
--- a/allParam/examples/Makefile
+++ b/allParam/examples/Makefile
@@ -1,5 +1,8 @@
 CFLAGS = -I$(HOME)/include
-LOADLIBES = -L$(HOME)/lib/$(SYSTYPE) -ltclParam -ltcl -lm -ldl
+ORACLE_HOME = /usr/local/opt/oracle/product/current
+LOADLIBES = -L../ora -L$(ORACLE_HOME)/lib \
+  -loraDaqoperParam -lsql8 -lclntsh -lcommon8 -lcore8 -lnls8
+#LOADLIBES = -L$(HOME)/lib/$(SYSTYPE) -ltclParam -ltcl -lm -ldl
 
 all : paget pastore