From a7c5f39fa8fd744a39fb2805751e16bce70c8fc8 Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Mon, 3 Jun 2002 10:46:12 +0000
Subject: [PATCH] *** empty log message ***

---
 allParam/ca/client/caParam.c              | 4 +++-
 allParam/ca/server/Makefile               | 2 +-
 allParam/ca/server/paramFilenameRecord.cc | 6 +++---
 allParam/examples/Makefile                | 5 ++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c
index 7965d35..aa88c67 100644
--- 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 3669628..e49cf3a 100644
--- 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 468bf8a..48ff04c 100644
--- 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 67bf8d1..bd379a9 100644
--- 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
 
-- 
2.43.0