Index: openacs-4/packages/cms/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/form-procs.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/cms/tcl/form-procs.tcl 17 Sep 2002 21:43:09 -0000 1.20 +++ openacs-4/packages/cms/tcl/form-procs.tcl 18 Sep 2002 03:58:40 -0000 1.21 @@ -1493,16 +1493,21 @@ query { #set content_type content_revision set item_id {} - switch $param(param_type) { - onevalue { - set value [db_string set_content_values $param(value)] + if [catch { + switch $param(param_type) { + + onevalue { + set value [db_string set_content_values $param(value)] + } + onelist { + set value [db_list set_content_values $param(value)] + } + multilist { + set value [db_list_of_lists set_content_values $param(value)] + } } - onelist { - set value [db_list set_content_values $param(value)] - } - multilist { - set value [db_list_of_lists set_content_values $param(value)] - } + }] { + set value "" } } default { 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.8 -r1.9 --- openacs-4/packages/cms/tcl/item-procs.tcl 12 Sep 2002 22:56:00 -0000 1.8 +++ openacs-4/packages/cms/tcl/item-procs.tcl 18 Sep 2002 03:58:40 -0000 1.9 @@ -29,7 +29,7 @@ } { - set live_revision [db_string glr_get_live_revision ""] + set live_revision [db_string glr_get_live_revision "" -default ""] if { [template::util::is_nil live_revision] } { ns_log notice "WARNING: No live revision for item $item_id" Index: openacs-4/packages/cms/tcl/item-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/item-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/cms/tcl/item-procs.xql 17 Sep 2001 05:16:40 -0000 1.3 +++ openacs-4/packages/cms/tcl/item-procs.xql 18 Sep 2002 03:58:40 -0000 1.4 @@ -64,4 +64,15 @@ + + + + + select live_revision from cr_items + where item_id = :item_id + + + + + Index: openacs-4/packages/cms/www/modules/items/attributes.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/cms/www/modules/items/attributes.tcl 16 Aug 2002 03:57:48 -0000 1.5 +++ openacs-4/packages/cms/www/modules/items/attributes.tcl 18 Sep 2002 03:58:43 -0000 1.6 @@ -39,7 +39,7 @@ set content_type $type_info(object_type) -db_multirow attributes get_attributes ""{ +db_multirow attributes get_attributes "" { if { [catch { set value $info($attribute_name) } errmsg] } { # catch - value doesn't exist Index: openacs-4/packages/cms/www/modules/items/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/items/index.tcl 16 Aug 2002 03:57:48 -0000 1.3 +++ openacs-4/packages/cms/www/modules/items/index.tcl 18 Sep 2002 03:58:43 -0000 1.4 @@ -34,7 +34,8 @@ -return_url "modules/sitemap/index" # query the content_type of the item ID so we can check for a custom info page -db_1row get_info "" +db_1row get_info "" -column_array info +template::util::array_to_vars info # build the path to the custom interface directory for this content type Index: openacs-4/packages/cms/www/modules/items/keywords.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/keywords.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/items/keywords.tcl 16 Aug 2002 03:57:48 -0000 1.3 +++ openacs-4/packages/cms/www/modules/items/keywords.tcl 18 Sep 2002 03:58:43 -0000 1.4 @@ -15,6 +15,6 @@ set name [db_string get_name ""] -db_multirow get_keywords "" +db_multirow keywords get_keywords "" set page_title "Content Keywords for $name" Index: openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl 19 Aug 2002 03:54:52 -0000 1.5 +++ openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl 18 Sep 2002 03:58:44 -0000 1.6 @@ -74,7 +74,7 @@ # get all the parent_id's of the items being deleted # because we need to flush the paginator cache for each of # these folders - set flush_list [db_list get_flush_list ""] + set flush_list [db_list get_list ""] # set up the call to the proper PL/SQL delete procedure if { [string equal $is_symlink "t"] } { Index: openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql 8 Dec 2001 01:18:00 -0000 1.3 +++ openacs-4/packages/cms/www/modules/types/relation-register-postgresql.xql 18 Sep 2002 03:58:45 -0000 1.4 @@ -8,10 +8,11 @@ select - lpad(' ', tree_level(tree_sortkey), '-') || pretty_name, object_type + lpad(' ', tree_level(ot1.tree_sortkey), '-') || ot1.pretty_name, + ot1.object_type from acs_object_types ot1, acs_object_types ot2 - where ot2.object_type = 'content_revision') + where ot2.object_type = 'content_revision' and ot1.tree_sortkey between ot2.tree_sortkey and tree_right(ot2.tree_sortkey)