Index: openacs-4/packages/categories/sql/postgresql/categories-relation.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/postgresql/categories-relation.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/categories/sql/postgresql/categories-relation.sql	26 Jul 2005 22:57:19 -0000	1.1.2.1
+++ openacs-4/packages/categories/sql/postgresql/categories-relation.sql	23 Aug 2005 15:49:47 -0000	1.1.2.2
@@ -45,8 +45,8 @@
       ''meta_category'',		-- role_one
       1,				-- min_n_rels_one
       1,				-- max_n_rels_one
-      ''user'',				-- object_type_two
-      ''user'',				-- role_two
+      ''party'',			-- object_type_two
+      ''party'',			-- role_two
       1,				-- min_n_rels_two
       1					-- max_n_rels_two
   );
Index: openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1d3-1.1d4.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1d3-1.1d4.sql,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1d3-1.1d4.sql	26 Jul 2005 22:58:13 -0000	1.1.2.1
+++ openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1d3-1.1d4.sql	23 Aug 2005 15:49:49 -0000	1.1.2.2
@@ -16,39 +16,39 @@
 
   -- Creating two new rel_types
   PERFORM acs_rel_type__create_type (
-      ''meta_category_rel'',		-- rel_type 
+      ''meta_category_rel'',            -- rel_type 
       ''Meta Category Relation'',       -- pretty_name
       ''Meta Category Relation'',       -- pretty_plural
-      ''relationship'',			-- supertype
-      ''meta_categories'',		-- table_name
-      ''meta_category_id'',		-- id_column 
-      null,				-- package_name
-      ''category'',		        -- object_type_one 
-      ''category'',		        -- role_one
-      1,				-- min_n_rels_one
-      1,				-- max_n_rels_one 
-      ''category'',           		-- object_type_two
-      ''category'',		        -- role_two
-      1,				-- min_n_rels_two
-      1					-- max_n_rels_two
+      ''relationship'',                 -- supertype
+      ''meta_categories'',              -- table_name
+      ''meta_category_id'',             -- id_column 
+      null,                             -- package_name
+      ''category'',                     -- object_type_one 
+      ''category'',                     -- role_one
+      1,                                -- min_n_rels_one
+      1,                                -- max_n_rels_one 
+      ''category'',                     -- object_type_two
+      ''category'',                     -- role_two
+      1,                                -- min_n_rels_two
+      1                                 -- max_n_rels_two
   );
 
   PERFORM acs_rel_type__create_type (
-      ''user_meta_category_rel'',	-- rel_type
+      ''user_meta_category_rel'',       -- rel_type
       ''User Meta Category Relation'',  -- pretty_name
       ''User Meta Category Relation'',  -- pretty_plural
-      ''relationship'',			-- supertype
-      ''user_meta_categories'',		-- table_name
-      ''user_meta_category_id'',	-- id_column
-      null,				-- package_name
-      ''meta_category_rel'',		-- object_type_one
-      ''meta_category'',		-- role_one
-      1,				-- min_n_rels_one
-      1,				-- max_n_rels_one
-      ''user'',				-- object_type_two
-      ''user'',				-- role_two
-      1,				-- min_n_rels_two
-      1					-- max_n_rels_two
+      ''relationship'',                 -- supertype
+      ''user_meta_categories'',         -- table_name
+      ''user_meta_category_id'',        -- id_column
+      null,                             -- package_name
+      ''meta_category_rel'',            -- object_type_one
+      ''meta_category'',                -- role_one
+      1,                                -- min_n_rels_one
+      1,                                -- max_n_rels_one
+      ''party'',                        -- object_type_two
+      ''party'',                        -- role_two
+      1,                                -- min_n_rels_two
+      1                                 -- max_n_rels_two
   );
 
   return 0;
Index: openacs-4/packages/categories/tcl/category-relation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-relation-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/categories/tcl/category-relation-procs.tcl	26 Jul 2005 22:56:19 -0000	1.1.2.1
+++ openacs-4/packages/categories/tcl/category-relation-procs.tcl	23 Aug 2005 15:49:50 -0000	1.1.2.2
@@ -28,18 +28,16 @@
     }
  
     # First we check if the relation exist, if it does, we don't create a new one
-    set meta_category_id [db_string get_meta_relation_id { } -default "0"]
-    if { [string equal $meta_category_id "0"] } { 
-	db_exec_plsql add_meta_relation { }
+    set meta_category_id [db_string get_meta_relation_id {} -default ""]
+    if { [empty_string_p $meta_category_id] } { 
+	set meta_category_id [db_exec_plsql add_meta_relation {}]
     }
     
     # Now we check if the user already has the meta category associated,
     # if it does, we don't create a new one
-    set user_meta_category_id [db_string get_user_meta_relation_id { } -default "0"]
-    if { [string equal $user_meta_category_id "0"] } { 
-	db_exec_plsql add_user_meta_relation { }
-	set user_meta_category_id [db_string get_user_meta_relation_id { } -default "0"]
-	return $user_meta_category_id
+    set user_meta_category_id [db_string get_user_meta_relation_id {} -default ""]
+    if { [empty_string_p $user_meta_category_id] } { 
+	return [db_exec_plsql add_user_meta_relation {}]
     } else {
 	return $user_meta_category_id
     }