Index: openacs-4/packages/categories/tcl/category-trees-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs-oracle.xql,v
diff -u -r1.6.8.1 -r1.6.8.2
--- openacs-4/packages/categories/tcl/category-trees-procs-oracle.xql	15 Mar 2019 10:39:02 -0000	1.6.8.1
+++ openacs-4/packages/categories/tcl/category-trees-procs-oracle.xql	25 Nov 2019 09:31:10 -0000	1.6.8.2
@@ -3,36 +3,6 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="category_tree::map.map_tree">      
-      <querytext>
-      
-	    begin
-	    category_tree.map(
-			      object_id           => :object_id,
-			      subtree_category_id => :subtree_category_id,
-			      tree_id             => :tree_id,
-			      assign_single_p     => :assign_single_p,
-			      require_category_p  => :require_category_p,
-			      widget              => :widget);
-	    end;
-	
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="category_tree::unmap.unmap_tree">      
-      <querytext>
-      
-	    begin
-	    category_tree.unmap(
-				object_id => :object_id,
-				tree_id   => :tree_id);
-	    end;
-	
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="category_tree::copy.copy_tree">      
       <querytext>
       
Index: openacs-4/packages/categories/tcl/category-trees-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs-postgresql.xql,v
diff -u -r1.7.10.1 -r1.7.10.2
--- openacs-4/packages/categories/tcl/category-trees-procs-postgresql.xql	15 Mar 2019 10:39:02 -0000	1.7.10.1
+++ openacs-4/packages/categories/tcl/category-trees-procs-postgresql.xql	25 Nov 2019 09:31:10 -0000	1.7.10.2
@@ -3,26 +3,6 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="category_tree::map.map_tree">      
-      <querytext>
-	    select category_tree__map(
-			      :object_id,
-			      :tree_id,
-			      :subtree_category_id,
-			      :assign_single_p,
-			      :require_category_p,
-			      :widget
-			      )
-      </querytext>
-</fullquery>
-
-<fullquery name="category_tree::unmap.unmap_tree">      
-      <querytext>
-	    select category_tree__unmap(:object_id,:tree_id)
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="category_tree::copy.copy_tree">      
       <querytext>
 	    select category_tree__copy(:source_tree, :dest_tree, :creation_user, :creation_ip)
Index: openacs-4/packages/categories/tcl/category-trees-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/category-trees-procs.tcl,v
diff -u -r1.31.2.11 -r1.31.2.12
--- openacs-4/packages/categories/tcl/category-trees-procs.tcl	26 Apr 2019 13:57:31 -0000	1.31.2.11
+++ openacs-4/packages/categories/tcl/category-trees-procs.tcl	25 Nov 2019 09:31:10 -0000	1.31.2.12
@@ -79,7 +79,15 @@
                 category to objects.
         @author Timo Hentschel (timo@timohentschel.de)
     } {
-        db_exec_plsql map_tree ""
+        db_dml map_tree {
+            insert into category_tree_map
+                   (tree_id,  subtree_category_id,  object_id,  assign_single_p,  require_category_p,  widget)
+            select :tree_id, :subtree_category_id, :object_id, :assign_single_p, :require_category_p, :widget
+            from dual
+            where not exists (select 1 from category_tree_map
+                               where object_id = :object_id
+                                 and tree_id = :tree_id)
+        }
     }
 
     ad_proc -public unmap {
@@ -93,7 +101,11 @@
         @option object_id object to unmap the category tree from.
         @author Timo Hentschel (timo@timohentschel.de)
     } {
-        db_exec_plsql unmap_tree ""
+        db_dml unmap_tree {
+            delete from category_tree_map
+             where object_id = :object_id
+               and tree_id = :tree_id
+        }
     }
 
     ad_proc -public edit_mapping {