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.2 -r1.3
--- openacs-4/packages/categories/tcl/category-trees-procs-postgresql.xql	27 Apr 2003 11:36:23 -0000	1.2
+++ openacs-4/packages/categories/tcl/category-trees-procs-postgresql.xql	19 May 2003 13:10:17 -0000	1.3
@@ -5,148 +5,99 @@
 
 <fullquery name="category_tree::map.map_tree">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-	    begin
-	    category_tree__map(
-			      object_id           => :object_id,
-			      subtree_category_id => :subtree_category_id,
-			      tree_id             => :tree_id);
-	    end;
-	
+	    select category_tree__map(
+			      :object_id,
+			      :tree_id,
+			      :subtree_category_id)
       </querytext>
 </fullquery>
 
- 
 <fullquery name="category_tree::unmap.unmap_tree">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-	    begin
-	    category_tree__unmap(
-				object_id => :object_id,
-				tree_id   => :tree_id);
-	    end;
-	
+	    select category_tree__unmap(:object_id,:tree_id)
       </querytext>
 </fullquery>
 
  
 <fullquery name="category_tree::copy.copy_tree">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-	    begin
-	    category_tree__copy(
-			       source_tree         => :source_tree,
-			       dest_tree           => :dest_tree
-			       );
-	    end;
-	
+	    select category_tree__copy(:source_tree,:dest_tree)
       </querytext>
 </fullquery>
 
  
 <fullquery name="category_tree::add.insert_tree">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-		begin
-		:1 := category_tree__new (
-					 tree_id       => :tree_id,
-					 tree_name     => :name,
-					 description   => :description,
-					 locale        => :locale,
-					 creation_user => :user_id,
-					 creation_ip   => :creation_ip,
-					 context_id    => :context_id
-					 );
-		end;
-	    
+        	select category_tree__new (
+					 :tree_id,
+					 :locale,
+					 :name,
+					 :description,
+                                         :site_wide_p,
+                                         current_timestamp,
+					 :user_id,
+					 :creation_ip,
+					 :context_id
+					 )
       </querytext>
 </fullquery>
 
  
 <fullquery name="category_tree::add.insert_default_tree">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-		    begin
-		    category_tree__new_translation (
-						   tree_id        => :tree_id,
-						   tree_name      => :name,
-						   description    => :description,
-						   locale         => :default_locale,
-						   modifying_user => :user_id,
-						   modifying_ip   => :creation_ip
-						   );
-		    end;
-		
+		    select category_tree__new_translation (
+						   :tree_id,
+						   :default_locale,
+						   :name,
+						   :description,
+                                                   current_timestamp,
+						   :user_id,
+						   :creation_ip
+						   )
       </querytext>
 </fullquery>
 
  
 <fullquery name="category_tree::update.insert_tree_translation">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-		    begin
-		    category_tree__new_translation (
-						   tree_id        => :tree_id,
-						   tree_name      => :name,
-						   description    => :description,
-						   locale         => :locale,
-						   modifying_user => :user_id,
-						   modifying_ip   => :modifying_ip
-						   );
-		    end;
-		
+		    select category_tree__new_translation (
+						   :tree_id,
+						   :locale,
+						   :name,
+						   :description,
+                                                   current_timestamp,
+						   :user_id,
+						   :modifying_ip
+						   )
       </querytext>
 </fullquery>
 
  
 <fullquery name="category_tree::update.update_tree_translation">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-		    begin
-		    category_tree__edit (
-					tree_id        => :tree_id,
-					tree_name      => :name,
-					description    => :description,
-					locale         => :locale,
-					modifying_user => :user_id,
-					modifying_ip   => :modifying_ip
-					);
-		    end;
-		
+		    select category_tree__edit (
+					:tree_id,
+					:locale,
+					:name,
+					:description,
+                                        :site_wide_p,
+                                        current_timestamp,
+					:user_id,
+					:modifying_ip
+					)
       </querytext>
 </fullquery>
 
  
 <fullquery name="category_tree::delete.delete_tree">      
       <querytext>
-      FIX ME PLSQL
-FIX ME PLSQL
-
-	    begin
-	    category_tree__del ( :tree_id );
-	    end;
-	
+        	    select category_tree__del ( :tree_id )
       </querytext>
 </fullquery>
 
  
 <fullquery name="category_tree::usage.category_tree_usage">      
       <querytext>
-      
 	    select t.pretty_plural, n.object_id, n.object_name, p.package_id,
 	           p.instance_name,
 	           acs_permission__permission_p(n.object_id, :user_id, 'read') as read_p
@@ -156,7 +107,6 @@
 	    and n.object_id = m.object_id
 	    and p.package_id = n.package_id
 	    and t.package_key = p.package_key
-	
       </querytext>
 </fullquery>