Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql 20 Apr 2004 21:13:53 -0000 1.4 +++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql 17 May 2004 15:15:25 -0000 1.5 @@ -12,6 +12,21 @@ + + + select count(*) + from (select item_id + from cr_items + connect by prior item_id = parent_id + start with item_id = :item_id) + where not exists (select 1 + from acs_object_party_privilege_map m + where m.object_id = cr_items.item_id + and m.party_id = :user_id + and m.privilege = :privilege) + + + @@ -51,11 +66,12 @@ select ci.item_id, ci.name, - content_item__get_path(ci.item_id,:folder_id) as item_uri, - coalesce(cr.mime_type,'*/*') as mime_type, - cr.content_length, - to_char(o.creation_date, 'YYYY-MM-DD"T"HH:MM:SS.MS"Z"') as creation_date, - to_char(o.last_modified, 'Dy, DD Mon YYYY HH:MM:SS TZ') as last_modified + content_item.get_path(ci.item_id,:folder_id) as item_uri, + nvl(cr.mime_type,'*/*') as mime_type, + nvl(cr.content_length,0) as content_length, + to_char(o.creation_date, 'YYYY-MM-DD"T"HH:MI:SS."000"') as creation_date, + to_char(o.last_modified, 'Dy, Dd Mon YYYY HH:MI:SS "${os_time_zone}"') as last_modified + from cr_items ci, acs_objects o, cr_revisions cr @@ -88,7 +104,7 @@ begin - :1 := content_folder.copy ( + content_folder.copy ( folder_id => :copy_folder_id, target_folder_id => :new_parent_folder_id, creation_user => :user_id, @@ -99,6 +115,23 @@ + + + update cr_items + set live_revision=latest_revision + where exists ( + select 1 + from + (select ci1.item_id as child_item_id + from cr_items ci1 + connect by prior item_id = parent_id + start with item_id = :folder_id + ) children + where item_id=children.child_item_id + ) + + + begin @@ -117,7 +150,7 @@ content_folder.rename ( folder_id => :move_folder_id, name => :new_name, - label => NULL, + label => :new_name, description => NULL ); end;