Index: openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 20 Oct 2024 10:13:13 -0000 1.4 +++ openacs-4/packages/acs-tcl/tcl/01-database-procs.tcl 21 Oct 2024 15:49:22 -0000 1.5 @@ -1365,6 +1365,10 @@ @param subst Perform Tcl substitution in xql-files. Possible values: all, none, vars, commands @param default Return value in case the SQL query returns no value @param bind bind variables, passed either as an ns_set id, or via bind value list + + @param statement_name name of the SQL query + @param sql SQL query to be executed + } { # Query Dispatcher (OpenACS - ben) set full_name [db_qd_get_fullname $statement_name] @@ -1401,13 +1405,16 @@ } { @return a Tcl list of the values in the first column of the result of SQL query sql. - If sql doesn't return any rows, returns an empty list. + If the SQL query doesn't return any rows, returns an empty list. @param dbn The database name to use. If empty_string, uses the default database. @param cache_key Cache the result using given value as the key. Default is to not cache. @param cache_pool Override the default db_cache_pool @param subst Perform Tcl substitution in xql-files. Possible values: all, none, vars, commands @param bind bind variables, passed either as an ns_set id, or via bind value list + + @param statement_name name of the SQL query. + @param sql SQL query to be executed. } { # Query Dispatcher (OpenACS - SDW) @@ -1443,13 +1450,13 @@ @return a list of ns_sets with the values of each column of each row returned by the SQL query specified. - @param statement_name name of the query. - @param sql SQL to be executed. @param bind bind variables, passed either as an ns_set id, or via bind value list + @param dbn The database name to use. If empty_string, uses the default database. + @param statement_name name of the SQL query. + @param sql SQL query to be executed. @return list of ns_sets, one per each row return by the SQL query - @param dbn The database name to use. If empty_string, uses the default database. } { set full_statement_name [db_qd_get_fullname $statement_name] @@ -1516,6 +1523,9 @@ @param cache_pool Override the default db_cache_pool @param subst Perform Tcl substitution in xql-files. Possible values: all, none, vars, commands @param bind bind variables, passed either as an ns_set id, or via bind value list + @param statement_name name of the SQL query. + @param sql SQL query to be executed. + } { set full_statement_name [db_qd_get_fullname $statement_name] @@ -1930,29 +1940,22 @@ sql args } { - @param dbn The database name to use. If empty_string, uses the default database. - @param cache_key Cache the result using given value as the key. Default is to not cache. - @param cache_pool Override the default db_cache_pool - @param subst Perform Tcl substitution in xql-files. Possible values: all, none, vars, commands +

Performs the SQL query sql, saving results in variables + of the form + var_name:1, var_name:2, etc, + setting var_name:rowcount to the total number + of rows, and setting var_name:columns to a + list of column names. - @param unclobber If set, will cause the proc to not overwrite local variables. Actually, what happens - is that the local variables will be overwritten, so you can access them within the code block. However, - if you specify -unclobber, we will revert them to their original state after execution of this proc. - Usage: +

db_multirow [ -local ] [ -upvar_level n_levels_up ] [ -append ] [ -extend column_list ] \ var-name statement-name sql [ -bind bind_set_id | -bind bind_value_list ] \ code_block [ if_no_rows if_no_rows_block ]
-

Performs the SQL query sql, saving results in variables - of the form - var_name:1, var_name:2, etc, - setting var_name:rowcount to the total number - of rows, and setting var_name:columns to a - list of column names.

@@ -2034,6 +2037,20 @@ set user_url [acs_community_member_url -user_id $user_id] } + @param dbn The database name to use. If empty_string, uses the default database. + @param cache_key Cache the result using given value as the key. Default is to not cache. + @param cache_pool Override the default db_cache_pool + @param subst Perform Tcl substitution in xql-files. Possible values: all, none, vars, commands + + @param unclobber If set, will cause the proc to not overwrite local variables. Actually, what happens + is that the local variables will be overwritten, so you can access them within the code block. However, + if you specify -unclobber, we will revert them to their original state after execution of this proc. + + @param statement_name name of the SQL query + @param sql SQL query to be executed + @param var_name name of the Tcl multirow array + @param code_block code block to be executed for every tuple reurned + @see template::multirow } { # Query Dispatcher (OpenACS - ben) @@ -2330,10 +2347,9 @@ -column_set } { - Performs the SQL query sql. If a row is returned, sets variables + Performs the specified SQL query. If a row is returned, sets variables to column values (or a set or array populated if -column_array - or column_set is specified) and returns 1. If no rows are returned, - returns 0. + or column_set is specified) and returns 1. @return 1 if variables are set, 0 if no rows are returned. If more than one row is returned, throws an error. @@ -2345,7 +2361,7 @@ @param bind bind variables, passed either as an ns_set id, or via bind value list @param column_array array to be populated with values @param column_set ns_set to be populated with values - @param statement_name name of the query + @param statement_name name of the SQL query @param sql SQL query to be executed } { # Query Dispatcher (OpenACS - ben) @@ -2415,7 +2431,7 @@ @see db_0or1row - @return 1 if variables are set. + @return 1 if variables are set, otherwise an exception is thrown. } { if { ![uplevel ::db_0or1row -subst $subst $args] } { Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -r1.194 -r1.195 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 20 Oct 2024 10:13:13 -0000 1.194 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 21 Oct 2024 15:49:22 -0000 1.195 @@ -956,6 +956,9 @@ The proc either terminates the requests by responding a blocking message to the client, or it continues and returns nothing. + @param condition Tcl expression, blocking condition + @param target part of the message string presented to the blocked user + } { if {[ns_conn isconnected] && [uplevel 1 [list expr $condition]]} { ns_log notice "blocking request for condition $condition\n" \