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 -r1.2 -r1.3 --- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql 20 Feb 2004 23:48:22 -0000 1.2 +++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs-oracle.xql 27 Feb 2004 03:22:57 -0000 1.3 @@ -17,17 +17,19 @@ select nvl (cr.content_length,4096) as content_length, nvl (cr.mime_type,'*/*') as mime_type, - 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, + to_char(o.creation_date, 'YYYY-MM-DD"T"HH:MI:SS."00Z"') as creation_date, + to_char(o.last_modified, 'DY, DD MON YYYY HH:MI:SS "GMT"') as last_modified, ci1.item_id, case when ci1.item_id=:folder_id then '' else ci1.name end as name, content_item.get_path(ci1.item_id,:folder_id) as item_uri, case when o.object_type='content_folder' then 1 else 0 end as collection_p from ( select * from cr_items - connect by prior parent_id=item_id - start with item_id=:folder_id + where parent_id=:folder_id + or item_id=:folder_id + -- connect by prior item_id=parent_id + -- start with item_id=:folder_id ) ci1, cr_revisions cr, acs_objects o @@ -66,17 +68,19 @@ - select content_folder.new( + begin + :1 := content_folder.new( name => :new_folder_name, label => :label, description => :description, parent_id => :parent_id, context_id => :parent_id, - new_folder_id => NULL, - creation_date => current_timestamp, + folder_id => NULL, + creation_date => sysdate, creation_user => :user_id, creation_ip => :peer_addr - ) + ); + end; @@ -146,9 +150,9 @@ begin - :1 := content_item.copy ( + :1 := content_item.copy2 ( item_id => :copy_item_id, - target_id => :new_parent_folder_id, + target_folder_id => :new_parent_folder_id, creation_user => :user_id, creation_ip => :peer_addr, name => :new_name @@ -157,20 +161,20 @@ - + begin - content_item.delete( + content_item.del( item_id => :dest_item_id ); end; - + begin - content_item.delete( + content_item.del( item_id => :dest_item_id ); end; @@ -180,7 +184,7 @@ begin - content_item.delete ( + content_item.del ( item_id => :item_id ); end; @@ -190,7 +194,7 @@ begin - content_folder.delete ( + content_folder.del ( folder_id => :item_id, cascade_p => 't' ); @@ -212,31 +216,21 @@ - begin - :1 := content_item.get_id( - item_path => :new_name, - root_folder_id => :new_parent_folder_id, - resolve_index => 'f'); - end; + select content_item.get_id(:new_name,:new_parent_folder_id,'f') from dual - begin - :1 := content_item.get_id( - item_path => :new_name, - root_folder_id => :new_parent_folder_id, - resolve_index => 'f'); - end; + select content_item.get_id(:new_name,:new_parent_folder_id,'f') from dual begin - content_folder.delete( + content_folder.del( folder_id => :dest_item_id, cascade_p => 't'); end; @@ -247,7 +241,7 @@ name="oacs_dav::impl::content_folder::copy.delete_for_copy"> begin - content_folder.delete( + content_folder.del( folder_id => :dest_item_id, cascade_p => 't'); end; @@ -256,23 +250,13 @@ - begin - :1 := content_item.get_id( - item_path => :new_name, - root_folder_id => :new_parent_folder_id, - resolve_index => 'f'); - end; + select content_item.get_id(:new_name,:new_parent_folder_id,'f') from dual - begin - :1 := content_item.get_id( - item_path => :new_name, - root_folder_id => :new_parent_folder_id, - resolve_index => 'f'); - end; + select content_item.get_id(:new_name,:new_parent_folder_id,'f') from dual Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 20 Feb 2004 00:08:25 -0000 1.3 +++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 27 Feb 2004 03:22:57 -0000 1.4 @@ -489,7 +489,7 @@ return [list 409] } - set dest_item_id [db_string get_dest_id ""] + set dest_item_id [db_string get_dest_id "" -default ""] if {![empty_string_p $dest_item_id]} { ns_log notice "DAV Folder Copy Folder Exists item_id $dest_item_id overwrite $overwrite" if {![string equal -nocase $overwrite "T"]} { @@ -539,7 +539,7 @@ return $response } - set dest_item_id [db_string get_dest_id ""] + set dest_item_id [db_string get_dest_id "" -default ""] ns_log debug "@DAV@@ folder move new_name $new_name dest_id $dest_item_id new_folder_id $new_parent_folder_id" if {![empty_string_p $dest_item_id]} { ns_log notice "DAV Folder Move Folder Exists item_id $dest_item_id overwrite $overwrite" @@ -902,7 +902,7 @@ if {[empty_string_p $new_parent_folder_id]} { return [list 409] } - set dest_item_id [db_string get_dest_id ""] + set dest_item_id [db_string get_dest_id "" -default ""] if {![empty_string_p $dest_item_id]} { if {![string equal -nocase $overwrite "T"]} { @@ -959,7 +959,7 @@ if {![string equal "unlocked" [tdav::check_lock $uri]]} { return [list 423] } - set dest_item_id [db_string get_dest_id ""] + set dest_item_id [db_string get_dest_id "" -default ""] if {![empty_string_p $dest_item_id]} { if {![string equal -nocase $overwrite "T"]} {