Index: openacs-4/contrib/packages/classified-ads/tcl/ads-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/tcl/ads-procs.xql,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/contrib/packages/classified-ads/tcl/ads-procs.xql	29 Jul 2003 09:10:42 -0000	1.6
+++ openacs-4/contrib/packages/classified-ads/tcl/ads-procs.xql	18 Jan 2004 10:36:42 -0000	1.6.2.1
@@ -19,7 +19,10 @@
                   ci.parent_id = :parent_id and
                   ci.content_type = 'ca_ad' and
 		  cm.keyword_id = :category_id and
-		  ci.item_id = ads.ad_id
+		  -- RBM (2004-01-17) - Dont remember why this was being compared to 
+		  -- item_id
+		  -- ci.item_id = ads.ad_id
+		  ci.latest_revision = ads.ad_id
             order by cm.keyword_id asc,
                      cr.title asc
 
Index: openacs-4/contrib/packages/classified-ads/www/categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/categories.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/contrib/packages/classified-ads/www/categories.tcl	21 Jul 2003 16:08:07 -0000	1.2
+++ openacs-4/contrib/packages/classified-ads/www/categories.tcl	18 Jan 2004 10:36:42 -0000	1.2.2.1
@@ -12,14 +12,14 @@
 }
 
 set root_folder_id [classified-ads::get_root_folder_id]
-set package_category_id [classified-ads::categories::package_category_exists_p]
+set package_category_id [classified-ads::categories::get_package_keyword_id]
 set package_category_p 0
 set title "Categories"
 
 if {[empty_string_p $keyword_id]} {
     set keyword_id $package_category_id
     set package_category_p 1
-} elseif {[string equal [classified-ads::main_keyword_exists_p] $keyword_id]} {
+} elseif {[string equal [classified-ads::get_main_keyword_id] $keyword_id]} {
     ad_return_complaint 1 "<li> No access to the root id"
     ad_script_abort
 } else {
@@ -35,7 +35,7 @@
     -var_name unassigned_ads
 
 template::util::list_of_ns_sets_to_multirow \
-    -rows [classified-ads::ads::get_assigned_ads_by_category -category_id_list [list $keyword_id]] \
+    -rows [classified-ads::ads::get_assigned_ads_by_category -category_id $keyword_id] \
     -var_name assigned_ads
 
 set return_url "[ad_conn url]?[ad_conn query]"
Index: openacs-4/contrib/packages/classified-ads/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/index.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/contrib/packages/classified-ads/www/index.adp	7 Nov 2003 20:02:27 -0000	1.1
+++ openacs-4/contrib/packages/classified-ads/www/index.adp	18 Jan 2004 10:36:42 -0000	1.1.2.1
@@ -5,7 +5,7 @@
 <if @package_category_p@ eq 1>
 
 <p>
-  <a href="category-new?parent_id=@keyword_id@&return_url=@return_url@">Create a new top-level category</a>
+  <a href="admin/category-new?parent_id=@keyword_id@&return_url=@return_url@">Create a new top-level category</a>
 </p>
 
 <table border="0" cellspacing="1" cellpadding="2" bgcolor="#006699" width="50%">