Index: openacs-4/packages/cms/tcl/form-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/cms/tcl/form-procs-oracle.xql 29 Jul 2001 23:44:43 -0000 1.5 +++ openacs-4/packages/cms/tcl/form-procs-oracle.xql 11 Aug 2001 17:40:26 -0000 1.6 @@ -168,13 +168,13 @@ - + $param => $defArray($param) - + relation_tag => :relation_tag @@ -401,4 +401,4 @@ - \ No newline at end of file + Index: openacs-4/packages/cms/tcl/form-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs-postgresql.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/cms/tcl/form-procs-postgresql.xql 29 Jul 2001 23:44:43 -0000 1.5 +++ openacs-4/packages/cms/tcl/form-procs-postgresql.xql 11 Aug 2001 17:40:26 -0000 1.6 @@ -167,13 +167,13 @@ - + $defArray($param) - + null @@ -250,7 +250,7 @@ select [join $args ","] from - acs_attributes RIGHT OUTER JOIN + acs_attributes, ( select o2.object_type, tree_level(o2.tree_sortkey) as type_order @@ -265,8 +265,10 @@ AND o1.tree_sortkey like (o2.tree_sortkey || '%') - ) types USING (object_type) + ) types where + object_type = ancestor + and attribute_name <> 'ldap dn' order by type_order desc, sort_order Index: openacs-4/packages/cms/tcl/item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/item-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/cms/tcl/item-procs.tcl 10 Aug 2001 15:03:28 -0000 1.3 +++ openacs-4/packages/cms/tcl/item-procs.tcl 11 Aug 2001 17:40:26 -0000 1.4 @@ -123,12 +123,12 @@ if { $last > 0 } { set url [string range $url 0 [expr $last - 1]] } - # FIX ME - set sql [db_map gi_get_item_id_1] "select content_item.get_id(:url" + + set sql [db_map gi_get_item_id_1] if { ![template::util::is_nil root_folder] } { - append sql [db_map gi_get_item_id_2] ", :root_folder" + append sql [db_map gi_get_item_id_2] } - append sql [db_map gi_get_item_id_3] ") from dual" + append sql [db_map gi_get_item_id_3] # Get the path template::query gi_get_item_id item_id onevalue $sql -cache "item_id $url $root_folder" @@ -438,12 +438,12 @@ # Get the mime type, decide if we want the text get_mime_info $revision_id - # FIX ME + if { [string equal \ [lindex [split $mime_info(mime_type) "/"] 0] "text"] } { - set text_sql [db_map grc_get_all_content_1] ",\n content.blob_to_string(content) as text" + set text_sql [db_map grc_get_all_content_1] } else { - set text_sql "" + set text_sql "" } # Get the content type Index: openacs-4/packages/cms/tcl/module-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/module-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cms/tcl/module-procs.tcl 10 Aug 2001 15:03:28 -0000 1.2 +++ openacs-4/packages/cms/tcl/module-procs.tcl 11 Aug 2001 17:40:26 -0000 1.3 @@ -80,7 +80,7 @@ } namespace eval workspace { - #RBM: FIX ME: This has got to be a hack that was left over in the code! + ad_proc getRootFolderID {} { return 0 } ad_proc getChildFolders { id } { @@ -158,17 +158,8 @@ set sql_id_list "'" append sql_id_list [join $id_list "','"] append sql_id_list "'" - #FIX ME + set sql_query [db_map gsp_get_sorted_paths] - "select - item_id, - content_item.get_path(item_id, :sorted_paths_root_id) as item_path, - content_type as item_type - from - cr_items - where - item_id in ($sql_id_list) - order by item_path" upvar sql_query __sql upvar sorted_paths_root_id _root_id @@ -299,17 +290,9 @@ set sql_id_list "'" append sql_id_list [join $id_list "','"] append sql_id_list "'" - # FIX ME - set sql_query [db_map gsp_get_query] " - select - keyword_id as item_id, - content_keyword.get_path(keyword_id) as item_path, - 'content_keyword' as item_type - from - cr_keywords - where - keyword_id in ($sql_id_list)" + set sql_query [db_map gsp_get_query] + upvar __sql sql_query uplevel " template::query $name multirow \{$__sql\} -eval \{$eval_code\} @@ -362,21 +345,9 @@ set sql_id_list "'" append sql_id_list [join $id_list "','"] append sql_id_list "'" - # FIX ME - set sql_query [db_map gsp_get_sort_paths] " - select - o.object_id as item_id, - o.object_type || ': ' || acs_object.name(o.object_id) as item_path, - o.object_type as item_type - from - acs_objects o, parties p - where - o.object_id = p.party_id - and - o.object_id in ($sql_id_list) - order by - item_path" + set sql_query [db_map gsp_get_sort_paths] + upvar __sql sql_query uplevel "template::query $name multirow \{$__sql\} -eval \{$eval_code\}" } Index: openacs-4/packages/cms/tcl/pagination-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/pagination-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/cms/tcl/pagination-procs.tcl 10 Aug 2001 15:03:28 -0000 1.3 +++ openacs-4/packages/cms/tcl/pagination-procs.tcl 11 Aug 2001 17:40:26 -0000 1.4 @@ -19,18 +19,8 @@ set rows_per_page [pagination::get_rows_per_page] set start_row [expr $rows_per_page*[expr $page-1]+1] - #FIX ME - set query [db_map pq_paginate_query] " - select * - from - ( - select - x.*, rownum as row_id - from - ($sql) x - ) ordered_sql_query_with_row_id - where - row_id between $start_row and $start_row + $rows_per_page - 1" + + set query [db_map pq_paginate_query] return $query } Index: openacs-4/packages/cms/tcl/perm-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/perm-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cms/tcl/perm-procs.tcl 10 Aug 2001 15:03:28 -0000 1.2 +++ openacs-4/packages/cms/tcl/perm-procs.tcl 11 Aug 2001 17:40:26 -0000 1.3 @@ -142,7 +142,6 @@ upvar perm_form_name form_name set form_name $form_name_in - # FIX ME set sql [db_map pfg_get_permission_boxes] upvar __sql sql @@ -154,35 +153,7 @@ set permission_options [list] set permission_values [list] - template::query permission_boxes multirow $__sql " - select - t.child_privilege as privilege, - lpad(' ', t.tree_level * 24, ' ') || - NVL(p.pretty_name, t.child_privilege) as label, - cms_permission.permission_p( - :object_id, :grantee_id, t.child_privilege - ) as permission_p, - cms_permission.permission_p ( - :object_id, :grantee_id, t.privilege - ) as parent_permission_p - from ( - select privilege, child_privilege, level as tree_level - from acs_privilege_hierarchy - connect by privilege = prior child_privilege - start with privilege = 'cm_root' - ) t, acs_privileges p - where - p.privilege = t.child_privilege - and ( - cms_permission.has_grant_authority ( - :object_id, :user_id, t.child_privilege - ) = 't' - or - cms_permission.has_revoke_authority ( - :object_id, :user_id, t.child_privilege, :grantee_id - ) = 't' - ) - " -eval { + template::query pfg_execute_gpb permission_boxes multirow $__sql -eval { if { [string equal $row(parent_permission_p) f] } { lappend permission_options [list $row(label) $row(privilege)] if { [string equal $row(permission_p) t] && $is_request } { @@ -225,7 +196,7 @@ upvar perm_form_name form_name set form_name $form_name_in - # FIX ME + set sql_grant [db_map pfp_grant_permission_1] set sql_revoke [db_map pfp_revoke_permission_1] upvar __sql_grant sql_grant @@ -246,27 +217,10 @@ foreach pair $permission_options { set privilege [lindex $pair 1] if { [lsearch $permission_values $privilege] >= 0 } { - template::query pfp_grant_permission grant_permission dml $__sql_grant " - begin - cms_permission.grant_permission ( - item_id => :object_id, - holder_id => :user_id, - privilege => :privilege, - recepient_id => :grantee_id, - is_recursive => :pf_is_recursive - ); - end;" + template::query pfp_grant_permission grant_permission dml $__sql_grant + } else { - template::query pfp_revoke_permission revoke_permission dml $__sql_revoke" - begin - cms_permission.revoke_permission ( - item_id => :object_id, - holder_id => :user_id, - privilege => :privilege, - revokee_id => :grantee_id, - is_recursive => :pf_is_recursive - ); - end;" + template::query pfp_revoke_permission revoke_permission dml $__sql_revoke } } Index: openacs-4/packages/cms/tcl/rel-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/rel-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cms/tcl/rel-procs.tcl 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/cms/tcl/rel-procs.tcl 11 Aug 2001 17:40:26 -0000 1.2 @@ -16,35 +16,35 @@ # @param item_id The item for which to resort related items -proc cms_rel::sort_related_item_order { item_id } { +ad_proc cms_rel::sort_related_item_order { item_id } { - set db [template::begin_db_transaction] + db_transaction { - # grab all related items ordered by order_n, rel_id - template::query related_items onelist " - select - rel_id - from - cr_item_rels - where - item_id = :item_id - order by - order_n, rel_id - " -db $db + # grab all related items ordered by order_n, rel_id + template::query srio_get_related_items related_items onelist " + select + rel_id + from + cr_item_rels + where + item_id = :item_id + order by + order_n, rel_id + " - # assign each related items a new order_n - set i 0 - foreach rel_id $related_items { + # assign each related items a new order_n + set i 0 + foreach rel_id $related_items { - ns_ora dml $db " - update cr_item_rels - set order_n = :i - where rel_id = :rel_id" + db_dml " + update cr_item_rels + set order_n = :i + where rel_id = :rel_id" - incr i - } + incr i + } - template::end_db_transaction + } } @@ -59,33 +59,33 @@ # @param item_id The item for which to resort child items -proc cms_rel::sort_child_item_order { item_id } { +ad_proc cms_rel::sort_child_item_order { item_id } { - set db [template::begin_db_transaction] + db_transaction { - # grab all related items ordered by order_n, rel_id - template::query child_items onelist " - select - rel_id - from - cr_child_rels - where - parent_id = :item_id - order by - order_n, rel_id - " -db $db + # grab all related items ordered by order_n, rel_id + template::query scio_get_child_order child_items onelist " + select + rel_id + from + cr_child_rels + where + parent_id = :item_id + order by + order_n, rel_id + " - # assign each related items a new order_n - set i 0 - foreach rel_id $child_items { + # assign each related items a new order_n + set i 0 + foreach rel_id $child_items { - ns_ora dml $db " - update cr_child_rels - set order_n = :i - where rel_id = :rel_id" + db_dml " + update cr_child_rels + set order_n = :i + where rel_id = :rel_id" - incr i - } + incr i + } - template::end_db_transaction + } } Index: openacs-4/packages/cms/tcl/user-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cms/tcl/user-procs.tcl 27 May 2001 04:39:19 -0000 1.2 +++ openacs-4/packages/cms/tcl/user-procs.tcl 11 Aug 2001 17:40:26 -0000 1.3 @@ -27,7 +27,7 @@ # get the name of the current user. - proc getName { { which "full" } } { + ad_proc getName { { which "full" } } { switch $which { @@ -37,24 +37,23 @@ } set user_id [ad_util_get_cookie acs_user] - set query "select + + return [db_string gn_get_name "select $col from persons where - person_id = [getID]" - - return [ad_dbquery onevalue $query] + person_id = [getID]"] } # a cms admin exists if a user has the 'cm_admin' privilege # on the CMS pages root folder - proc cms_admin_exists {} { + ad_proc cms_admin_exists {} { - template::query admin_exists onevalue " + template::query cae_admin_exists admin_exists onevalue " select content_permission.cm_admin_exists from dual" if { [string equal $admin_exists t] } { Index: openacs-4/packages/cms/tcl/widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/widget-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cms/tcl/widget-procs.tcl 27 May 2001 04:39:19 -0000 1.2 +++ openacs-4/packages/cms/tcl/widget-procs.tcl 11 Aug 2001 17:40:26 -0000 1.3 @@ -222,12 +222,14 @@ # @param content_type The content type to which the attribute belongs # @param attribute_name The name of the attribute -proc widget::process_param { form order content_type attribute_name } { +ad_proc widget::process_param { form order content_type attribute_name } { template::form get_values $form \ param_$order param_type_$order \ param_source_$order param_value_$order - set sql " + set sql + + db_dml pp_proces_param " begin cm_form_widget.set_attribute_param_value ( content_type => :content_type, @@ -238,8 +240,6 @@ value => :param_value_$order ); end;" - - ns_ora dml $db $sql } Index: openacs-4/packages/cms/tcl/workflow-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/workflow-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/cms/tcl/workflow-procs.tcl 27 May 2001 04:39:19 -0000 1.2 +++ openacs-4/packages/cms/tcl/workflow-procs.tcl 11 Aug 2001 17:40:26 -0000 1.3 @@ -10,13 +10,12 @@ # @author Michael Pih -# @param db A database handle # @param case_id The publishing workflow # @param user_id The From: user when sending the email -proc workflow::notify_of_assignments { case_id user_id } { +ad_proc workflow::notify_of_assignments { case_id user_id } { - template::query assignments multilist " + template::query noa_get_assignments assignments multilist " select transition_name, party_id, content_item.get_title(i.item_id) title, @@ -61,7 +60,7 @@ This task is due on $deadline_pretty. " - ns_ora exec_plsql_bind $db " + db_exec_plsql " begin :request_id := nt.post_request( party_from => :user_id, @@ -71,7 +70,7 @@ message => :message ); end; - " request_id + " -bind request_id } } @@ -85,13 +84,12 @@ # @author Michael Pih -# @param db A database handle # @param case_id The workflow of an item # @param transition_key The name of the task -proc workflow::notify_admin_of_new_tasks { db case_id transition_key } { +ad_proc workflow::notify_admin_of_new_tasks { case_id transition_key } { - template::query assignments multilist " + template::query naont_get_assignments assignments multilist " select o.creation_user as admin_id, transition_name, party_id, content_item.get_title(i.item_id) title, @@ -123,7 +121,7 @@ c.object_id = i.item_id and c.case_id = o.object_id - " -db $db + " foreach assignment $assignments { set admin_id [lindex $assignment 0] @@ -142,7 +140,7 @@ This task is due on $deadline_pretty. " - ns_ora exec_plsql_bind $db " + db_exec_plsql " begin request_id := nt.post_request( party_from => -1, @@ -152,7 +150,7 @@ message => :message ); end; - " request_id + " -bind request_id } } @@ -165,19 +163,18 @@ # @author Michael Pih -# @param db A database handle # @param task_id The task -proc workflow::notify_admin_of_finished_task { task_id } { +ad_proc workflow::notify_admin_of_finished_task { task_id } { # the user who finished the task set user_id [User::getID] - template::query name onevalue " + template::query naoft_get_name name onevalue " select person.name( :user_id ) from dual " # get the task name, the creation_user, title, and date of the item - template::query task_info onerow " + template::query naoft_get_task_info task_info onerow " select transition_name, content_item.get_title(i.item_id) as title, @@ -210,7 +207,7 @@ set message "Dear $admin_name, $name has completed the task: $transition_name of $title on $today." - ns_ora exec_plsql_bind $db " + db_exec_plsql $db " begin :request_id := nt.post_request( party_from => -1, @@ -220,7 +217,7 @@ message => :message ); end; - " request_id + " -bind request_id } @@ -232,7 +229,6 @@ # @author Michael Pih -# @param db A database handle # @param item_id The item on which to check permissions # @param show_error t Flag indicating whether to display an error message # or return t @@ -241,16 +237,16 @@ # then returns t if the current user has permission to access the item, f # if not -proc workflow::check_wf_permission { db item_id {show_error t}} { +ad_proc workflow::check_wf_permission { item_id {show_error t}} { set user_id [User::getID] - template::query can_touch onevalue " + template::query cwp_touch_info can_touch onevalue " select content_workflow.can_touch( :item_id, :user_id ) from dual - " -db $db + " if { [string equal $can_touch t] } { return t