From 77ba97a55628cdb1c1f00ba398b24d7959bd506c Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Fri, 16 Nov 2001 17:04:33 +0000
Subject: [PATCH] *** empty log message ***

---
 allParam/ora/oraParam.pc | 47 +++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 4af66f7..72d315e 100644
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -23,6 +23,11 @@ typedef struct OraParamS {
 
 int conSetupParam(Param *my, const char *setup)
 {
+	EXEC SQL BEGIN DECLARE SECTION;
+	const char* un;
+	const char* pw;
+	EXEC SQL END DECLARE SECTION;
+
 	my->strerror = NULL;
 	if(setup != NULL) {
 		my->setup = malloc(strlen(setup) + 1);
@@ -33,6 +38,12 @@ int conSetupParam(Param *my, const char *setup)
 	my->specParam = malloc(sizeof(OraParam));
 	((OraParam *) (my->specParam))->user = "daq_oper@db-hades.gsi.de";
 	((OraParam *) (my->specParam))->passwd = "daqall";
+
+	un = ((OraParam *) (my->specParam))->user;
+	pw = ((OraParam *) (my->specParam))->passwd;
+
+	EXEC SQL CONNECT :un IDENTIFIED BY :pw;
+
 	return 0;
 }
 
@@ -43,6 +54,8 @@ int conParam(Param *my)
 
 void desParam(Param *my)
 {
+	EXEC SQL COMMIT RELEASE;
+
 	free(my->specParam);
 	if(my->setup != NULL) {
 		free(my->setup);
@@ -73,8 +86,6 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 	EXEC SQL WHENEVER SQLERROR DO Param_rollback();
 
 	EXEC SQL BEGIN DECLARE SECTION;
-	const char* un;
-	const char* pw;
 	char sqlsetup[PARAM_MAX_NAME_LEN];
 	char sqlname[PARAM_MAX_NAME_LEN];
 	char sqlidx[PARAM_MAX_NAME_LEN];
@@ -94,10 +105,6 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 	for(i = 0 ; i <= strlen(idx) ; i++) {
 		sqlidx[i] = tolower(idx[i]);
 	}
-	un = ((OraParam *) (my->specParam))->user;
-	pw = ((OraParam *) (my->specParam))->passwd;
-
-	EXEC SQL CONNECT :un IDENTIFIED BY :pw;
 
 	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;
@@ -114,7 +121,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 		val[i] = value[i];
 	}
 
-	EXEC SQL COMMIT RELEASE;
+	EXEC SQL COMMIT;
 	return retVal;
 }
 
@@ -127,8 +134,6 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 	EXEC SQL WHENEVER SQLERROR DO Param_rollback();
 
 	EXEC SQL BEGIN DECLARE SECTION;
-	const char* un;
-	const char* pw;
 	char sqlsetup[PARAM_MAX_NAME_LEN];
 	char sqlname[PARAM_MAX_NAME_LEN];
 	char sqlidx[PARAM_MAX_NAME_LEN];
@@ -148,10 +153,6 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 	for(i = 0 ; i <= strlen(idx) ; i++) {
 		sqlidx[i] = tolower(idx[i]);
 	}
-	un = ((OraParam *) (my->specParam))->user;
-	pw = ((OraParam *) (my->specParam))->passwd;
-
-	EXEC SQL CONNECT :un IDENTIFIED BY :pw;
 
 	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;
@@ -192,7 +193,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 		}
 	}
 
-	EXEC SQL COMMIT RELEASE;
+	EXEC SQL COMMIT;
 	return retVal;
 }
 
@@ -263,8 +264,6 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
 	EXEC SQL WHENEVER SQLERROR DO Param_rollback();
 
 	EXEC SQL BEGIN DECLARE SECTION;
-	const char* un;
-	const char* pw;
 	char sqlsetup[PARAM_MAX_NAME_LEN];
 	char sqlname[PARAM_MAX_NAME_LEN];
 	char sqlidx[PARAM_MAX_NAME_LEN];
@@ -286,10 +285,6 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
 	}
 	value = val;
 
-	un = ((OraParam *) (my->specParam))->user;
-	pw = ((OraParam *) (my->specParam))->passwd;
-
-	EXEC SQL CONNECT :un IDENTIFIED BY :pw;
 
 	EXEC SQL EXECUTE
 		BEGIN
@@ -297,7 +292,7 @@ int Param_storeInt(const Param *my, const char *name, const char *idx, unsigned
 		END;
 	END-EXEC;
 
-	EXEC SQL COMMIT RELEASE;
+	EXEC SQL COMMIT;
 	return 0;
 }
 
@@ -309,8 +304,6 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const
 	EXEC SQL WHENEVER SQLERROR DO Param_rollback();
 
 	EXEC SQL BEGIN DECLARE SECTION;
-	const char* un;
-	const char* pw;
 	char sqlsetup[PARAM_MAX_NAME_LEN];
 	char sqlname[PARAM_MAX_NAME_LEN];
 	char sqlidx[PARAM_MAX_NAME_LEN];
@@ -332,17 +325,13 @@ int Param_storeString(const Param *my, const char *name, const char *idx, const
 	}
 	value = val;
 
-	un = ((OraParam *) (my->specParam))->user;
-	pw = ((OraParam *) (my->specParam))->passwd;
-
-	EXEC SQL CONNECT :un IDENTIFIED BY :pw;
 
 	EXEC SQL EXECUTE
 		BEGIN
 			daq.store_param.store_param_string ( :sqlsetup, :sqlname, :sqlidx, :value );
 		END;
 	END-EXEC;
-	EXEC SQL COMMIT RELEASE;
+	EXEC SQL COMMIT;
 	return 0;
 }
 
@@ -360,6 +349,6 @@ static void Param_strerror(const Param *my, const char *strerror)
 }
 
 static void Param_rollback() {
-	EXEC SQL ROLLBACK RELEASE;
+	EXEC SQL ROLLBACK;
 }
 
-- 
2.43.0