From: hadaq <hadaq>
Date: Mon, 20 May 2002 14:46:51 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7113d460185dbb1a0a84d734622965b80beedef9;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/ca/client/caParam.c b/allParam/ca/client/caParam.c
index 8d33c85..7f4bc34 100644
--- a/allParam/ca/client/caParam.c
+++ b/allParam/ca/client/caParam.c
@@ -59,16 +59,7 @@ int conSetupParam(Param *my, const char *setup)
 {
 #if ( _POSIX_VERSION < 199506L )
 	pthread_mutexattr_t *attr;
-	((CaParam *) (my->specParam))->cacheLock = malloc(sizeof(pthread_mutex_t));
-	pthread_mutexattr_create(attr);
-	pthread_mutex_init(((CaParam *) (my->specParam))->cacheLock, *attr);
-	pthread_mutexattr_delete(attr);
-#else
-	((CaParam *) (my->specParam))->cacheLock = malloc(sizeof(pthread_mutex_t));
-	pthread_mutex_init(((CaParam *) (my->specParam))->cacheLock, NULL);
 #endif
-	((CaParam *) (my->specParam))->cache = Tcl_CreateInterp();
-
 	my->strerror = NULL;
 	my->specParam = malloc(sizeof(CaParam));
 
@@ -79,6 +70,18 @@ int conSetupParam(Param *my, const char *setup)
 		my->setup = NULL;
 	}
 
+#if ( _POSIX_VERSION < 199506L )
+	((CaParam *) (my->specParam))->cacheLock = malloc(sizeof(pthread_mutex_t));
+	pthread_mutexattr_create(attr);
+	pthread_mutex_init(((CaParam *) (my->specParam))->cacheLock, *attr);
+	pthread_mutexattr_delete(attr);
+#else
+	((CaParam *) (my->specParam))->cacheLock = malloc(sizeof(pthread_mutex_t));
+	pthread_mutex_init(((CaParam *) (my->specParam))->cacheLock, NULL);
+#endif
+
+	((CaParam *) (my->specParam))->cache = Tcl_CreateInterp();
+
 	return 0;
 }
 
diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 746d5c5..5e6cbe7 100644
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -107,9 +107,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.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+		EXEC SQL SELECT value INTO :value FROM daq_oper.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
 	} else {
-		EXEC SQL SELECT value INTO :value FROM daq.param_int WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+		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;
 	}
 
 	*rows = sqlca.sqlerrd[2];
@@ -155,9 +155,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.param_string WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+		EXEC SQL SELECT value INTO :value FROM daq_oper.param_string WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
 	} else {
-		EXEC SQL SELECT value INTO :value FROM daq.param_string WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+		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;
 	}
 
 	*rows = sqlca.sqlerrd[2];
@@ -168,9 +168,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.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+			EXEC SQL SELECT value INTO :intvalue FROM daq_oper.param_int WHERE setup = :sqlsetup AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
 		} else {
-			EXEC SQL SELECT value INTO :intvalue FROM daq.param_int WHERE setup IS NULL AND name = :sqlname AND idx = :sqlidx ORDER BY seq_num;
+			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;
 		}
 
 		*rows = sqlca.sqlerrd[2];
@@ -288,7 +288,7 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
 
 	EXEC SQL EXECUTE
 		BEGIN
-			daq.store_param.store_param_int ( :sqlsetup, :sqlname, :sqlidx, :value );
+			daq_oper.store_param.store_param_int ( :sqlsetup, :sqlname, :sqlidx, :value );
 		END;
 	END-EXEC;
 
@@ -328,7 +328,7 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const
 
 	EXEC SQL EXECUTE
 		BEGIN
-			daq.store_param.store_param_string ( :sqlsetup, :sqlname, :sqlidx, :value );
+			daq_oper.store_param.store_param_string ( :sqlsetup, :sqlname, :sqlidx, :value );
 		END;
 	END-EXEC;
 	EXEC SQL COMMIT;