From 2265028728fb054ee119a21da9296bff486c3405 Mon Sep 17 00:00:00 2001
From: sailer <sailer>
Date: Thu, 28 Aug 2003 17:37:24 +0000
Subject: [PATCH] Bugfix: Generalized fast hack for 'mdc setup only' to 'all
 setups'. 	-- Benjamin Sailer

---
 allParam/ora/oraParam.pc | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 946598d..93e3146 100644
--- a/allParam/ora/oraParam.pc
+++ b/allParam/ora/oraParam.pc
@@ -1,4 +1,4 @@
-static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.39 2003-08-28 12:20:32 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.40 2003-08-28 17:37:24 sailer Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -138,6 +138,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 	int i;
 
 	EXEC SQL BEGIN DECLARE SECTION;
+	int l_daq_setup_id;
 	int l_jobid;
 	int l_take_cache;
 	int l_valid;
@@ -170,6 +171,13 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 		EXEC SQL WHENEVER SQLERROR DO Param_rollback(my);
 
 		if (my->setup != NULL) {
+			EXEC SQL SELECT
+					daq.public_interface.r_daq_setup_id ( :sqlsetup )
+				INTO
+					:l_daq_setup_id
+				FROM
+					DUAL
+			;
 			EXEC SQL SELECT
 					valid, locked
 				INTO
@@ -179,7 +187,7 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 				WHERE
 						cache_table = 'param_int_cache'
 					AND
-						daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup )
+						daq_setup_id = :l_daq_setup_id
 			;
 			EXEC SQL EXECUTE
 				BEGIN
@@ -196,12 +204,12 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
 							WHERE
 									cache_table = 'param_int_cache'
 								AND
-									daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup )
+									daq_setup_id = :l_daq_setup_id
 						;
 						COMMIT;
 						DBMS_JOB.SUBMIT (
 							:l_jobid,
-							'daq.daq_oper_interface.validate_cache_table ( ''param_int_cache'', 6 );'
+							'daq.daq_oper_interface.validate_cache_table ( ''param_int_cache'', '||:l_daq_setup_id||' );'
 						);
 					END IF;
 					:l_take_cache := 0;
@@ -338,6 +346,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 	int i;
 
 	EXEC SQL BEGIN DECLARE SECTION;
+	int l_daq_setup_id;
 	int l_jobid;
 	int l_take_cache;
 	int l_valid;
@@ -370,6 +379,13 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 		EXEC SQL WHENEVER SQLERROR DO Param_rollback(my);
 
 		if (my->setup != NULL) {
+			EXEC SQL SELECT
+					daq.public_interface.r_daq_setup_id ( :sqlsetup )
+				INTO
+					:l_daq_setup_id
+				FROM
+					DUAL
+			;
 			EXEC SQL SELECT
 					valid, locked
 				INTO
@@ -379,7 +395,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 				WHERE
 						cache_table = 'param_string_cache'
 					AND
-						daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup )
+						daq_setup_id = :l_daq_setup_id
 			;
 			EXEC SQL EXECUTE
 				BEGIN
@@ -396,12 +412,12 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 							WHERE
 									cache_table = 'param_string_cache'
 								AND
-									daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup )
+									daq_setup_id = :l_daq_setup_id
 						;
 						COMMIT;
 						DBMS_JOB.SUBMIT (
 							:l_jobid,
-							'daq.daq_oper_interface.validate_cache_table ( ''param_string_cache'', 6 );'
+							'daq.daq_oper_interface.validate_cache_table ( ''param_string_cache'', '||:l_daq_setup_id||' );'
 						);
 					END IF;
 					:l_take_cache := 0;
@@ -540,7 +556,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 					WHERE
 							cache_table = 'param_int_cache'
 						AND
-							daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup )
+							daq_setup_id = :l_daq_setup_id
 				;
 				EXEC SQL EXECUTE
 					BEGIN
@@ -557,12 +573,12 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
 								WHERE
 										cache_table = 'param_ing_cache'
 									AND
-										daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup )
+										daq_setup_id = :l_daq_setup_id
 							;
 							COMMIT;
 							DBMS_JOB.SUBMIT (
 								:l_jobid,
-								'daq.daq_oper_interface.validate_cache_table ( ''param_int_cache'', 6 );'
+								'daq.daq_oper_interface.validate_cache_table ( ''param_int_cache'', '||:l_daq_setup_id||' );'
 							);
 						END IF;
 						:l_take_cache := 0;
-- 
2.43.0