refer to daq_setup-wise cache-table-locking.

	-- Benjamin Sailer

diff --git a/allParam/ora/oraParam.pc b/allParam/ora/oraParam.pc
index 93699facd35d18be023e2ecc21c2c3f0fb66b9e8..1b227cac98e1fc66977180eebbc3d54740f411c4 100644 (file)
--- 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.32 2003-03-31 17:15:54 sailer Exp $";
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ora/oraParam.pc,v 1.33 2003-04-08 12:40:36 sailer Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 #if HAVE_CONFIG_H
@@ -170,7 +170,9 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
                                        FROM
                                                daq.cache_table_valid
                                        WHERE
-                                               cache_table = 'param_int_cache';
+                                                       cache_table = 'param_int_cache'
+                                               AND
+                                                       daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup );
                                IF
                                        :l_valid = 0 AND :l_locked = 0
                                THEN
@@ -202,7 +204,9 @@ int Param_getIntArray(const Param *my, const char *name, const char *idx, int ma
                                        FROM
                                                daq.cache_table_valid
                                        WHERE
-                                               cache_table = 'param_int_cache';
+                                                       cache_table = 'param_int_cache'
+                                               AND
+                                                       daq_setup_id IS NULL;
                                IF
                                        :l_valid = 0 AND :l_locked = 0
                                THEN
@@ -290,7 +294,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
                                        FROM
                                                daq.cache_table_valid
                                        WHERE
-                                               cache_table = 'param_string_cache';
+                                                       cache_table = 'param_string_cache'
+                                               AND
+                                                       daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup );
                                IF
                                        :l_valid = 0 AND :l_locked = 0
                                THEN
@@ -322,7 +328,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
                                        FROM
                                                daq.cache_table_valid
                                        WHERE
-                                               cache_table = 'param_string_cache';
+                                                       cache_table = 'param_string_cache'
+                                               AND
+                                                       daq_setup_id IS NULL;
                                IF
                                        :l_valid = 0 AND :l_locked = 0
                                THEN
@@ -373,7 +381,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
                                        FROM
                                                daq.cache_table_valid
                                        WHERE
-                                               cache_table = 'param_int_cache';
+                                                       cache_table = 'param_int_cache'
+                                               AND
+                                                       daq_setup_id = daq.public_interface.r_daq_setup_id ( :sqlsetup );
                                IF
                                        :l_valid = 0 AND :l_locked = 0
                                THEN
@@ -405,7 +415,9 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int
                                        FROM
                                                daq.cache_table_valid
                                        WHERE
-                                               cache_table = 'param_int_cache';
+                                                       cache_table = 'param_int_cache'
+                                               AND
+                                                       daq_setup_id IS NULL;
                                IF
                                        :l_valid = 0 AND :l_locked = 0
                                THEN