Index: openacs-4/packages/file-storage/www/copy-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/copy-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/copy-oracle.xql 17 May 2004 15:15:14 -0000 1.2
+++ openacs-4/packages/file-storage/www/copy-oracle.xql 13 Jan 2005 13:58:13 -0000 1.3
@@ -25,23 +25,25 @@
- select file_storage.copy_file(
+ begin
+ :1 := file_storage.copy_file(
:object_id,
:folder_id,
:user_id,
- :peer_addr
- )
+ :peer_addr);
+ end;
select
- cf.folder_id, cf.label, ci1.level
- from cr_folders cf, (select item_id, level from
+ cf.folder_id, cf.label, ci1.level_num
+ from cr_folders cf, (select item_id, level as level_num from
cr_items
- connect by prior item_id=parent_id
- start with :root_folder_id
+ where cr_items.item_id not in ($object_id_list)
+ connect by (prior item_id=parent_id and parent_id not in ($object_id_list))
+ start with cr_items.item_id = :root_folder_id
) ci1
where
ci1.item_id=cf.folder_id
@@ -50,7 +52,7 @@
where m.object_id = cf.folder_id
and m.party_id = :user_id
and m.privilege = 'write')
- order by order by ci1.level, cf.label
+ order by ci1.level_num, cf.label