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 -N -r1.4.2.10 -r1.4.2.11 --- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 7 Apr 2004 23:54:28 -0000 1.4.2.10 +++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 10 Apr 2004 00:34:33 -0000 1.4.2.11 @@ -631,8 +631,16 @@ } { set user_id [oacs_dav::conn user_id] set depth [oacs_dav::conn depth] - set folder_uri [ad_url][ad_conn url] - # if client didn't put a / on folder_uri go ahead and tack it on + set encoded_uri [list] + foreach fragment [split [ad_conn url] "/"] { + lappend encoded_uri [ns_urlencode $fragment] + } + set folder_uri "[ad_url][join $encoded_uri "/"]" + + if {![string match */ $folder_uri]} { + append folder_uri "/" + } + if {[empty_string_p $depth]} { set depth 0 } @@ -656,7 +664,12 @@ if {$item_id == $folder_id} { set item_uri "" } else { - set item_uri "/${item_uri}" + set encoded_uri [list] + foreach fragment [split $item_uri "/"] { + lappend encoded_uri [ns_urlencode $fragment] + } + set item_uri "[join $encoded_uri "/"]" + } lappend properties [list "D" "getcontenttype"] $mime_type Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v diff -u -N -r1.2.2.2 -r1.2.2.3 --- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 5 Apr 2004 17:12:03 -0000 1.2.2.2 +++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 10 Apr 2004 00:34:33 -0000 1.2.2.3 @@ -122,7 +122,7 @@ set xml [read $fp] close $fp ns_unlink -nocomplain $tmpfile - + ns_log debug "\n-----tdav::read_xml XML = -----\n $xml \n ----- end ----- \n " return $xml } @@ -1167,7 +1167,7 @@ set response_body [encoding convertto utf-8 $response_body] } } - + ns_log debug "\n ----- tdav::response response_body ----- \n $response_body \n ----- end ----- \n" ns_return $response_code $mime_type $response_body }