Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl,v
diff -u -r1.84 -r1.85
--- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl	16 Jun 2006 11:49:40 -0000	1.84
+++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl	21 Jul 2006 17:54:53 -0000	1.85
@@ -40,12 +40,6 @@
 #     }
 # }
 
-if { [exists_and_not_null show_hidden] } {
-    set show_hidden_p $show_hidden
-} else {
-    set show_hidden_p f
-}
-
 set filter_list [list category_f]
 
 set form [rp_getform]
@@ -104,37 +98,22 @@
 set show_used_categories_only_p [parameter::get -package_id [ad_conn package_id] -parameter ShowUsedCategoriesOnlyP -default "0"]
 
 if { $show_used_categories_only_p } {
-    if { [exists_and_not_null show_hidden] } {
-	set categories_show_hidden $show_hidden
-    } else {
-	set categories_show_hidden f
-    }
-
     set used_categories [db_list used_categories {
 	select distinct category_id
 	from (
 
 	      select category_id
 	      from categories c
 	      where exists (select 1
-			    from category_object_map m, cr_revisions r, dotlrn_ecommerce_section s, ec_custom_product_field_values v
+			    from category_object_map
 			    where category_id in (select category_id
 						  from categories
 						  where left_ind > c.left_ind
-						  and right_ind < c.right_ind)
-			    and m.object_id = r.revision_id
-			    and r.item_id = s.course_id
-			    and s.product_id = v.product_id
-			    and (v.display_section_p is null or v.display_section_p = 't' or :show_hidden_p = 't'))
-
+						  and right_ind < c.right_ind))
 	      union
 
 	      select category_id
-	      from category_object_map m, cr_revisions r, dotlrn_ecommerce_section s, ec_custom_product_field_values v
-	      where m.object_id = r.revision_id
-	      and r.item_id = s.course_id
-	      and s.product_id = v.product_id
-	      and (v.display_section_p is null or v.display_section_p = 't' or :show_hidden_p = 't')
+	      from category_object_map
 
 	      ) c
     }]
@@ -231,19 +210,9 @@
     set _instructors 0
     set instructors_filter ""
 } else {
-    set active_instructors [db_list get_active_instructors {
-	select distinct r.user_id
-	from dotlrn_ecommerce_section s, ec_custom_product_field_values v, dotlrn_member_rels_approved r
-	where s.product_id = v.product_id
-	and s.community_id = r.community_id
-	and (v.display_section_p is null or v.display_section_p = 't' or :show_hidden_p = 't')
-	and r.rel_type = 'dotlrn_ecom_instructor_rel'
-    }]
     foreach _instructor $_instructors {
 	lappend __instructors [ns_set get $_instructor user_id]
-	if { ! $show_used_categories_only_p || [lsearch -integer -exact $active_instructors [ns_set get $_instructor user_id]] != -1 } {
-	    lappend instructors_filter [list "[ns_set get $_instructor first_names] [ns_set get $_instructor last_name]" [ns_set get $_instructor user_id]]
-	}
+	lappend instructors_filter [list "[ns_set get $_instructor first_names] [ns_set get $_instructor last_name]" [ns_set get $_instructor user_id]]
     }
 }
 
@@ -282,7 +251,6 @@
     set show_hidden f
     set hidden_filter_hide_p 1
 }
-
 lappend filters show_hidden [list hide_p $hidden_filter_hide_p label [_ dotlrn-ecommerce.Hidden_Courses] values { {[_ dotlrn-ecommerce.Show] t} } where_clause ""]
 
 if { ![exists_and_not_null show_hidden] || $show_hidden ne "t" } {