Index: openacs-4/packages/ecommerce/www/category-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/ecommerce/www/category-browse.tcl	28 Apr 2008 14:46:26 -0000	1.14
+++ openacs-4/packages/ecommerce/www/category-browse.tcl	9 Aug 2008 11:57:43 -0000	1.15
@@ -31,34 +31,13 @@
     ad_script_abort
 }
 
-proc ident {x} {
-    return $x
-}
-
-proc have {var} { 
-    upvar $var x
-    return [expr {[info exists x] && [string compare $x "0"] != 0}]
-}
-
-proc in_subcat    {} {
-    return [uplevel {have subcategory_id}]
-}
-
-proc in_subsubcat {} {
-    return [uplevel {have subsubcategory_id}]
-}
-
-proc at_bottom_level_p {} {
-    return [uplevel in_subsubcat]
-}
-
 set sub ""
-if {[in_subcat]} {
+if {[ec_insubcat]} {
     append sub "sub"
 } else {
     set subcategory_id 0
 }
-if {[in_subsubcat]} {
+if {[ec_in_subsubcat]} {
     append sub "sub"
 } else {
     set subsubcategory_id 0
@@ -106,15 +85,15 @@
     where category_id=:category_id"]
 
 set subcategory_name ""
-if [have subcategory_id] {
+if [ec_have subcategory_id] {
     set subcategory_name [db_string -cache_key "ec-subcategory_name-${subcategory_id}" get_subcat_name "
 	select subcategory_name
 	from ec_subcategories
 	where subcategory_id = :subcategory_id"]
 }
 
 set subsubcategory_name ""
-if [have subsubcategory_id] {
+if [ec_have subsubcategory_id] {
     set subsubcategory_name [db_string get_subsubcat_name -cache_key "ec-subsubcategory_name-${subsubcategory_id}" "
 	select subsubcategory_name
 	from ec_subsubcategories 
@@ -167,7 +146,7 @@
 
 # All products in the "category" and not in "subcategories" (used in xql subst)
 set exclude_subproducts ""
-if ![at_bottom_level_p] {
+if ![ec_at_bottom_level_p] {
     set exclude_subproducts "
 	and not exists (select 'x' from $product_map(sub$sub) s, ec_sub${sub}categories c
 			where p.product_id = s.product_id
@@ -220,16 +199,16 @@
 #==============================
 # subcategories
 
-if ![at_bottom_level_p] {
+if ![ec_at_bottom_level_p] {
 
     db_multirow -extend { url name } -cache_key "ec-${sub}subcategories-${cat_id}" subcategories get_subcategories "see xql" {
         set url [export_vars -base "category-browse-sub${sub}category" {category_id subcategory_id subsubcategory_id}]
-        set name [eval "ident \$sub${sub}category_name"] ; # what is this ident?
+        set name [eval "ec_ident \$sub${sub}category_name"] 
     }
 }
 
-set the_category_id   [eval "ident \$${sub}category_id"]
-set the_category_name [eval "ident \$${sub}category_name"]
+set the_category_id   [eval "ec_ident \$${sub}category_id"]
+set the_category_name [eval "ec_ident \$${sub}category_name"]
 set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $the_category_name]]]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles