Index: openacs-4/packages/categories/categories.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/categories.info,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/categories.info	6 Feb 2005 18:42:19 -0000	1.8
+++ openacs-4/packages/categories/categories.info	23 Aug 2005 15:49:42 -0000	1.9
@@ -8,13 +8,13 @@
     <singleton-p>f</singleton-p>
     <auto-mount>categories</auto-mount>
 
-    <version name="1.1d3" url="http://openacs.org/repository/apm/packages/categories-1.1d3">
+    <version name="1.1d4" url="http://openacs.org/repository/apm/packages/categories-1.1d4">
         <owner>timo@timohentschel.de</owner>
         <summary>Manage categories in category trees and let users map objects to categories.</summary>
         <release-date>2003-04-16</release-date>
         <description format="text/html">Datamodel for category trees with supporting API and management pages.  Provides a widget for 
         general categorization of arbitrary objects and tracks which package instances use which category trees.  Also supports localization.</description>
-        <provides url="categories" version="1.1d3"/>
+        <provides url="categories" version="1.1d4"/>
         <requires url="acs-kernel" version="5.2.0d2"/>
 
         <callbacks>
Index: openacs-4/packages/categories/sql/postgresql/categories-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/postgresql/categories-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/sql/postgresql/categories-create.sql	11 Feb 2004 13:25:27 -0000	1.6
+++ openacs-4/packages/categories/sql/postgresql/categories-create.sql	23 Aug 2005 15:49:47 -0000	1.7
@@ -447,6 +447,7 @@
 \i category-package.sql
 \i category-link-package.sql
 \i category-synonym-package.sql
+\i categories-relation.sql
 
 \i categories-permissions.sql
 
Index: openacs-4/packages/categories/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/widget-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/categories/tcl/widget-procs.tcl	21 Jun 2005 10:48:59 -0000	1.16
+++ openacs-4/packages/categories/tcl/widget-procs.tcl	23 Aug 2005 15:49:50 -0000	1.17
@@ -91,7 +91,16 @@
     if { [empty_string_p $tree_id] } {
         set mapped_trees [category_tree::get_mapped_trees $package_id]
     } else {
-        set mapped_trees [list [list $tree_id [category_tree::get_name $tree_id] $subtree_id $assign_single_p $require_category_p]]
+	set mapped_trees {}
+	foreach one_tree $tree_id one_subtree $subtree_id assign_single $assign_single_p require_category $require_category_p {
+	    if {[empty_string_p $assign_single]} {
+		set assign_single f
+	    }
+	    if {[empty_string_p $require_category]} {
+		set require_category f
+	    }
+	    lappend mapped_trees [list $one_tree [category_tree::get_name $one_tree] $one_subtree $assign_single $require_category]
+	}
     }
 
     foreach mapped_tree $mapped_trees {