Index: openacs-4/packages/cms/www/modules/categories/edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/edit-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/categories/edit-postgresql.xql	25 May 2001 02:56:11 -0000	1.1
+++ openacs-4/packages/cms/www/modules/categories/edit-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -8,8 +8,8 @@
 
 
     begin 
-      content_keyword__set_heading(:keyword_id, :heading);
-      content_keyword__set_description(:keyword_id, :description);
+      PERFORM content_keyword__set_heading(:keyword_id, :heading);
+      PERFORM content_keyword__set_description(:keyword_id, :description);
 
       return null;
     end;
Index: openacs-4/packages/cms/www/modules/items/relate-items-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/relate-items-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/relate-items-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -22,7 +22,7 @@
       <querytext>
 
     select 
-      lpad(' ', level, '-') || pretty_name as pretty_name, 
+      lpad(' ', tree_level(tree_sortkey), '-') || pretty_name as pretty_name, 
       object_type
     from
       acs_object_types
Index: openacs-4/packages/cms/www/modules/items/relationship-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relationship-view-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/relationship-view-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/relationship-view-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -33,8 +33,6 @@
  
 <fullquery name="get_rel_attrs">      
       <querytext>
-      FIX ME CONNECT BY
-FIX ME OUTER JOIN
          
   select 
     types.table_name, types.id_column, attr.attribute_name,
Index: openacs-4/packages/cms/www/modules/items/revision-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/revision-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/revision-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -49,7 +49,7 @@
         acs_object_types
       where 
         object_type = cr_items.content_type
-    ) content_type,
+    ) as content_type,
     content_item__get_path(item_id,null) as path
   from 
     cr_items
Index: openacs-4/packages/cms/www/modules/items/revision-upload-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-upload-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/revision-upload-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/revision-upload-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -7,15 +7,15 @@
       <querytext>
 
         select content_item__new(
-          name          => :name, 
-          parent_id     => :parent_id, 
+          :name, 
+          :parent_id, 
           null,
           now(),
-          creation_user => [User::getID],
+          [User::getID],
           null,          
-          creation_ip   => '[ns_conn peeraddr]',
+          '[ns_conn peeraddr]',
           'content_item',
-          content_type  => :content_type,
+          :content_type,
           null,
           null,
           'text/plain',
Index: openacs-4/packages/cms/www/modules/items/status-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/status-edit-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/status-edit-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/status-edit-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -5,6 +5,7 @@
 
 <fullquery name="set_release_period">      
       <querytext>
+
                 select content_item__set_release_period(
                       :item_id,
                       $start_when,
Index: openacs-4/packages/cms/www/modules/items/templates-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/templates-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/templates-postgresql.xql	25 May 2001 04:56:36 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/templates-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -67,7 +67,7 @@
      and 
        itmap.use_context = t.use_context
      and 
-       itmap.item_id = :item_id) already_registered_p
+       itmap.item_id = :item_id) as already_registered_p
   from 
     cr_type_template_map t
   where 
Index: openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/copy-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -6,8 +6,6 @@
 <fullquery name="copy_item">      
       <querytext>
 
-
-
         select content_item__copy(
                 :cp_item_id,
                 :folder_id,
Index: openacs-4/packages/cms/www/modules/sitemap/create-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/Attic/create-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/create-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/create-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -5,7 +5,6 @@
 
 <fullquery name="new_folder">      
       <querytext>
-
     
     select content_folder__new (
         :name, 
@@ -18,7 +17,6 @@
         :user_id, 
         :ip ); 
     
-
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql	27 May 2001 00:22:34 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/delete-items-oracle.xql	30 May 2001 22:56:27 -0000	1.3
@@ -3,6 +3,34 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
+<fullquery name="get_marked_items">      
+      <querytext>
+
+  select
+    item_id,
+    nvl(content_item.get_title(item_id),name) title, 
+    content_item.get_path(item_id) path,
+    pretty_name as content_type_pretty,
+    content_symlink.is_symlink(item_id) is_symlink,
+    content_folder.is_folder(item_id) is_folder,
+    content_template.is_template(item_id) is_template
+  from
+    cr_items i, acs_object_types t
+  where
+    i.content_type = t.object_type
+  and
+    item_id in ([join $clip_items ","])
+  and
+    -- permissions check
+    cms_permission.permission_p( item_id, :user_id, 'cm_write' ) = 't'
+  order by
+    -- this way parents are deleted after their children
+    item_id desc
+
+      </querytext>
+</fullquery>
+
+
 <fullquery name="delete_items">      
       <querytext>
       
Index: openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql	27 May 2001 00:22:34 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/delete-items-postgresql.xql	30 May 2001 22:56:27 -0000	1.3
@@ -3,10 +3,35 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="delete_items">      
+<fullquery name="get_marked_items">      
       <querytext>
 
+  select
+    item_id,
+    coalesce(content_item__get_title(item_id,'f'),name) as title, 
+    content_item__get_path(item_id, null) as path,
+    pretty_name as content_type_pretty,
+    content_symlink__is_symlink(item_id) as is_symlink,
+    content_folder__is_folder(item_id) as is_folder,
+    content_template__is_template(item_id) as is_template
+  from
+    cr_items i, acs_object_types t
+  where
+    i.content_type = t.object_type
+  and
+    item_id in ([join $clip_items ","])
+  and
+    -- permissions check
+    cms_permission__permission_p( item_id, :user_id, 'cm_write' ) = 't'
+  order by
+    -- this way parents are deleted after their children
+    item_id desc
 
+      </querytext>
+</fullquery>
+
+<fullquery name="delete_items">      
+      <querytext>
 	 
 	  select $delete_proc (
 	    :del_item_id
Index: openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl	27 May 2001 00:22:34 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/delete-items.tcl	30 May 2001 22:56:27 -0000	1.4
@@ -18,7 +18,8 @@
 set user_id [User::getID]
 
 # get title, content_type, path, item_id of each marked item
-set query "
+
+template::query get_marked_items marked_items multirow "
   select
     item_id,
     nvl(content_item.get_title(item_id),name) title, 
@@ -40,7 +41,6 @@
     -- this way parents are deleted after their children
     item_id desc
 "
-query marked_items multirow $query
 
 
 
@@ -127,7 +127,7 @@
             #   something_id => :del_item_id
             # );
 
-            if { [catch { db_dml delete_items "
+            if { [catch { db_exec_plsql delete_items "
 	  begin
 	  $delete_proc (
 	    $delete_key => :del_item_id
Index: openacs-4/packages/cms/www/modules/sitemap/delete-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/Attic/delete-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/delete-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/delete-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -7,6 +7,7 @@
       <querytext>
 
         select content_folder__delete(:id)
+
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/cms/www/modules/templates/copy-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/copy-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/copy-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/templates/copy-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -17,6 +17,7 @@
 
                 return null;
         end;
+
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/cms/www/modules/types/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/index-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/index-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -5,8 +5,6 @@
 
 <fullquery name="get_content_type">      
       <querytext>
-      FIX ME CONNECT BY
-FIX ME ROWNUM
 
   select 
     case when ot2.supertype = 'acs_object' then '' else ot2.supertype end as parent_type,   
@@ -21,16 +19,14 @@
     ot2.tree_sortkey <= ot1.tree_sortkey
   and 
     ot1.tree_sortkey like (ot2.tree_sortkey || '%')
-  order by ot2.tree_sortkey desc
+  order by ot2.tree_sortkey asc
 
       </querytext>
 </fullquery>
 
  
 <fullquery name="get_attr_types">      
       <querytext>
-      FIX ME CONNECT BY
-FIX ME OUTER JOIN
 
   select 
     attr.attribute_id, attr.attribute_name, attr.object_type,
@@ -71,7 +67,7 @@
       template_id,:root_id) as path,
     (select pretty_name 
        from acs_object_types 
-       where object_type = :content_type) pretty_name
+       where object_type = :content_type) as pretty_name
   from 
     cr_type_template_map ttmap, cr_items i 
   where 
Index: openacs-4/packages/cms/www/modules/workflow/case-status-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/case-status-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/case-status-postgresql.xql	25 May 2001 23:49:05 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/case-status-postgresql.xql	30 May 2001 22:56:27 -0000	1.2
@@ -7,7 +7,7 @@
       <querytext>
       select k.transition_key, k.task_id, t.transition_name,
              k.holding_user, 
-             content_workflow__get_holding_user_name(k.task_id) hold_name
+             content_workflow__get_holding_user_name(k.task_id) as hold_name
              from wf_tasks k, wf_transitions t
 	     where k.case_id = :case_id 
              and k.state in ('enabled', 'started')
@@ -18,7 +18,7 @@
  
 <fullquery name="get_deadline">      
       <querytext>
-      select to_char(deadline, 'DD MON') deadline 
+      select to_char(deadline, 'DD MON') as deadline 
 		 from wf_case_deadlines 
 		 where case_id = :case_id 
                  and transition_key = :transition_key