Index: openacs-4/packages/ecommerce/www/admin/cat/category-add-0.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-add-0.tcl,v
diff -u -N -r1.3 -r1.3.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/category-add-0.tcl	10 Sep 2002 22:22:38 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/cat/category-add-0.tcl	15 Jan 2004 05:40:43 -0000	1.3.6.1
@@ -19,7 +19,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_categories
Index: openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl,v
diff -u -N -r1.4 -r1.4.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl	18 Sep 2002 21:33:47 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl	15 Jan 2004 05:40:43 -0000	1.4.6.1
@@ -46,7 +46,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_categories
Index: openacs-4/packages/ecommerce/www/admin/cat/category-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-add.tcl,v
diff -u -N -r1.4 -r1.4.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/category-add.tcl	10 Sep 2002 22:22:38 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/cat/category-add.tcl	15 Jan 2004 05:40:43 -0000	1.4.6.1
@@ -21,7 +21,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_categories
Index: openacs-4/packages/ecommerce/www/admin/cat/category-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-delete.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/category-delete.tcl	10 Sep 2002 22:22:38 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/cat/category-delete.tcl	15 Jan 2004 05:40:43 -0000	1.2.6.1
@@ -19,7 +19,7 @@
 
 <h2>Confirm Deletion</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] "Delete this Category"]
+[ad_context_bar [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] "Delete this Category"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/category.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/category.tcl	10 Sep 2002 22:22:38 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/cat/category.tcl	15 Jan 2004 05:40:43 -0000	1.2.6.1
@@ -21,7 +21,7 @@
 
 <h2>Category: $category_name</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Categories &amp; Subcategories"] "One Category"]
+[ad_context_bar [list "index" "Categories &amp; Subcategories"] "One Category"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/index.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/index.tcl	10 Sep 2002 22:22:38 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/cat/index.tcl	15 Jan 2004 05:40:43 -0000	1.2.6.1
@@ -10,7 +10,7 @@
 
 <h2>Product Category Administration</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] "Product Categories"]
+[ad_context_bar "Product Categories"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-0.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-0.tcl,v
diff -u -N -r1.3 -r1.3.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-0.tcl	10 Sep 2002 22:22:38 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-0.tcl	15 Jan 2004 05:40:43 -0000	1.3.6.1
@@ -27,7 +27,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_subcategories
@@ -47,7 +47,7 @@
 
 <h2>Add a New Subcategory</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Product Categories"] [list "category?[export_url_vars category_id category_name]" $category_name] "Add a New Subcategory"]
+[ad_context_bar [list "index" "Product Categories"] [list "category?[export_url_vars category_id category_name]" $category_name] "Add a New Subcategory"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl,v
diff -u -N -r1.4 -r1.4.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl	18 Sep 2002 21:33:47 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl	15 Jan 2004 05:40:43 -0000	1.4.6.1
@@ -53,7 +53,7 @@
     ### gilbertw - added do the calculation outside of the db.  	
     #   PostgreSQL encloses the bind variables in ' '
     #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-    set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+    set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
     set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_subcategories
Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-add.tcl,v
diff -u -N -r1.4 -r1.4.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subcategory-add.tcl	10 Sep 2002 22:22:38 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-add.tcl	15 Jan 2004 05:40:43 -0000	1.4.6.1
@@ -30,7 +30,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_subcategories
@@ -50,7 +50,7 @@
 
 <h2>Confirm New Subcategory</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] "Confirm New Subcategory"]
+[ad_context_bar [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] "Confirm New Subcategory"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete.tcl	10 Sep 2002 22:22:38 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete.tcl	15 Jan 2004 05:40:43 -0000	1.2.6.1
@@ -23,7 +23,7 @@
 
 <h2>Confirm Deletion</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] [list "subcategory?[export_url_vars subcategory_id subcategory_name category_id category_name]" $subcategory_name] "Delete this Subcategory"]
+[ad_context_bar [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] [list "subcategory?[export_url_vars subcategory_id subcategory_name category_id category_name]" $subcategory_name] "Delete this Subcategory"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl	10 Sep 2002 22:22:38 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/cat/subcategory.tcl	15 Jan 2004 05:40:43 -0000	1.2.6.1
@@ -21,7 +21,7 @@
 
 <h2>Subcategory: $subcategory_name</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] "One Subcategory"]
+[ad_context_bar [list "category?[export_url_vars category_id category_name]" $category_name] "One Subcategory"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-0.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-0.tcl,v
diff -u -N -r1.3 -r1.3.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-0.tcl	10 Sep 2002 22:22:38 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-0.tcl	15 Jan 2004 05:40:43 -0000	1.3.6.1
@@ -29,7 +29,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_subsubcategories
@@ -50,7 +50,7 @@
 
 <h2>Add a New Subsubcategory</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Product Categories"] [list "category?[export_url_vars category_id category_name]" $category_name] [list "subcategory?[export_url_vars category_id category_name subcategory_id subcategory_name]" $subcategory_name] "Add a New Subsubcategory"]
+[ad_context_bar [list "index" "Product Categories"] [list "category?[export_url_vars category_id category_name]" $category_name] [list "subcategory?[export_url_vars category_id category_name subcategory_id subcategory_name]" $subcategory_name] "Add a New Subsubcategory"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl,v
diff -u -N -r1.4 -r1.4.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl	18 Sep 2002 21:33:47 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl	15 Jan 2004 05:40:43 -0000	1.4.6.1
@@ -57,7 +57,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_subsubcategories
Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add.tcl,v
diff -u -N -r1.4 -r1.4.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add.tcl	10 Sep 2002 22:22:38 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add.tcl	15 Jan 2004 05:40:43 -0000	1.4.6.1
@@ -33,7 +33,7 @@
 ### gilbertw - added do the calculation outside of the db.  PostgreSQL encloses
 #   the bind variables in ' '
 #  where sort_key = (:prev_sort_key + :next_sort_key)/2
-set sort_key [expr ($prev_sort_key + $next_sort_key)/2]
+set sort_key [expr (double($prev_sort_key) + $next_sort_key)/2]
 
 set n_conflicts [db_string get_n_conflicts "select count(*)
 from ec_subsubcategories
@@ -54,7 +54,7 @@
 
 <h2>Confirm New Subsubcategory</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Categories &amp; Subcategories"] "Confirm New Subsubcategory"]
+[ad_context_bar [list "index" "Categories &amp; Subcategories"] "Confirm New Subsubcategory"]
 
 <hr>
 
Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory.tcl,v
diff -u -N -r1.2 -r1.2.6.1
--- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory.tcl	10 Sep 2002 22:22:38 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory.tcl	15 Jan 2004 05:40:43 -0000	1.2.6.1
@@ -27,7 +27,7 @@
 
 <h2>Subsubcategory: $subsubcategory_name</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] [list "subcategory?[export_url_vars category_id category_name subcategory_id subcategory_name]" $subcategory_name] "One Subsubcategory"]
+[ad_context_bar  [list "index" "Categories &amp; Subcategories"] [list "category?[export_url_vars category_id category_name]" $category_name] [list "subcategory?[export_url_vars category_id category_name subcategory_id subcategory_name]" $subcategory_name] "One Subsubcategory"]
 
 <hr>