Index: openacs-4/packages/bookshelf/tcl/bookshelf-books-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/tcl/bookshelf-books-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/bookshelf/tcl/bookshelf-books-procs.tcl 30 Sep 2002 18:10:55 -0000 1.1 +++ openacs-4/packages/bookshelf/tcl/bookshelf-books-procs.tcl 20 Mar 2004 18:32:02 -0000 1.2 @@ -184,7 +184,7 @@ acs_objects o on (o.object_id = b.book_id) join cc_users u on (u.user_id = o.creation_user) where book_no = :book_no - and package_id = :package_id + and b.package_id = :package_id } -column_array row } } Index: openacs-4/packages/bookshelf/www/bookshelf-include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/bookshelf-include.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/bookshelf/www/bookshelf-include.tcl 7 Nov 2003 17:35:42 -0000 1.2 +++ openacs-4/packages/bookshelf/www/bookshelf-include.tcl 20 Mar 2004 18:32:04 -0000 1.3 @@ -29,7 +29,7 @@ from bookshelf_books b join acs_objects o on (o.object_id = b.book_id) join cc_users u on (u.user_id = o.creation_user) - where package_id = :package_id + where b.package_id = :package_id and publish_status = 'publish' order by bookshelf_book__read_status_sort_order(b.read_status) desc, o.creation_date desc } { Index: openacs-4/packages/bookshelf/www/bookshelf-titles-include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/bookshelf-titles-include.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/bookshelf/www/bookshelf-titles-include.tcl 7 Nov 2003 17:35:42 -0000 1.2 +++ openacs-4/packages/bookshelf/www/bookshelf-titles-include.tcl 20 Mar 2004 18:32:04 -0000 1.3 @@ -27,7 +27,7 @@ from bookshelf_books b join acs_objects o on (o.object_id = b.book_id) join cc_users u on (u.user_id = o.creation_user) - where package_id = :package_id + where b.package_id = :package_id and publish_status = 'publish' order by bookshelf_book__read_status_sort_order(b.read_status), o.creation_date desc } { Index: openacs-4/packages/bookshelf/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/index.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/bookshelf/www/index.tcl 7 Nov 2003 17:35:42 -0000 1.2 +++ openacs-4/packages/bookshelf/www/index.tcl 20 Mar 2004 18:32:04 -0000 1.3 @@ -29,7 +29,7 @@ set page_title $instance_name set human_readable_filter "All books" -set where_clauses [list "package_id = :package_id"] +set where_clauses [list "b.package_id = :package_id"] set filters_p 0 if { [info exists read_status] } {