Index: openacs-4/contrib/packages/bcms/tcl/bcms-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/tcl/bcms-item-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/contrib/packages/bcms/tcl/bcms-item-procs.tcl 22 Sep 2003 07:32:52 -0000 1.4 +++ openacs-4/contrib/packages/bcms/tcl/bcms-item-procs.tcl 4 Oct 2003 08:53:05 -0000 1.5 @@ -122,7 +122,6 @@ ad_proc -public bcms::item::list_items { -parent_id:required {-revision latest} - {-content_type content_revision} {-multirow_name bcms_list_items} {-return_list:boolean false} {-additional_columns} @@ -133,7 +132,6 @@ @param parent_id id of the which contents you wish to list, normally a folder @param revision returns items that have live or latest revision under the parent_id - @param content_type @param multirow_name you can supply your own multirow name @param return_list if supplied a list of ns_sets otherwise it returns a multirow uses the multirow_name if given @@ -159,9 +157,7 @@ # if additional revision data must be returned, set the additional columns here # for revisions. - # lets get the view for the content type - db_1row get_table_name "SQL" - set addtnl_from ", ${table_name}x r" + set addtnl_from "" switch -exact $revision { latest { lappend addtnl_where_list "i.latest_revision = r.revision_id" } @@ -174,11 +170,6 @@ } } - # pick a particular content type - if [info exists content_type] { - lappend addtnl_where_list "content_type = :content_type" - } - # show only a subset of item_id if [info exists show_only] { lappend addtnl_where_list "i.item_id in ($show_only)" @@ -344,7 +335,7 @@ {-root_id:required} {-url:required} {-revision} - {-resolve_index:boolean false} + {-resolve_index:boolean} } { get the content item details based from the url. @@ -375,6 +366,8 @@ array unset yourarray. } { + if {$resolve_index_p} { set resolve_index true } else { set resolve_index false } + set item_id [db_exec_plsql get_item_id "SQL"] if [string equal $item_id ""] {