Index: openacs-4/packages/categories/categories.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/categories.info,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/categories.info	1 Apr 2004 12:58:17 -0000	1.6
+++ openacs-4/packages/categories/categories.info	24 Jul 2004 15:14:24 -0000	1.7
@@ -8,13 +8,13 @@
     <singleton-p>f</singleton-p>
     <auto-mount>categories</auto-mount>
 
-    <version name="1.0d4" url="http://openacs.org/repository/apm/packages/categories-1.0d4">
+    <version name="1.1d2" url="http://openacs.org/repository/apm/packages/categories-1.1d2">
         <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.0d4"/>
+        <provides url="categories" version="1.1d2"/>
         <requires url="acs-kernel" version="5.2.0d2"/>
 
         <callbacks>
Index: openacs-4/packages/categories/sql/postgresql/category-tree-package.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/postgresql/category-tree-package.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/sql/postgresql/category-tree-package.sql	11 Feb 2004 10:54:32 -0000	1.6
+++ openacs-4/packages/categories/sql/postgresql/category-tree-package.sql	24 Jul 2004 15:14:24 -0000	1.7
@@ -188,6 +188,7 @@
 
     v_new_left_ind          integer;
     v_category_id	    integer;
+    source record;
 begin
 	select coalesce(max(right_ind),0) into v_new_left_ind 
 	from categories
Index: openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1d1-1.1d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1d1-1.1d2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/sql/postgresql/upgrade/upgrade-1.1d1-1.1d2.sql	24 Jul 2004 15:14:24 -0000	1.1
@@ -0,0 +1,65 @@
+-- source was undeclared.
+
+create or replace function category_tree__copy (
+    integer,   -- source_tree
+    integer,   -- dest_tree
+    integer,   -- creation_user
+    varchar    -- creation_ip
+)
+returns integer as '
+declare
+    p_source_tree           alias for $1;
+    p_dest_tree             alias for $2;
+    p_creation_user         alias for $3;
+    p_creation_ip           alias for $4;
+
+    v_new_left_ind          integer;
+    v_category_id	    integer;
+    source record;
+begin
+	select coalesce(max(right_ind),0) into v_new_left_ind 
+	from categories
+	where tree_id = p_dest_tree;
+
+	for source in (select category_id, parent_id, left_ind, right_ind from categories where tree_id = p_source_tree) loop
+
+	   v_category_id := acs_object__new ( 
+		''category'',     -- object_type
+		now(),            -- creation_date
+		p_creation_user,  -- creation_user
+		p_creation_ip,    -- creation_ip
+	  	p_dest_tree       -- context_id
+	   );
+
+	   insert into categories
+	   (category_id, tree_id, parent_id, left_ind, right_ind)
+	   values
+	   (v_category_id, p_dest_tree, source.parent_id, source.left_ind + v_new_left_ind, source.right_ind + v_new_left_ind);
+	end loop;
+
+	-- correct parent_ids
+	update categories c
+	set parent_id = (select t.category_id
+			from categories s, categories t
+			where s.category_id = c.parent_id
+			and t.tree_id = copy.dest_tree
+			and s.left_ind + v_new_left_ind = t.left_ind)
+	where tree_id = p_dest_tree;
+
+	-- copy all translations
+	insert into category_translations
+	(category_id, locale, name, description)
+	(select ct.category_id, t.locale, t.name, t.description
+	from category_translations t, categories cs, categories ct
+	where ct.tree_id = p_dest_tree
+	and cs.tree_id = p_source_tree
+	and cs.left_ind + v_new_left_ind = ct.left_ind
+	and t.category_id = cs.category_id);
+
+	-- for debugging reasons
+	perform category_tree__check_nested_ind(p_dest_tree);
+
+       return 0;
+end;
+' language 'plpgsql';
+