Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl	12 Aug 2008 12:30:43 -0000	1.13
+++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl	20 Dec 2008 12:17:00 -0000	1.14
@@ -19,7 +19,7 @@
     subcategory_id:optional,naturalnum
     subsubcategory_id:optional,naturalnum
     {how_many:naturalnum {[ad_parameter -package_id [ec_id] ProductsToDisplayPerPage ecommerce]}}
-    {start_row:naturalnum "0"}
+    {start_row:naturalnum "1"}
     usca_p:optional
 }
 
@@ -59,16 +59,19 @@
     db_dml grab_new_session_id "insert into ec_user_session_info (user_session_id, category_id) values (:user_session_id, :category_id)"
 }
 
-set category_name [db_string get_category_name "select category_name from ec_categories where category_id=:category_id"]
+set category_name_txt [db_string get_category_name "select category_name from ec_categories where category_id=:category_id"]
+regsub -all -- {&} $category_name_txt {\&} category_name
 
 set subcategory_name ""
 if [ec_have subcategory_id] {
-    set subcategory_name [db_string get_subcat_name "select subcategory_name from ec_subcategories where subcategory_id=:subcategory_id"]
+    set subcategory_name_txt [db_string get_subcat_name "select subcategory_name from ec_subcategories where subcategory_id=:subcategory_id"]
+    regsub -all -- {&} $subcategory_name_txt {\&} subcategory_name
 }
 
 set subsubcategory_name ""
 if [ec_have subsubcategory_id] {
-    set subsubcategory_name [db_string get_subsubcat_name "select subsubcategory_name from ec_subsubcategories where subsubcategory_id=:subsubcategory_id"]
+    set subsubcategory_name_txt [db_string get_subsubcat_name "select subsubcategory_name from ec_subsubcategories where subsubcategory_id=:subsubcategory_id"]
+    regsub -all -- {&} $subsubcategory_name_txt {\&} subsubcategory_name
 }
 
 #==============================
@@ -114,6 +117,8 @@
 #==============================
 # products
 
+set start_db_row [expr { $start_row - 1 } ]
+
 # All products in the "category" and not in "subcategories"
 
 set exclude_subproducts ""
@@ -161,12 +166,16 @@
 # if start_row < how_many, then we can assume it is the first page and so no Previous link.
 if { $start_row >= $how_many } {
     set prev_url [export_vars -base [ad_conn url] -override {{start_row {[expr $start_row - $how_many]}}} {category_id subcategory_id subsubcategory_id how_many}]
+    regsub -all -- {&amp;} $prev_url {&} prev_url
+    regsub -all -- {&} $prev_url {&amp;} prev_url
 }
 
 set how_many_more [expr $count - $start_row - $how_many + 1]
 
 if { $how_many_more > 0 } {
     set next_url [export_vars -base [ad_conn url] -override {{start_row {[expr $start_row + $how_many]}}} {category_id subcategory_id subsubcategory_id how_many}]
+    regsub -all -- {&amp;} $next_url {&} next_url
+    regsub -all -- {&} $next_url {&amp;} next_url
 
     if { $how_many_more >= $how_many } {
         set how_many_next $how_many
@@ -196,13 +205,16 @@
     
     append subcategories "<li><a href=category-browse-sub${sub}category?[export_url_vars category_id subcategory_id subsubcategory_id]>[eval "ec_ident \$sub${sub}category_name"]</a>"
 }
+    regsub -all -- {&amp;} $subcategories {&} subcategories
+    regsub -all -- {&} $subcategories {&amp;} subcategories
+
 }
 
 set the_category_id $category_id
 set the_category_name [eval "ec_ident \$${sub}category_name"]
 set category_url "category-browse?category_id=${category_id}"
-set subcategory_url "category-browse-subcategory?category_id=${category_id}&subcategory_id=${subcategory_id}"
-set title "$category_name : $subcategory_name : $the_category_name"
+set subcategory_url "category-browse-subcategory?category_id=${category_id}&amp;subcategory_id=${subcategory_id}"
+set title "$category_name_txt : $subcategory_name_txt : $the_category_name"
 set context [list [list $category_url $category_name] [list $subcategory_url $subcategory_name] $the_category_name]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles